https://bugs.eclipse.org/bugs/show_bug.cgi?id=536407, migrate to EPL 2.0 and catch up with branch development

Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
author: Ralf Mollik 2018-06-28 15:06:49 +0000
committer: Ralf Mollik 2018-06-28 15:06:49 +0000
commit: 9c12dc7f72ac15122916bc509828367f038aeb7c (patch)
tree: b2a4c420c8a4fa51d74eb426ec5c9a80a4341740
parent: ecd8ff9a0781538b7d7f9877733710750cf948e7 (diff)
download: org.eclipse.osbp.xtext.table-9c12dc7f72ac15122916bc509828367f038aeb7c.tar.gz
org.eclipse.osbp.xtext.table-9c12dc7f72ac15122916bc509828367f038aeb7c.tar.xz
org.eclipse.osbp.xtext.table-9c12dc7f72ac15122916bc509828367f038aeb7c.zip
226 files changed, 26119 insertions, 36932 deletions
diff --git a/about.html b/about.html
index 64c0598..e8b834d 100644
--- a/about.html
+++ b/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 1, 2016</p>	
+<p>November 30, 2017</p>	
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/notice.html b/notice.html
index c3d34c3..008b801 100644
--- a/notice.html
+++ b/notice.html
@@ -7,101 +7,183 @@
 </head>
 
 <body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 9, 2014</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+	<h2>Eclipse Foundation Software User Agreement</h2>
+	<p>November 22, 2017</p>
+
+	<h3>Usage Of Content</h3>
+
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+		USE THE CONTENT.</p>
+
+	<h3>Applicable Licenses</h3>
+
+	<p>
+		Unless otherwise indicated, all Content made available by the Eclipse
+		Foundation is provided to you under the terms and conditions of the
+		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
+		EPL is provided with this Content and is also available at <a
+			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>Content includes, but is not limited to, source code, object
+		code, documentation and other files maintained in the Eclipse
+		Foundation source code repository (&quot;Repository&quot;) in software
+		modules (&quot;Modules&quot;) and made available as downloadable
+		archives (&quot;Downloads&quot;).</p>
+
+	<ul>
+		<li>Content may be structured and packaged into modules to
+			facilitate delivering, extending, and upgrading the Content. Typical
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
+			fragments (&quot;Fragments&quot;), and features
+			(&quot;Features&quot;).</li>
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
+			or JAR (Java&trade; ARchive) in a directory named
+			&quot;plugins&quot;.</li>
+		<li>A Feature is a bundle of one or more Plug-ins and/or
+			Fragments and associated material. Each Feature may be packaged as a
+			sub-directory in a directory named &quot;features&quot;. Within a
+			Feature, files named &quot;feature.xml&quot; may contain a list of
+			the names and version numbers of the Plug-ins and/or Fragments
+			associated with that Feature.</li>
+		<li>Features may also include other Features (&quot;Included
+			Features&quot;). Within a Feature, files named
+			&quot;feature.xml&quot; may contain a list of the names and version
+			numbers of Included Features.</li>
+	</ul>
+
+	<p>The terms and conditions governing Plug-ins and Fragments should
+		be contained in files named &quot;about.html&quot;
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
+		Included Features should be contained in files named
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
+		Feature Licenses may be located in any directory of a Download or
+		Module including, but not limited to the following locations:</p>
+
+	<ul>
+		<li>The top-level (root) directory</li>
+		<li>Plug-in and Fragment directories</li>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Sub-directories of the directory named &quot;src&quot; of
+			certain Plug-ins</li>
+		<li>Feature directories</li>
+	</ul>
+
+	<p>Note: if a Feature made available by the Eclipse Foundation is
+		installed using the Provisioning Technology (as defined below), you
+		must agree to a license (&quot;Feature Update License&quot;) during
+		the installation process. If the Feature contains Included Features,
+		the Feature Update License should either provide you with the terms
+		and conditions governing the Included Features or inform you where you
+		can locate them. Feature Update Licenses may be found in the
+		&quot;license&quot; property of files named
+		&quot;feature.properties&quot; found within a Feature. Such Abouts,
+		Feature Licenses, and Feature Update Licenses contain the terms and
+		conditions (or references to such terms and conditions) that govern
+		your use of the associated Content in that directory.</p>
+
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
+		ARE NOT LIMITED TO):</p>
+
+	<ul>
+		<li>Eclipse Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
+		</li>
+		<li>Eclipse Distribution License Version 1.0 (available at <a
+			href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
+		</li>
+		<li>Common Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
+		</li>
+		<li>Apache Software License 1.1 (available at <a
+			href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
+		</li>
+		<li>Apache Software License 2.0 (available at <a
+			href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
+		</li>
+		<li>Mozilla Public License Version 1.1 (available at <a
+			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
+		</li>
+	</ul>
+
+	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
+		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
+		or Feature Update License is provided, please contact the Eclipse
+		Foundation to determine what terms and conditions govern that
+		particular Content.</p>
+
+
+	<h3>Use of Provisioning Technology</h3>
+
+	<p>
+		The Eclipse Foundation makes available provisioning software, examples
+		of which include, but are not limited to, p2 and the Eclipse Update
+		Manager (&quot;Provisioning Technology&quot;) for the purpose of
+		allowing users to install software, documentation, information and/or
+		other materials (collectively &quot;Installable Software&quot;). This
+		capability is provided with the intent of allowing such users to
+		install, extend and update Eclipse-based products. Information about
+		packaging Installable Software is available at <a
+			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		(&quot;Specification&quot;).
+	</p>
+
+	<p>You may use Provisioning Technology to allow other parties to
+		install Installable Software. You shall be responsible for enabling
+		the applicable license agreements relating to the Installable Software
+		to be presented to, and accepted by, the users of the Provisioning
+		Technology in accordance with the Specification. By using Provisioning
+		Technology in such a manner and making it available in accordance with
+		the Specification, you further acknowledge your agreement to, and the
+		acquisition of all necessary rights to permit the following:</p>
+
+	<ol>
+		<li>A series of actions may occur (&quot;Provisioning
+			Process&quot;) in which a user may execute the Provisioning
+			Technology on a machine (&quot;Target Machine&quot;) with the intent
+			of installing, extending or updating the functionality of an
+			Eclipse-based product.</li>
+		<li>During the Provisioning Process, the Provisioning Technology
+			may cause third party Installable Software or a portion thereof to be
+			accessed and copied to the Target Machine.</li>
+		<li>Pursuant to the Specification, you will provide to the user
+			the terms and conditions that govern the use of the Installable
+			Software (&quot;Installable Software Agreement&quot;) and such
+			Installable Software Agreement shall be accessed from the Target
+			Machine in accordance with the Specification. Such Installable
+			Software Agreement must inform the user of the terms and conditions
+			that govern the Installable Software and must solicit acceptance by
+			the end user in the manner prescribed in such Installable Software
+			Agreement. Upon such indication of agreement by the user, the
+			provisioning Technology will complete installation of the Installable
+			Software.</li>
+	</ol>
+
+	<h3>Cryptography</h3>
+
+	<p>Content may contain encryption software. The country in which
+		you are currently may have restrictions on the import, possession, and
+		use, and/or re-export to another country, of encryption software.
+		BEFORE using any encryption software, please check the country's laws,
+		regulations and policies concerning the import, possession, or use,
+		and re-export of encryption software, to see if this is permitted.</p>
+
+	<p>
+		<small>Java and all Java-based trademarks are trademarks of
+			Oracle Corporation in the United States, other countries, or both.</small>
+	</p>
 </body>
 </html>
diff --git a/org.eclipse.osbp.xtext.table.feature/LICENSE.txt b/org.eclipse.osbp.xtext.table.feature/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.xtext.table.feature/LICENSE.txt
+++ b/org.eclipse.osbp.xtext.table.feature/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION
-OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.
-A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate
-modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of
-its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute
-and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code
-form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the
-combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not
-apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no
-assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity
-based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property
-rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the
-Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to
-grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including
-warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
-other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it
-in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and
-the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes
-the Program in a commercial product offering should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions
-brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual
-property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may
- participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is
-then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.
-Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to
-those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result,
-the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for
-determining the appropriateness of using and distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance
-with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such
-Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such
-noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses
- granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement
-is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish
-new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the
-right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including Contributions) may always be
-distributed subject to the version of the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the
-new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States
-of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause
-of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-\ No newline at end of file
+Eclipse Foundation Software User Agreement
+
+November 22, 2017
+
+Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
+MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the Eclipse Foundation
+is provided to you under the terms and conditions of the Eclipse Public License
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
+"Program" will mean the Content.
+
+Content includes, but is not limited to, source code, object code, documentation
+and other files maintained in the Eclipse Foundation source code repository
+("Repository") in software modules ("Modules") and made available as
+downloadable archives ("Downloads").
+
+-   Content may be structured and packaged into modules to facilitate
+    delivering, extending, and upgrading the Content. Typical modules may
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and
+    features ("Features").
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR
+    (Java™ ARchive) in a directory named "plugins".
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and
+    associated material. Each Feature may be packaged as a sub-directory in a
+    directory named "features". Within a Feature, files named "feature.xml" may
+    contain a list of the names and version numbers of the Plug-ins and/or
+    Fragments associated with that Feature.
+-   Features may also include other Features ("Included Features"). Within a
+    Feature, files named "feature.xml" may contain a list of the names and
+    version numbers of Included Features.
+
+The terms and conditions governing Plug-ins and Fragments should be contained in
+files named "about.html" ("Abouts"). The terms and conditions governing Features
+and Included Features should be contained in files named "license.html"
+("Feature Licenses"). Abouts and Feature Licenses may be located in any
+directory of a Download or Module including, but not limited to the following
+locations:
+
+-   The top-level (root) directory
+-   Plug-in and Fragment directories
+-   Inside Plug-ins and Fragments packaged as JARs
+-   Sub-directories of the directory named "src" of certain Plug-ins
+-   Feature directories
+
+Note: if a Feature made available by the Eclipse Foundation is installed using
+the Provisioning Technology (as defined below), you must agree to a license
+("Feature Update License") during the installation process. If the Feature
+contains Included Features, the Feature Update License should either provide you
+with the terms and conditions governing the Included Features or inform you
+where you can locate them. Feature Update Licenses may be found in the "license"
+property of files named "feature.properties" found within a Feature. Such
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and
+conditions (or references to such terms and conditions) that govern your use of
+the associated Content in that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+-   Eclipse Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/epl-v10.html)
+-   Eclipse Distribution License Version 1.0 (available at
+    http://www.eclipse.org/licenses/edl-v1.0.html)
+-   Common Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/cpl-v10.html)
+-   Apache Software License 1.1 (available at
+    http://www.apache.org/licenses/LICENSE)
+-   Apache Software License 2.0 (available at
+    http://www.apache.org/licenses/LICENSE-2.0)
+-   Mozilla Public License Version 1.1 (available at
+    http://www.mozilla.org/MPL/MPL-1.1.html)
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is
+provided, please contact the Eclipse Foundation to determine what terms and
+conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which
+include, but are not limited to, p2 and the Eclipse Update Manager
+("Provisioning Technology") for the purpose of allowing users to install
+software, documentation, information and/or other materials (collectively
+"Installable Software"). This capability is provided with the intent of allowing
+such users to install, extend and update Eclipse-based products. Information
+about packaging Installable Software is available at
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
+
+You may use Provisioning Technology to allow other parties to install
+Installable Software. You shall be responsible for enabling the applicable
+license agreements relating to the Installable Software to be presented to, and
+accepted by, the users of the Provisioning Technology in accordance with the
+Specification. By using Provisioning Technology in such a manner and making it
+available in accordance with the Specification, you further acknowledge your
+agreement to, and the acquisition of all necessary rights to permit the
+following:
+
+1.  A series of actions may occur ("Provisioning Process") in which a user may
+    execute the Provisioning Technology on a machine ("Target Machine") with the
+    intent of installing, extending or updating the functionality of an
+    Eclipse-based product.
+2.  During the Provisioning Process, the Provisioning Technology may cause third
+    party Installable Software or a portion thereof to be accessed and copied to
+    the Target Machine.
+3.  Pursuant to the Specification, you will provide to the user the terms and
+    conditions that govern the use of the Installable Software ("Installable
+    Software Agreement") and such Installable Software Agreement shall be
+    accessed from the Target Machine in accordance with the Specification. Such
+    Installable Software Agreement must inform the user of the terms and
+    conditions that govern the Installable Software and must solicit acceptance
+    by the end user in the manner prescribed in such Installable
+    Software Agreement. Upon such indication of agreement by the user, the
+    provisioning Technology will complete installation of the
+    Installable Software.
+
+Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the
+United States, other countries, or both.
diff --git a/org.eclipse.osbp.xtext.table.feature/build.properties b/org.eclipse.osbp.xtext.table.feature/build.properties
index b8920ff..d6b1b0a 100644
--- a/org.eclipse.osbp.xtext.table.feature/build.properties
+++ b/org.eclipse.osbp.xtext.table.feature/build.properties
@@ -1,2 +1,2 @@
-bin.includes = license.html,  epl-v10.html,  feature.xml,\
+bin.includes = license.html,  epl-2.0.html,  feature.xml,\
                feature.properties
diff --git a/org.eclipse.osbp.xtext.table.feature/epl-2.0.html b/org.eclipse.osbp.xtext.table.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/org.eclipse.osbp.xtext.table.feature/epl-2.0.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Eclipse Public License - Version 2.0</title>
+    <style type="text/css">
+      body {
+        margin: 1.5em 3em;
+      }
+      h1{
+        font-size:1.5em;
+      }
+      h2{
+        font-size:1em;
+        margin-bottom:0.5em;
+        margin-top:1em;
+      }
+      p {
+        margin-top:  0.5em;
+        margin-bottom: 0.5em;
+      }
+      ul, ol{
+        list-style-type:none;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Eclipse Public License - v 2.0</h1>
+    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+      PUBLIC LICENSE (&ldquo;AGREEMENT&rdquo;). ANY USE, REPRODUCTION OR DISTRIBUTION
+      OF THE PROGRAM CONSTITUTES RECIPIENT&#039;S ACCEPTANCE OF THIS AGREEMENT.
+    </p>
+    <h2 id="definitions">1. DEFINITIONS</h2>
+    <p>&ldquo;Contribution&rdquo; means:</p>
+    <ul>
+      <li>a) in the case of the initial Contributor, the initial content
+        Distributed under this Agreement, and
+      </li>
+      <li>
+        b) in the case of each subsequent Contributor:
+        <ul>
+          <li>i) changes to the Program, and</li>
+          <li>ii) additions to the Program;</li>
+        </ul>
+        where such changes and/or additions to the Program originate from
+        and are Distributed by that particular Contributor. A Contribution
+        &ldquo;originates&rdquo; from a Contributor if it was added to the Program by such
+        Contributor itself or anyone acting on such Contributor&#039;s behalf.
+        Contributions do not include changes or additions to the Program that
+        are not Modified Works.
+      </li>
+    </ul>
+    <p>&ldquo;Contributor&rdquo; means any person or entity that Distributes the Program.</p>
+    <p>&ldquo;Licensed Patents&rdquo; mean patent claims licensable by a Contributor which
+      are necessarily infringed by the use or sale of its Contribution alone
+      or when combined with the Program.
+    </p>
+    <p>&ldquo;Program&rdquo; means the Contributions Distributed in accordance with this
+      Agreement.
+    </p>
+    <p>&ldquo;Recipient&rdquo; means anyone who receives the Program under this Agreement
+      or any Secondary License (as applicable), including Contributors.
+    </p>
+    <p>&ldquo;Derivative Works&rdquo; shall mean any work, whether in Source Code or other
+      form, that is based on (or derived from) the Program and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship.
+    </p>
+    <p>&ldquo;Modified Works&rdquo; shall mean any work in Source Code or other form that
+      results from an addition to, deletion from, or modification of the
+      contents of the Program, including, for purposes of clarity any new file
+      in Source Code form that contains any contents of the Program. Modified
+      Works shall not include works that contain only declarations, interfaces,
+      types, classes, structures, or files of the Program solely in each case
+      in order to link to, bind by name, or subclass the Program or Modified
+      Works thereof.
+    </p>
+    <p>&ldquo;Distribute&rdquo; means the acts of a) distributing or b) making available
+      in any manner that enables the transfer of a copy.
+    </p>
+    <p>&ldquo;Source Code&rdquo; means the form of a Program preferred for making
+      modifications, including but not limited to software source code,
+      documentation source, and configuration files.
+    </p>
+    <p>&ldquo;Secondary License&rdquo; means either the GNU General Public License,
+      Version 2.0, or any later versions of that license, including any
+      exceptions or additional permissions as identified by the initial
+      Contributor.
+    </p>
+    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+    <ul>
+      <li>a) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free copyright
+        license to reproduce, prepare Derivative Works of, publicly display,
+        publicly perform, Distribute and sublicense the Contribution of such
+        Contributor, if any, and such Derivative Works.
+      </li>
+      <li>b) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free patent
+        license under Licensed Patents to make, use, sell, offer to sell,
+        import and otherwise transfer the Contribution of such Contributor,
+        if any, in Source Code or other form. This patent license shall
+        apply to the combination of the Contribution and the Program if,
+        at the time the Contribution is added by the Contributor, such
+        addition of the Contribution causes such combination to be covered
+        by the Licensed Patents. The patent license shall not apply to any
+        other combinations which include the Contribution. No hardware per
+        se is licensed hereunder.
+      </li>
+      <li>c) Recipient understands that although each Contributor grants the
+        licenses to its Contributions set forth herein, no assurances are
+        provided by any Contributor that the Program does not infringe the
+        patent or other intellectual property rights of any other entity.
+        Each Contributor disclaims any liability to Recipient for claims
+        brought by any other entity based on infringement of intellectual
+        property rights or otherwise. As a condition to exercising the rights
+        and licenses granted hereunder, each Recipient hereby assumes sole
+        responsibility to secure any other intellectual property rights needed,
+        if any. For example, if a third party patent license is required to
+        allow Recipient to Distribute the Program, it is Recipient&#039;s
+        responsibility to acquire that license before distributing the Program.
+      </li>
+      <li>d) Each Contributor represents that to its knowledge it has sufficient
+        copyright rights in its Contribution, if any, to grant the copyright
+        license set forth in this Agreement.
+      </li>
+      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+        makes additional grants to any Recipient (other than those set forth
+        in this Agreement) as a result of such Recipient&#039;s receipt of the
+        Program under the terms of a Secondary License (if permitted under
+        the terms of Section 3).
+      </li>
+    </ul>
+    <h2 id="requirements">3. REQUIREMENTS</h2>
+    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+    <ul>
+      <li>a) the Program must also be made available as Source Code, in
+        accordance with section 3.2, and the Contributor must accompany
+        the Program with a statement that the Source Code for the Program
+        is available under this Agreement, and informs Recipients how to
+        obtain it in a reasonable manner on or through a medium customarily
+        used for software exchange; and
+      </li>
+      <li>
+        b) the Contributor may Distribute the Program under a license
+        different than this Agreement, provided that such license:
+        <ul>
+          <li>i) effectively disclaims on behalf of all other Contributors all
+            warranties and conditions, express and implied, including warranties
+            or conditions of title and non-infringement, and implied warranties
+            or conditions of merchantability and fitness for a particular purpose;
+          </li>
+          <li>ii) effectively excludes on behalf of all other Contributors all
+            liability for damages, including direct, indirect, special, incidental
+            and consequential damages, such as lost profits;
+          </li>
+          <li>iii) does not attempt to limit or alter the recipients&#039; rights in the
+            Source Code under section 3.2; and
+          </li>
+          <li>iv) requires any subsequent distribution of the Program by any party
+            to be under a license that satisfies the requirements of this section 3.
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <p>3.2 When the Program is Distributed as Source Code:</p>
+    <ul>
+      <li>a) it must be made available under this Agreement, or if the Program (i)
+        is combined with other material in a separate file or files made available
+        under a Secondary License, and (ii) the initial Contributor attached to
+        the Source Code the notice described in Exhibit A of this Agreement,
+        then the Program may be made available under the terms of such
+        Secondary Licenses, and
+      </li>
+      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+    </ul>
+    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+      attribution notices, disclaimers of warranty, or limitations of liability
+      (&lsquo;notices&rsquo;) contained within the Program from any copy of the Program which
+      they Distribute, provided that Contributors may add their own appropriate
+      notices.
+    </p>
+    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+    <p>Commercial distributors of software may accept certain responsibilities
+      with respect to end users, business partners and the like. While this
+      license is intended to facilitate the commercial use of the Program, the
+      Contributor who includes the Program in a commercial product offering should
+      do so in a manner which does not create potential liability for other
+      Contributors. Therefore, if a Contributor includes the Program in a
+      commercial product offering, such Contributor (&ldquo;Commercial Contributor&rdquo;)
+      hereby agrees to defend and indemnify every other Contributor
+      (&ldquo;Indemnified Contributor&rdquo;) against any losses, damages and costs
+      (collectively &ldquo;Losses&rdquo;) arising from claims, lawsuits and other legal actions
+      brought by a third party against the Indemnified Contributor to the extent
+      caused by the acts or omissions of such Commercial Contributor in connection
+      with its distribution of the Program in a commercial product offering.
+      The obligations in this section do not apply to any claims or Losses relating
+      to any actual or alleged intellectual property infringement. In order to
+      qualify, an Indemnified Contributor must: a) promptly notify the
+      Commercial Contributor in writing of such claim, and b) allow the Commercial
+      Contributor to control, and cooperate with the Commercial Contributor in,
+      the defense and any related settlement negotiations. The Indemnified
+      Contributor may participate in any such claim at its own expense.
+    </p>
+    <p>For example, a Contributor might include the Program
+      in a commercial product offering, Product X. That Contributor is then a
+      Commercial Contributor. If that Commercial Contributor then makes performance
+      claims, or offers warranties related to Product X, those performance claims
+      and warranties are such Commercial Contributor&#039;s responsibility alone.
+      Under this section, the Commercial Contributor would have to defend claims
+      against the other Contributors related to those performance claims and
+      warranties, and if a court requires any other Contributor to pay any damages
+      as a result, the Commercial Contributor must pay those damages.
+    </p>
+    <h2 id="warranty">5. NO WARRANTY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &ldquo;AS IS&rdquo; BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+      solely responsible for determining the appropriateness of using and
+      distributing the Program and assumes all risks associated with its
+      exercise of rights under this Agreement, including but not limited to the
+      risks and costs of program errors, compliance with applicable laws, damage
+      to or loss of data, programs or equipment, and unavailability or
+      interruption of operations.
+    </p>
+    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+    </p>
+    <h2 id="general">7. GENERAL</h2>
+    <p>If any provision of this Agreement is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability of the
+      remainder of the terms of this Agreement, and without further action by the
+      parties hereto, such provision shall be reformed to the minimum extent
+      necessary to make such provision valid and enforceable.
+    </p>
+    <p>If Recipient institutes patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+      (excluding combinations of the Program with other software or hardware)
+      infringes such Recipient&#039;s patent(s), then such Recipient&#039;s rights granted
+      under Section 2(b) shall terminate as of the date such litigation is filed.
+    </p>
+    <p>All Recipient&#039;s rights under this Agreement shall terminate if it fails to
+      comply with any of the material terms or conditions of this Agreement and
+      does not cure such failure in a reasonable period of time after becoming
+      aware of such noncompliance. If all Recipient&#039;s rights under this Agreement
+      terminate, Recipient agrees to cease use and distribution of the Program
+      as soon as reasonably practicable. However, Recipient&#039;s obligations under
+      this Agreement and any licenses granted by Recipient relating to the
+      Program shall continue and survive.
+    </p>
+    <p>Everyone is permitted to copy and distribute copies of this Agreement,
+      but in order to avoid inconsistency the Agreement is copyrighted and may
+      only be modified in the following manner. The Agreement Steward reserves
+      the right to publish new versions (including revisions) of this Agreement
+      from time to time. No one other than the Agreement Steward has the right
+      to modify this Agreement. The Eclipse Foundation is the initial Agreement
+      Steward. The Eclipse Foundation may assign the responsibility to serve as
+      the Agreement Steward to a suitable separate entity. Each new version of
+      the Agreement will be given a distinguishing version number. The Program
+      (including Contributions) may always be Distributed subject to the version
+      of the Agreement under which it was received. In addition, after a new
+      version of the Agreement is published, Contributor may elect to Distribute
+      the Program (including its Contributions) under the new version.
+    </p>
+    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+      receives no rights or licenses to the intellectual property of any
+      Contributor under this Agreement, whether expressly, by implication,
+      estoppel or otherwise. All rights in the Program not expressly granted
+      under this Agreement are reserved. Nothing in this Agreement is intended
+      to be enforceable by any entity that is not a Contributor or Recipient.
+      No third-party beneficiary rights are created under this Agreement.
+    </p>
+    <h2 id="exhibit-a">Exhibit A &ndash; Form of Secondary Licenses Notice</h2>
+    <p>&ldquo;This Source Code may also be made available under the following 
+    	Secondary Licenses when the conditions for such availability set forth 
+    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    	version(s), and exceptions or additional permissions here}.&rdquo;
+    </p>
+    <blockquote>
+      <p>Simply including a copy of this Agreement, including this Exhibit A
+        is not sufficient to license the Source Code under Secondary Licenses.
+      </p>
+      <p>If it is not possible or desirable to put the notice in a particular file,
+        then You may include the notice in a location (such as a LICENSE file in a
+        relevant directory) where a recipient would be likely to look for
+        such a notice.
+      </p>
+      <p>You may add additional accurate notices of copyright ownership.</p>
+    </blockquote>
+  </body>
+</html>
+\ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.table.feature/epl-v10.html b/org.eclipse.osbp.xtext.table.feature/epl-v10.html
deleted file mode 100644
index b398acc..0000000
--- a/org.eclipse.osbp.xtext.table.feature/epl-v10.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style>
-
-</head>
-
-<body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-
-
-</body></html>
-\ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.table.feature/feature.properties b/org.eclipse.osbp.xtext.table.feature/feature.properties
index 7a04c5f..f45af06 100644
--- a/org.eclipse.osbp.xtext.table.feature/feature.properties
+++ b/org.eclipse.osbp.xtext.table.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany).
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0 
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     Cristiano Gavi�o - initial API and implementation
@@ -30,10 +32,12 @@ updateSiteName=
 copyright=\
 Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) \n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0 \n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
 \n\
+SPDX-License-Identifier: EPL-2.0\n\
+\n
 ################ end of copyright property ####################################
 
 # "licenseURL" property - URL of the "Feature License"
@@ -44,126 +48,143 @@ licenseURL=license.html
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
+\n\
+November 22, 2017\n\
 \n\
 Usage Of Content\n\
 \n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
+MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public License\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
+"Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
+("Repository") in software modules ("Modules") and made available as\n\
+downloadable archives ("Downloads").\n\
+\n\
+-   Content may be structured and packaged into modules to facilitate\n\
+    delivering, extending, and upgrading the Content. Typical modules may\n\
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
+    features ("Features").\n\
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+    (Java™ ARchive) in a directory named "plugins".\n\
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
+    associated material. Each Feature may be packaged as a sub-directory in a\n\
+    directory named "features". Within a Feature, files named "feature.xml" may\n\
+    contain a list of the names and version numbers of the Plug-ins and/or\n\
+    Fragments associated with that Feature.\n\
+-   Features may also include other Features ("Included Features"). Within a\n\
+    Feature, files named "feature.xml" may contain a list of the names and\n\
+    version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
+and Included Features should be contained in files named "license.html"\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
+directory of a Download or Module including, but not limited to the following\n\
+locations:\n\
+\n\
+-   The top-level (root) directory\n\
+-   Plug-in and Fragment directories\n\
+-   Inside Plug-ins and Fragments packaged as JARs\n\
+-   Sub-directories of the directory named "src" of certain Plug-ins\n\
+-   Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
+("Feature Update License") during the installation process. If the Feature\n\
+contains Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform you\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
+property of files named "feature.properties" found within a Feature. Such\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
+the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+-   Eclipse Public License Version 1.0 (available at\n\
+    http://www.eclipse.org/legal/epl-v10.html)\n\
+-   Eclipse Distribution License Version 1.0 (available at\n\
+    http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+-   Common Public License Version 1.0 (available at\n\
+    http://www.eclipse.org/legal/cpl-v10.html)\n\
+-   Apache Software License 1.1 (available at\n\
+    http://www.apache.org/licenses/LICENSE)\n\
+-   Apache Software License 2.0 (available at\n\
+    http://www.apache.org/licenses/LICENSE-2.0)\n\
+-   Mozilla Public License Version 1.1 (available at\n\
+    http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
+conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which\n\
+include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install\n\
+software, documentation, information and/or other materials (collectively\n\
+"Installable Software"). This capability is provided with the intent of allowing\n\
+such users to install, extend and update Eclipse-based products. Information\n\
+about packaging Installable Software is available at\n\
 http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
 \n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
+You may use Provisioning Technology to allow other parties to install\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
+license agreements relating to the Installable Software to be presented to, and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
+available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
+following:\n\
+\n\
+1.  A series of actions may occur ("Provisioning Process") in which a user may\n\
+    execute the Provisioning Technology on a machine ("Target Machine") with the\n\
+    intent of installing, extending or updating the functionality of an\n\
+    Eclipse-based product.\n\
+2.  During the Provisioning Process, the Provisioning Technology may cause third\n\
+    party Installable Software or a portion thereof to be accessed and copied to\n\
+    the Target Machine.\n\
+3.  Pursuant to the Specification, you will provide to the user the terms and\n\
+    conditions that govern the use of the Installable Software ("Installable\n\
+    Software Agreement") and such Installable Software Agreement shall be\n\
+    accessed from the Target Machine in accordance with the Specification. Such\n\
+    Installable Software Agreement must inform the user of the terms and\n\
+    conditions that govern the Installable Software and must solicit acceptance\n\
+    by the end user in the manner prescribed in such Installable\n\
+    Software Agreement. Upon such indication of agreement by the user, the\n\
+    provisioning Technology will complete installation of the\n\
+    Installable Software.\n\
 \n\
 Cryptography\n\
 \n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
+Content may contain encryption software. The country in which you are currently\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
+permitted.\n\
 \n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
+United States, other countries, or both.\n
 ########### end of license property ##########################################
diff --git a/org.eclipse.osbp.xtext.table.feature/license.html b/org.eclipse.osbp.xtext.table.feature/license.html
index 6e579a5..008b801 100644
--- a/org.eclipse.osbp.xtext.table.feature/license.html
+++ b/org.eclipse.osbp.xtext.table.feature/license.html
@@ -1,164 +1,189 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>Eclipse Foundation Software User Agreement</title>
 </head>
 
 <body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse
- Foundation is provided to you under the terms and conditions of the 
-Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also
- available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse Foundation 
-source code
-   repository ("Repository") in software modules ("Modules") and made 
-available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to 
-facilitate delivering, extending, and upgrading the Content.  Typical 
-modules may include plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&#8482; ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or 
-Fragments and associated material.  Each Feature may be packaged as a 
-sub-directory in a directory named "features".  Within a Feature, files 
-named "feature.xml" may contain a list of the names and version numbers 
-of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included 
-Features"). Within a Feature, files named "feature.xml" may contain a 
-list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be 
-contained in files named "about.html" ("Abouts"). The terms and 
-conditions governing Features and
-Included Features should be contained in files named "license.html" 
-("Feature Licenses").  Abouts and Feature Licenses may be located in any
- directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is 
-installed using the Provisioning Technology (as defined below), you must
- agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the 
-Feature Update License should either provide you with the terms and 
-conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be 
-found in the "license" property of files named "feature.properties" 
-found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the 
-terms and conditions (or references to such terms and conditions) that 
-govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER 
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
-  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND 
-CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, 
-or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions 
-govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, 
-examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of 
-allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This 
-capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about 
-packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install
- Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to
- be presented to, and accepted by, the users of the Provisioning 
-Technology
-   in accordance with the Specification. By using Provisioning 
-Technology in such a manner and making it available in accordance with 
-the
-   Specification, you further acknowledge your agreement to, and the 
-acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in 
-which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, 
-extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology 
-may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user 
-the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable 
-Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable 
-Software Agreement must inform the user of the terms and conditions that
- govern
-       the Installable Software and must solicit acceptance by the end 
-user in the manner prescribed in such Installable Software Agreement. 
-Upon such
-       indication of agreement by the user, the provisioning Technology 
-will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are
- currently may have restrictions on the import, possession, and use, 
-and/or re-export to
-   another country, of encryption software. BEFORE using any encryption 
-software, please check the country's laws, regulations and policies 
-concerning the import,
-   possession, or use, and re-export of encryption software, to see if 
-this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-
-
-</body></html>
-\ No newline at end of file
+	<h2>Eclipse Foundation Software User Agreement</h2>
+	<p>November 22, 2017</p>
+
+	<h3>Usage Of Content</h3>
+
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+		USE THE CONTENT.</p>
+
+	<h3>Applicable Licenses</h3>
+
+	<p>
+		Unless otherwise indicated, all Content made available by the Eclipse
+		Foundation is provided to you under the terms and conditions of the
+		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
+		EPL is provided with this Content and is also available at <a
+			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>Content includes, but is not limited to, source code, object
+		code, documentation and other files maintained in the Eclipse
+		Foundation source code repository (&quot;Repository&quot;) in software
+		modules (&quot;Modules&quot;) and made available as downloadable
+		archives (&quot;Downloads&quot;).</p>
+
+	<ul>
+		<li>Content may be structured and packaged into modules to
+			facilitate delivering, extending, and upgrading the Content. Typical
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
+			fragments (&quot;Fragments&quot;), and features
+			(&quot;Features&quot;).</li>
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
+			or JAR (Java&trade; ARchive) in a directory named
+			&quot;plugins&quot;.</li>
+		<li>A Feature is a bundle of one or more Plug-ins and/or
+			Fragments and associated material. Each Feature may be packaged as a
+			sub-directory in a directory named &quot;features&quot;. Within a
+			Feature, files named &quot;feature.xml&quot; may contain a list of
+			the names and version numbers of the Plug-ins and/or Fragments
+			associated with that Feature.</li>
+		<li>Features may also include other Features (&quot;Included
+			Features&quot;). Within a Feature, files named
+			&quot;feature.xml&quot; may contain a list of the names and version
+			numbers of Included Features.</li>
+	</ul>
+
+	<p>The terms and conditions governing Plug-ins and Fragments should
+		be contained in files named &quot;about.html&quot;
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
+		Included Features should be contained in files named
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
+		Feature Licenses may be located in any directory of a Download or
+		Module including, but not limited to the following locations:</p>
+
+	<ul>
+		<li>The top-level (root) directory</li>
+		<li>Plug-in and Fragment directories</li>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Sub-directories of the directory named &quot;src&quot; of
+			certain Plug-ins</li>
+		<li>Feature directories</li>
+	</ul>
+
+	<p>Note: if a Feature made available by the Eclipse Foundation is
+		installed using the Provisioning Technology (as defined below), you
+		must agree to a license (&quot;Feature Update License&quot;) during
+		the installation process. If the Feature contains Included Features,
+		the Feature Update License should either provide you with the terms
+		and conditions governing the Included Features or inform you where you
+		can locate them. Feature Update Licenses may be found in the
+		&quot;license&quot; property of files named
+		&quot;feature.properties&quot; found within a Feature. Such Abouts,
+		Feature Licenses, and Feature Update Licenses contain the terms and
+		conditions (or references to such terms and conditions) that govern
+		your use of the associated Content in that directory.</p>
+
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
+		ARE NOT LIMITED TO):</p>
+
+	<ul>
+		<li>Eclipse Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
+		</li>
+		<li>Eclipse Distribution License Version 1.0 (available at <a
+			href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
+		</li>
+		<li>Common Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
+		</li>
+		<li>Apache Software License 1.1 (available at <a
+			href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
+		</li>
+		<li>Apache Software License 2.0 (available at <a
+			href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
+		</li>
+		<li>Mozilla Public License Version 1.1 (available at <a
+			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
+		</li>
+	</ul>
+
+	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
+		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
+		or Feature Update License is provided, please contact the Eclipse
+		Foundation to determine what terms and conditions govern that
+		particular Content.</p>
+
+
+	<h3>Use of Provisioning Technology</h3>
+
+	<p>
+		The Eclipse Foundation makes available provisioning software, examples
+		of which include, but are not limited to, p2 and the Eclipse Update
+		Manager (&quot;Provisioning Technology&quot;) for the purpose of
+		allowing users to install software, documentation, information and/or
+		other materials (collectively &quot;Installable Software&quot;). This
+		capability is provided with the intent of allowing such users to
+		install, extend and update Eclipse-based products. Information about
+		packaging Installable Software is available at <a
+			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		(&quot;Specification&quot;).
+	</p>
+
+	<p>You may use Provisioning Technology to allow other parties to
+		install Installable Software. You shall be responsible for enabling
+		the applicable license agreements relating to the Installable Software
+		to be presented to, and accepted by, the users of the Provisioning
+		Technology in accordance with the Specification. By using Provisioning
+		Technology in such a manner and making it available in accordance with
+		the Specification, you further acknowledge your agreement to, and the
+		acquisition of all necessary rights to permit the following:</p>
+
+	<ol>
+		<li>A series of actions may occur (&quot;Provisioning
+			Process&quot;) in which a user may execute the Provisioning
+			Technology on a machine (&quot;Target Machine&quot;) with the intent
+			of installing, extending or updating the functionality of an
+			Eclipse-based product.</li>
+		<li>During the Provisioning Process, the Provisioning Technology
+			may cause third party Installable Software or a portion thereof to be
+			accessed and copied to the Target Machine.</li>
+		<li>Pursuant to the Specification, you will provide to the user
+			the terms and conditions that govern the use of the Installable
+			Software (&quot;Installable Software Agreement&quot;) and such
+			Installable Software Agreement shall be accessed from the Target
+			Machine in accordance with the Specification. Such Installable
+			Software Agreement must inform the user of the terms and conditions
+			that govern the Installable Software and must solicit acceptance by
+			the end user in the manner prescribed in such Installable Software
+			Agreement. Upon such indication of agreement by the user, the
+			provisioning Technology will complete installation of the Installable
+			Software.</li>
+	</ol>
+
+	<h3>Cryptography</h3>
+
+	<p>Content may contain encryption software. The country in which
+		you are currently may have restrictions on the import, possession, and
+		use, and/or re-export to another country, of encryption software.
+		BEFORE using any encryption software, please check the country's laws,
+		regulations and policies concerning the import, possession, or use,
+		and re-export of encryption software, to see if this is permitted.</p>
+
+	<p>
+		<small>Java and all Java-based trademarks are trademarks of
+			Oracle Corporation in the United States, other countries, or both.</small>
+	</p>
+</body>
+</html>
diff --git a/org.eclipse.osbp.xtext.table.feature/pom.xml b/org.eclipse.osbp.xtext.table.feature/pom.xml
index ed7b0d5..89ca9af 100644
--- a/org.eclipse.osbp.xtext.table.feature/pom.xml
+++ b/org.eclipse.osbp.xtext.table.feature/pom.xml
@@ -2,9 +2,11 @@
 <!--#======================================================================= -->
 <!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany). -->
 <!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
+<!--# are made available under the terms of the Eclipse Public License 2.0  -->
 <!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
+<!--# https://www.eclipse.org/legal/epl-2.0/    -->
+<!--#                                           -->
+<!--# SPDX-License-Identifier: EPL-2.0          -->
 <!--# -->
 <!--# Contributors: -->
 <!--# Christophe Loetz  (Loetz GmbH&Co.KG) - Initial implementation API and implementation -->
diff --git a/org.eclipse.osbp.xtext.table.ide/LICENSE.txt b/org.eclipse.osbp.xtext.table.ide/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.xtext.table.ide/LICENSE.txt
+++ b/org.eclipse.osbp.xtext.table.ide/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION
-OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.
-A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate
-modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of
-its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute
-and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code
-form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the
-combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not
-apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no
-assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity
-based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property
-rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the
-Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to
-grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including
-warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
-other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it
-in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and
-the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes
-the Program in a commercial product offering should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions
-brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual
-property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may
- participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is
-then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.
-Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to
-those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result,
-the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for
-determining the appropriateness of using and distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance
-with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such
-Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such
-noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses
- granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement
-is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish
-new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the
-right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including Contributions) may always be
-distributed subject to the version of the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the
-new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States
-of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause
-of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-\ No newline at end of file
+Eclipse Foundation Software User Agreement
+
+November 22, 2017
+
+Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
+MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the Eclipse Foundation
+is provided to you under the terms and conditions of the Eclipse Public License
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
+"Program" will mean the Content.
+
+Content includes, but is not limited to, source code, object code, documentation
+and other files maintained in the Eclipse Foundation source code repository
+("Repository") in software modules ("Modules") and made available as
+downloadable archives ("Downloads").
+
+-   Content may be structured and packaged into modules to facilitate
+    delivering, extending, and upgrading the Content. Typical modules may
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and
+    features ("Features").
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR
+    (Java™ ARchive) in a directory named "plugins".
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and
+    associated material. Each Feature may be packaged as a sub-directory in a
+    directory named "features". Within a Feature, files named "feature.xml" may
+    contain a list of the names and version numbers of the Plug-ins and/or
+    Fragments associated with that Feature.
+-   Features may also include other Features ("Included Features"). Within a
+    Feature, files named "feature.xml" may contain a list of the names and
+    version numbers of Included Features.
+
+The terms and conditions governing Plug-ins and Fragments should be contained in
+files named "about.html" ("Abouts"). The terms and conditions governing Features
+and Included Features should be contained in files named "license.html"
+("Feature Licenses"). Abouts and Feature Licenses may be located in any
+directory of a Download or Module including, but not limited to the following
+locations:
+
+-   The top-level (root) directory
+-   Plug-in and Fragment directories
+-   Inside Plug-ins and Fragments packaged as JARs
+-   Sub-directories of the directory named "src" of certain Plug-ins
+-   Feature directories
+
+Note: if a Feature made available by the Eclipse Foundation is installed using
+the Provisioning Technology (as defined below), you must agree to a license
+("Feature Update License") during the installation process. If the Feature
+contains Included Features, the Feature Update License should either provide you
+with the terms and conditions governing the Included Features or inform you
+where you can locate them. Feature Update Licenses may be found in the "license"
+property of files named "feature.properties" found within a Feature. Such
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and
+conditions (or references to such terms and conditions) that govern your use of
+the associated Content in that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+-   Eclipse Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/epl-v10.html)
+-   Eclipse Distribution License Version 1.0 (available at
+    http://www.eclipse.org/licenses/edl-v1.0.html)
+-   Common Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/cpl-v10.html)
+-   Apache Software License 1.1 (available at
+    http://www.apache.org/licenses/LICENSE)
+-   Apache Software License 2.0 (available at
+    http://www.apache.org/licenses/LICENSE-2.0)
+-   Mozilla Public License Version 1.1 (available at
+    http://www.mozilla.org/MPL/MPL-1.1.html)
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is
+provided, please contact the Eclipse Foundation to determine what terms and
+conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which
+include, but are not limited to, p2 and the Eclipse Update Manager
+("Provisioning Technology") for the purpose of allowing users to install
+software, documentation, information and/or other materials (collectively
+"Installable Software"). This capability is provided with the intent of allowing
+such users to install, extend and update Eclipse-based products. Information
+about packaging Installable Software is available at
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
+
+You may use Provisioning Technology to allow other parties to install
+Installable Software. You shall be responsible for enabling the applicable
+license agreements relating to the Installable Software to be presented to, and
+accepted by, the users of the Provisioning Technology in accordance with the
+Specification. By using Provisioning Technology in such a manner and making it
+available in accordance with the Specification, you further acknowledge your
+agreement to, and the acquisition of all necessary rights to permit the
+following:
+
+1.  A series of actions may occur ("Provisioning Process") in which a user may
+    execute the Provisioning Technology on a machine ("Target Machine") with the
+    intent of installing, extending or updating the functionality of an
+    Eclipse-based product.
+2.  During the Provisioning Process, the Provisioning Technology may cause third
+    party Installable Software or a portion thereof to be accessed and copied to
+    the Target Machine.
+3.  Pursuant to the Specification, you will provide to the user the terms and
+    conditions that govern the use of the Installable Software ("Installable
+    Software Agreement") and such Installable Software Agreement shall be
+    accessed from the Target Machine in accordance with the Specification. Such
+    Installable Software Agreement must inform the user of the terms and
+    conditions that govern the Installable Software and must solicit acceptance
+    by the end user in the manner prescribed in such Installable
+    Software Agreement. Upon such indication of agreement by the user, the
+    provisioning Technology will complete installation of the
+    Installable Software.
+
+Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the
+United States, other countries, or both.
diff --git a/org.eclipse.osbp.xtext.table.ide/about.html b/org.eclipse.osbp.xtext.table.ide/about.html
index 64c0598..e8b834d 100644
--- a/org.eclipse.osbp.xtext.table.ide/about.html
+++ b/org.eclipse.osbp.xtext.table.ide/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 1, 2016</p>	
+<p>November 30, 2017</p>	
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/org.eclipse.osbp.xtext.table.ide/about.properties b/org.eclipse.osbp.xtext.table.ide/about.properties
index 1060156..5c4bd66 100644
--- a/org.eclipse.osbp.xtext.table.ide/about.properties
+++ b/org.eclipse.osbp.xtext.table.ide/about.properties
@@ -1,9 +1,11 @@
 #
 # Copyright (c) 2012, 2016 - Loetz GmbH&Co.KG (Heidelberg)
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0 
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
@@ -17,9 +19,11 @@ featureName=org.eclipse.osbp.xtext.table.tests
 featureText=\
 Copyright (c) 2012-2016 - Loetz GmbH&Co.KG \n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0 \n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
 \n\
 Contributors:\n\
     Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation\n
diff --git a/org.eclipse.osbp.xtext.table.ide/build.properties b/org.eclipse.osbp.xtext.table.ide/build.properties
index 1480806..3da55fd 100644
--- a/org.eclipse.osbp.xtext.table.ide/build.properties
+++ b/org.eclipse.osbp.xtext.table.ide/build.properties
@@ -13,9 +13,9 @@ bin.includes = about.properties,\
                .settings/,\
                license.html,\
                LICENSE.txt,\
-               epl-v10.html,\
+               epl-2.0.html,\
                src/,\
                src-gen/
 src.includes = about.properties,  about.mappings,  about.ini,  about.html,  license.html,\
                LICENSE.txt,\
-               epl-v10.html			   
+               epl-2.0.html			   
diff --git a/org.eclipse.osbp.xtext.table.ide/epl-2.0.html b/org.eclipse.osbp.xtext.table.ide/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/org.eclipse.osbp.xtext.table.ide/epl-2.0.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Eclipse Public License - Version 2.0</title>
+    <style type="text/css">
+      body {
+        margin: 1.5em 3em;
+      }
+      h1{
+        font-size:1.5em;
+      }
+      h2{
+        font-size:1em;
+        margin-bottom:0.5em;
+        margin-top:1em;
+      }
+      p {
+        margin-top:  0.5em;
+        margin-bottom: 0.5em;
+      }
+      ul, ol{
+        list-style-type:none;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Eclipse Public License - v 2.0</h1>
+    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+      PUBLIC LICENSE (&ldquo;AGREEMENT&rdquo;). ANY USE, REPRODUCTION OR DISTRIBUTION
+      OF THE PROGRAM CONSTITUTES RECIPIENT&#039;S ACCEPTANCE OF THIS AGREEMENT.
+    </p>
+    <h2 id="definitions">1. DEFINITIONS</h2>
+    <p>&ldquo;Contribution&rdquo; means:</p>
+    <ul>
+      <li>a) in the case of the initial Contributor, the initial content
+        Distributed under this Agreement, and
+      </li>
+      <li>
+        b) in the case of each subsequent Contributor:
+        <ul>
+          <li>i) changes to the Program, and</li>
+          <li>ii) additions to the Program;</li>
+        </ul>
+        where such changes and/or additions to the Program originate from
+        and are Distributed by that particular Contributor. A Contribution
+        &ldquo;originates&rdquo; from a Contributor if it was added to the Program by such
+        Contributor itself or anyone acting on such Contributor&#039;s behalf.
+        Contributions do not include changes or additions to the Program that
+        are not Modified Works.
+      </li>
+    </ul>
+    <p>&ldquo;Contributor&rdquo; means any person or entity that Distributes the Program.</p>
+    <p>&ldquo;Licensed Patents&rdquo; mean patent claims licensable by a Contributor which
+      are necessarily infringed by the use or sale of its Contribution alone
+      or when combined with the Program.
+    </p>
+    <p>&ldquo;Program&rdquo; means the Contributions Distributed in accordance with this
+      Agreement.
+    </p>
+    <p>&ldquo;Recipient&rdquo; means anyone who receives the Program under this Agreement
+      or any Secondary License (as applicable), including Contributors.
+    </p>
+    <p>&ldquo;Derivative Works&rdquo; shall mean any work, whether in Source Code or other
+      form, that is based on (or derived from) the Program and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship.
+    </p>
+    <p>&ldquo;Modified Works&rdquo; shall mean any work in Source Code or other form that
+      results from an addition to, deletion from, or modification of the
+      contents of the Program, including, for purposes of clarity any new file
+      in Source Code form that contains any contents of the Program. Modified
+      Works shall not include works that contain only declarations, interfaces,
+      types, classes, structures, or files of the Program solely in each case
+      in order to link to, bind by name, or subclass the Program or Modified
+      Works thereof.
+    </p>
+    <p>&ldquo;Distribute&rdquo; means the acts of a) distributing or b) making available
+      in any manner that enables the transfer of a copy.
+    </p>
+    <p>&ldquo;Source Code&rdquo; means the form of a Program preferred for making
+      modifications, including but not limited to software source code,
+      documentation source, and configuration files.
+    </p>
+    <p>&ldquo;Secondary License&rdquo; means either the GNU General Public License,
+      Version 2.0, or any later versions of that license, including any
+      exceptions or additional permissions as identified by the initial
+      Contributor.
+    </p>
+    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+    <ul>
+      <li>a) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free copyright
+        license to reproduce, prepare Derivative Works of, publicly display,
+        publicly perform, Distribute and sublicense the Contribution of such
+        Contributor, if any, and such Derivative Works.
+      </li>
+      <li>b) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free patent
+        license under Licensed Patents to make, use, sell, offer to sell,
+        import and otherwise transfer the Contribution of such Contributor,
+        if any, in Source Code or other form. This patent license shall
+        apply to the combination of the Contribution and the Program if,
+        at the time the Contribution is added by the Contributor, such
+        addition of the Contribution causes such combination to be covered
+        by the Licensed Patents. The patent license shall not apply to any
+        other combinations which include the Contribution. No hardware per
+        se is licensed hereunder.
+      </li>
+      <li>c) Recipient understands that although each Contributor grants the
+        licenses to its Contributions set forth herein, no assurances are
+        provided by any Contributor that the Program does not infringe the
+        patent or other intellectual property rights of any other entity.
+        Each Contributor disclaims any liability to Recipient for claims
+        brought by any other entity based on infringement of intellectual
+        property rights or otherwise. As a condition to exercising the rights
+        and licenses granted hereunder, each Recipient hereby assumes sole
+        responsibility to secure any other intellectual property rights needed,
+        if any. For example, if a third party patent license is required to
+        allow Recipient to Distribute the Program, it is Recipient&#039;s
+        responsibility to acquire that license before distributing the Program.
+      </li>
+      <li>d) Each Contributor represents that to its knowledge it has sufficient
+        copyright rights in its Contribution, if any, to grant the copyright
+        license set forth in this Agreement.
+      </li>
+      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+        makes additional grants to any Recipient (other than those set forth
+        in this Agreement) as a result of such Recipient&#039;s receipt of the
+        Program under the terms of a Secondary License (if permitted under
+        the terms of Section 3).
+      </li>
+    </ul>
+    <h2 id="requirements">3. REQUIREMENTS</h2>
+    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+    <ul>
+      <li>a) the Program must also be made available as Source Code, in
+        accordance with section 3.2, and the Contributor must accompany
+        the Program with a statement that the Source Code for the Program
+        is available under this Agreement, and informs Recipients how to
+        obtain it in a reasonable manner on or through a medium customarily
+        used for software exchange; and
+      </li>
+      <li>
+        b) the Contributor may Distribute the Program under a license
+        different than this Agreement, provided that such license:
+        <ul>
+          <li>i) effectively disclaims on behalf of all other Contributors all
+            warranties and conditions, express and implied, including warranties
+            or conditions of title and non-infringement, and implied warranties
+            or conditions of merchantability and fitness for a particular purpose;
+          </li>
+          <li>ii) effectively excludes on behalf of all other Contributors all
+            liability for damages, including direct, indirect, special, incidental
+            and consequential damages, such as lost profits;
+          </li>
+          <li>iii) does not attempt to limit or alter the recipients&#039; rights in the
+            Source Code under section 3.2; and
+          </li>
+          <li>iv) requires any subsequent distribution of the Program by any party
+            to be under a license that satisfies the requirements of this section 3.
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <p>3.2 When the Program is Distributed as Source Code:</p>
+    <ul>
+      <li>a) it must be made available under this Agreement, or if the Program (i)
+        is combined with other material in a separate file or files made available
+        under a Secondary License, and (ii) the initial Contributor attached to
+        the Source Code the notice described in Exhibit A of this Agreement,
+        then the Program may be made available under the terms of such
+        Secondary Licenses, and
+      </li>
+      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+    </ul>
+    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+      attribution notices, disclaimers of warranty, or limitations of liability
+      (&lsquo;notices&rsquo;) contained within the Program from any copy of the Program which
+      they Distribute, provided that Contributors may add their own appropriate
+      notices.
+    </p>
+    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+    <p>Commercial distributors of software may accept certain responsibilities
+      with respect to end users, business partners and the like. While this
+      license is intended to facilitate the commercial use of the Program, the
+      Contributor who includes the Program in a commercial product offering should
+      do so in a manner which does not create potential liability for other
+      Contributors. Therefore, if a Contributor includes the Program in a
+      commercial product offering, such Contributor (&ldquo;Commercial Contributor&rdquo;)
+      hereby agrees to defend and indemnify every other Contributor
+      (&ldquo;Indemnified Contributor&rdquo;) against any losses, damages and costs
+      (collectively &ldquo;Losses&rdquo;) arising from claims, lawsuits and other legal actions
+      brought by a third party against the Indemnified Contributor to the extent
+      caused by the acts or omissions of such Commercial Contributor in connection
+      with its distribution of the Program in a commercial product offering.
+      The obligations in this section do not apply to any claims or Losses relating
+      to any actual or alleged intellectual property infringement. In order to
+      qualify, an Indemnified Contributor must: a) promptly notify the
+      Commercial Contributor in writing of such claim, and b) allow the Commercial
+      Contributor to control, and cooperate with the Commercial Contributor in,
+      the defense and any related settlement negotiations. The Indemnified
+      Contributor may participate in any such claim at its own expense.
+    </p>
+    <p>For example, a Contributor might include the Program
+      in a commercial product offering, Product X. That Contributor is then a
+      Commercial Contributor. If that Commercial Contributor then makes performance
+      claims, or offers warranties related to Product X, those performance claims
+      and warranties are such Commercial Contributor&#039;s responsibility alone.
+      Under this section, the Commercial Contributor would have to defend claims
+      against the other Contributors related to those performance claims and
+      warranties, and if a court requires any other Contributor to pay any damages
+      as a result, the Commercial Contributor must pay those damages.
+    </p>
+    <h2 id="warranty">5. NO WARRANTY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &ldquo;AS IS&rdquo; BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+      solely responsible for determining the appropriateness of using and
+      distributing the Program and assumes all risks associated with its
+      exercise of rights under this Agreement, including but not limited to the
+      risks and costs of program errors, compliance with applicable laws, damage
+      to or loss of data, programs or equipment, and unavailability or
+      interruption of operations.
+    </p>
+    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+    </p>
+    <h2 id="general">7. GENERAL</h2>
+    <p>If any provision of this Agreement is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability of the
+      remainder of the terms of this Agreement, and without further action by the
+      parties hereto, such provision shall be reformed to the minimum extent
+      necessary to make such provision valid and enforceable.
+    </p>
+    <p>If Recipient institutes patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+      (excluding combinations of the Program with other software or hardware)
+      infringes such Recipient&#039;s patent(s), then such Recipient&#039;s rights granted
+      under Section 2(b) shall terminate as of the date such litigation is filed.
+    </p>
+    <p>All Recipient&#039;s rights under this Agreement shall terminate if it fails to
+      comply with any of the material terms or conditions of this Agreement and
+      does not cure such failure in a reasonable period of time after becoming
+      aware of such noncompliance. If all Recipient&#039;s rights under this Agreement
+      terminate, Recipient agrees to cease use and distribution of the Program
+      as soon as reasonably practicable. However, Recipient&#039;s obligations under
+      this Agreement and any licenses granted by Recipient relating to the
+      Program shall continue and survive.
+    </p>
+    <p>Everyone is permitted to copy and distribute copies of this Agreement,
+      but in order to avoid inconsistency the Agreement is copyrighted and may
+      only be modified in the following manner. The Agreement Steward reserves
+      the right to publish new versions (including revisions) of this Agreement
+      from time to time. No one other than the Agreement Steward has the right
+      to modify this Agreement. The Eclipse Foundation is the initial Agreement
+      Steward. The Eclipse Foundation may assign the responsibility to serve as
+      the Agreement Steward to a suitable separate entity. Each new version of
+      the Agreement will be given a distinguishing version number. The Program
+      (including Contributions) may always be Distributed subject to the version
+      of the Agreement under which it was received. In addition, after a new
+      version of the Agreement is published, Contributor may elect to Distribute
+      the Program (including its Contributions) under the new version.
+    </p>
+    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+      receives no rights or licenses to the intellectual property of any
+      Contributor under this Agreement, whether expressly, by implication,
+      estoppel or otherwise. All rights in the Program not expressly granted
+      under this Agreement are reserved. Nothing in this Agreement is intended
+      to be enforceable by any entity that is not a Contributor or Recipient.
+      No third-party beneficiary rights are created under this Agreement.
+    </p>
+    <h2 id="exhibit-a">Exhibit A &ndash; Form of Secondary Licenses Notice</h2>
+    <p>&ldquo;This Source Code may also be made available under the following 
+    	Secondary Licenses when the conditions for such availability set forth 
+    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    	version(s), and exceptions or additional permissions here}.&rdquo;
+    </p>
+    <blockquote>
+      <p>Simply including a copy of this Agreement, including this Exhibit A
+        is not sufficient to license the Source Code under Secondary Licenses.
+      </p>
+      <p>If it is not possible or desirable to put the notice in a particular file,
+        then You may include the notice in a location (such as a LICENSE file in a
+        relevant directory) where a recipient would be likely to look for
+        such a notice.
+      </p>
+      <p>You may add additional accurate notices of copyright ownership.</p>
+    </blockquote>
+  </body>
+</html>
+\ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.table.ide/epl-v10.html b/org.eclipse.osbp.xtext.table.ide/epl-v10.html
deleted file mode 100644
index b398acc..0000000
--- a/org.eclipse.osbp.xtext.table.ide/epl-v10.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style>
-
-</head>
-
-<body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-
-
-</body></html>
-\ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.table.ide/license.html b/org.eclipse.osbp.xtext.table.ide/license.html
index 6e579a5..008b801 100644
--- a/org.eclipse.osbp.xtext.table.ide/license.html
+++ b/org.eclipse.osbp.xtext.table.ide/license.html
@@ -1,164 +1,189 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>Eclipse Foundation Software User Agreement</title>
 </head>
 
 <body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse
- Foundation is provided to you under the terms and conditions of the 
-Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also
- available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse Foundation 
-source code
-   repository ("Repository") in software modules ("Modules") and made 
-available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to 
-facilitate delivering, extending, and upgrading the Content.  Typical 
-modules may include plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&#8482; ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or 
-Fragments and associated material.  Each Feature may be packaged as a 
-sub-directory in a directory named "features".  Within a Feature, files 
-named "feature.xml" may contain a list of the names and version numbers 
-of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included 
-Features"). Within a Feature, files named "feature.xml" may contain a 
-list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be 
-contained in files named "about.html" ("Abouts"). The terms and 
-conditions governing Features and
-Included Features should be contained in files named "license.html" 
-("Feature Licenses").  Abouts and Feature Licenses may be located in any
- directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is 
-installed using the Provisioning Technology (as defined below), you must
- agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the 
-Feature Update License should either provide you with the terms and 
-conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be 
-found in the "license" property of files named "feature.properties" 
-found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the 
-terms and conditions (or references to such terms and conditions) that 
-govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER 
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
-  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND 
-CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, 
-or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions 
-govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, 
-examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of 
-allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This 
-capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about 
-packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install
- Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to
- be presented to, and accepted by, the users of the Provisioning 
-Technology
-   in accordance with the Specification. By using Provisioning 
-Technology in such a manner and making it available in accordance with 
-the
-   Specification, you further acknowledge your agreement to, and the 
-acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in 
-which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, 
-extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology 
-may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user 
-the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable 
-Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable 
-Software Agreement must inform the user of the terms and conditions that
- govern
-       the Installable Software and must solicit acceptance by the end 
-user in the manner prescribed in such Installable Software Agreement. 
-Upon such
-       indication of agreement by the user, the provisioning Technology 
-will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are
- currently may have restrictions on the import, possession, and use, 
-and/or re-export to
-   another country, of encryption software. BEFORE using any encryption 
-software, please check the country's laws, regulations and policies 
-concerning the import,
-   possession, or use, and re-export of encryption software, to see if 
-this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-
-
-</body></html>
-\ No newline at end of file
+	<h2>Eclipse Foundation Software User Agreement</h2>
+	<p>November 22, 2017</p>
+
+	<h3>Usage Of Content</h3>
+
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+		USE THE CONTENT.</p>
+
+	<h3>Applicable Licenses</h3>
+
+	<p>
+		Unless otherwise indicated, all Content made available by the Eclipse
+		Foundation is provided to you under the terms and conditions of the
+		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
+		EPL is provided with this Content and is also available at <a
+			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>Content includes, but is not limited to, source code, object
+		code, documentation and other files maintained in the Eclipse
+		Foundation source code repository (&quot;Repository&quot;) in software
+		modules (&quot;Modules&quot;) and made available as downloadable
+		archives (&quot;Downloads&quot;).</p>
+
+	<ul>
+		<li>Content may be structured and packaged into modules to
+			facilitate delivering, extending, and upgrading the Content. Typical
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
+			fragments (&quot;Fragments&quot;), and features
+			(&quot;Features&quot;).</li>
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
+			or JAR (Java&trade; ARchive) in a directory named
+			&quot;plugins&quot;.</li>
+		<li>A Feature is a bundle of one or more Plug-ins and/or
+			Fragments and associated material. Each Feature may be packaged as a
+			sub-directory in a directory named &quot;features&quot;. Within a
+			Feature, files named &quot;feature.xml&quot; may contain a list of
+			the names and version numbers of the Plug-ins and/or Fragments
+			associated with that Feature.</li>
+		<li>Features may also include other Features (&quot;Included
+			Features&quot;). Within a Feature, files named
+			&quot;feature.xml&quot; may contain a list of the names and version
+			numbers of Included Features.</li>
+	</ul>
+
+	<p>The terms and conditions governing Plug-ins and Fragments should
+		be contained in files named &quot;about.html&quot;
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
+		Included Features should be contained in files named
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
+		Feature Licenses may be located in any directory of a Download or
+		Module including, but not limited to the following locations:</p>
+
+	<ul>
+		<li>The top-level (root) directory</li>
+		<li>Plug-in and Fragment directories</li>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Sub-directories of the directory named &quot;src&quot; of
+			certain Plug-ins</li>
+		<li>Feature directories</li>
+	</ul>
+
+	<p>Note: if a Feature made available by the Eclipse Foundation is
+		installed using the Provisioning Technology (as defined below), you
+		must agree to a license (&quot;Feature Update License&quot;) during
+		the installation process. If the Feature contains Included Features,
+		the Feature Update License should either provide you with the terms
+		and conditions governing the Included Features or inform you where you
+		can locate them. Feature Update Licenses may be found in the
+		&quot;license&quot; property of files named
+		&quot;feature.properties&quot; found within a Feature. Such Abouts,
+		Feature Licenses, and Feature Update Licenses contain the terms and
+		conditions (or references to such terms and conditions) that govern
+		your use of the associated Content in that directory.</p>
+
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
+		ARE NOT LIMITED TO):</p>
+
+	<ul>
+		<li>Eclipse Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
+		</li>
+		<li>Eclipse Distribution License Version 1.0 (available at <a
+			href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
+		</li>
+		<li>Common Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
+		</li>
+		<li>Apache Software License 1.1 (available at <a
+			href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
+		</li>
+		<li>Apache Software License 2.0 (available at <a
+			href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
+		</li>
+		<li>Mozilla Public License Version 1.1 (available at <a
+			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
+		</li>
+	</ul>
+
+	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
+		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
+		or Feature Update License is provided, please contact the Eclipse
+		Foundation to determine what terms and conditions govern that
+		particular Content.</p>
+
+
+	<h3>Use of Provisioning Technology</h3>
+
+	<p>
+		The Eclipse Foundation makes available provisioning software, examples
+		of which include, but are not limited to, p2 and the Eclipse Update
+		Manager (&quot;Provisioning Technology&quot;) for the purpose of
+		allowing users to install software, documentation, information and/or
+		other materials (collectively &quot;Installable Software&quot;). This
+		capability is provided with the intent of allowing such users to
+		install, extend and update Eclipse-based products. Information about
+		packaging Installable Software is available at <a
+			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		(&quot;Specification&quot;).
+	</p>
+
+	<p>You may use Provisioning Technology to allow other parties to
+		install Installable Software. You shall be responsible for enabling
+		the applicable license agreements relating to the Installable Software
+		to be presented to, and accepted by, the users of the Provisioning
+		Technology in accordance with the Specification. By using Provisioning
+		Technology in such a manner and making it available in accordance with
+		the Specification, you further acknowledge your agreement to, and the
+		acquisition of all necessary rights to permit the following:</p>
+
+	<ol>
+		<li>A series of actions may occur (&quot;Provisioning
+			Process&quot;) in which a user may execute the Provisioning
+			Technology on a machine (&quot;Target Machine&quot;) with the intent
+			of installing, extending or updating the functionality of an
+			Eclipse-based product.</li>
+		<li>During the Provisioning Process, the Provisioning Technology
+			may cause third party Installable Software or a portion thereof to be
+			accessed and copied to the Target Machine.</li>
+		<li>Pursuant to the Specification, you will provide to the user
+			the terms and conditions that govern the use of the Installable
+			Software (&quot;Installable Software Agreement&quot;) and such
+			Installable Software Agreement shall be accessed from the Target
+			Machine in accordance with the Specification. Such Installable
+			Software Agreement must inform the user of the terms and conditions
+			that govern the Installable Software and must solicit acceptance by
+			the end user in the manner prescribed in such Installable Software
+			Agreement. Upon such indication of agreement by the user, the
+			provisioning Technology will complete installation of the Installable
+			Software.</li>
+	</ol>
+
+	<h3>Cryptography</h3>
+
+	<p>Content may contain encryption software. The country in which
+		you are currently may have restrictions on the import, possession, and
+		use, and/or re-export to another country, of encryption software.
+		BEFORE using any encryption software, please check the country's laws,
+		regulations and policies concerning the import, possession, or use,
+		and re-export of encryption software, to see if this is permitted.</p>
+
+	<p>
+		<small>Java and all Java-based trademarks are trademarks of
+			Oracle Corporation in the United States, other countries, or both.</small>
+	</p>
+</body>
+</html>
diff --git a/org.eclipse.osbp.xtext.table.ide/pom.xml b/org.eclipse.osbp.xtext.table.ide/pom.xml
index 96fc98d..c6ebb84 100644
--- a/org.eclipse.osbp.xtext.table.ide/pom.xml
+++ b/org.eclipse.osbp.xtext.table.ide/pom.xml
@@ -2,9 +2,11 @@
 <!--#======================================================================= -->
 <!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
 <!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
+<!--# are made available under the terms of the Eclipse Public License 2.0  -->
 <!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
+<!--# https://www.eclipse.org/legal/epl-2.0/    -->
+<!--#                                           -->
+<!--# SPDX-License-Identifier: EPL-2.0          -->
 <!--# -->
 <!--# Contributors: -->
 <!--#     Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
diff --git a/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/AbstractTableDSLIdeModule.java b/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/AbstractTableDSLIdeModule.java
index 236a6dd..b442198 100644
--- a/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/AbstractTableDSLIdeModule.java
+++ b/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/AbstractTableDSLIdeModule.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.ide;
 
diff --git a/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/PartialTableDSLContentAssistParser.java b/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/PartialTableDSLContentAssistParser.java
index 2d0c4de..104fbe5 100644
--- a/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/PartialTableDSLContentAssistParser.java
+++ b/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/PartialTableDSLContentAssistParser.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.ide.contentassist.antlr;
 
diff --git a/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/TableDSLParser.java b/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/TableDSLParser.java
index 3ed5878..096cc62 100644
--- a/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/TableDSLParser.java
+++ b/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/TableDSLParser.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.ide.contentassist.antlr;
 
@@ -94,19 +105,12 @@ public class TableDSLParser extends AbstractContentAssistParser {
 					put(grammarAccess.getTableAccess().getGroup_3(), "rule__Table__Group_3__0");
 					put(grammarAccess.getTableSelectionAccess().getGroup(), "rule__TableSelection__Group__0");
 					put(grammarAccess.getTableSelectionAccess().getGroup_3_1(), "rule__TableSelection__Group_3_1__0");
-					put(grammarAccess.getTableSelectionAccess().getGroup_3_2(), "rule__TableSelection__Group_3_2__0");
-					put(grammarAccess.getTableSelectionAccess().getGroup_3_5(), "rule__TableSelection__Group_3_5__0");
+					put(grammarAccess.getTableSelectionAccess().getGroup_3_4(), "rule__TableSelection__Group_3_4__0");
 					put(grammarAccess.getTableSelectionAccess().getGroup_4(), "rule__TableSelection__Group_4__0");
 					put(grammarAccess.getTableTableAccess().getGroup(), "rule__TableTable__Group__0");
 					put(grammarAccess.getTableTableAccess().getGroup_2_2(), "rule__TableTable__Group_2_2__0");
-					put(grammarAccess.getTableTableAccess().getGroup_2_3(), "rule__TableTable__Group_2_3__0");
-					put(grammarAccess.getTableTableAccess().getGroup_2_6(), "rule__TableTable__Group_2_6__0");
+					put(grammarAccess.getTableTableAccess().getGroup_2_5(), "rule__TableTable__Group_2_5__0");
 					put(grammarAccess.getTableTableAccess().getGroup_3(), "rule__TableTable__Group_3__0");
-					put(grammarAccess.getTableBeanAccess().getGroup(), "rule__TableBean__Group__0");
-					put(grammarAccess.getTableBeanAccess().getGroup_2_2(), "rule__TableBean__Group_2_2__0");
-					put(grammarAccess.getTableBeanAccess().getGroup_2_3(), "rule__TableBean__Group_2_3__0");
-					put(grammarAccess.getTableBeanAccess().getGroup_2_6(), "rule__TableBean__Group_2_6__0");
-					put(grammarAccess.getTableBeanAccess().getGroup_3(), "rule__TableBean__Group_3__0");
 					put(grammarAccess.getTablePreorderAccess().getGroup(), "rule__TablePreorder__Group__0");
 					put(grammarAccess.getTableValueAccess().getGroup(), "rule__TableValue__Group__0");
 					put(grammarAccess.getTableValueAccess().getGroup_3_1(), "rule__TableValue__Group_3_1__0");
@@ -145,10 +149,6 @@ public class TableDSLParser extends AbstractContentAssistParser {
 					put(grammarAccess.getTableTrendAccess().getGroup(), "rule__TableTrend__Group__0");
 					put(grammarAccess.getTableTooltipAccess().getGroup(), "rule__TableTooltip__Group__0");
 					put(grammarAccess.getTableGridAccess().getGroup(), "rule__TableGrid__Group__0");
-					put(grammarAccess.getTableGridAccess().getGroup_2_1(), "rule__TableGrid__Group_2_1__0");
-					put(grammarAccess.getTableGridAccess().getGroup_3_0(), "rule__TableGrid__Group_3_0__0");
-					put(grammarAccess.getTableGridAccess().getGroup_3_3(), "rule__TableGrid__Group_3_3__0");
-					put(grammarAccess.getTableGridAccess().getGroup_4(), "rule__TableGrid__Group_4__0");
 					put(grammarAccess.getPropertyAccess().getGroup(), "rule__Property__Group__0");
 					put(grammarAccess.getTableDtoDatasourceAccess().getGroup(), "rule__TableDtoDatasource__Group__0");
 					put(grammarAccess.getTableDtoDatasourceAccess().getGroup_2(), "rule__TableDtoDatasource__Group_2__0");
@@ -166,6 +166,7 @@ public class TableDSLParser extends AbstractContentAssistParser {
 					put(grammarAccess.getPropertyPriceStyleAccess().getGroup(), "rule__PropertyPriceStyle__Group__0");
 					put(grammarAccess.getPropertyPriceStyleAccess().getGroup_6(), "rule__PropertyPriceStyle__Group_6__0");
 					put(grammarAccess.getPropertyTextStyleAccess().getGroup(), "rule__PropertyTextStyle__Group__0");
+					put(grammarAccess.getPropertyBlobImageStyleAccess().getGroup(), "rule__PropertyBlobImageStyle__Group__0");
 					put(grammarAccess.getPropertyImageStyleAccess().getGroup(), "rule__PropertyImageStyle__Group__0");
 					put(grammarAccess.getPropertyImageStyleAccess().getGroup_2(), "rule__PropertyImageStyle__Group_2__0");
 					put(grammarAccess.getNumericToResourceStyleConfigAccess().getGroup(), "rule__NumericToResourceStyleConfig__Group__0");
@@ -386,30 +387,17 @@ public class TableDSLParser extends AbstractContentAssistParser {
 					put(grammarAccess.getTableSelectionAccess().getMultiSelectionAssignment_2_0(), "rule__TableSelection__MultiSelectionAssignment_2_0");
 					put(grammarAccess.getTableSelectionAccess().getSelectalwaysAssignment_3_0(), "rule__TableSelection__SelectalwaysAssignment_3_0");
 					put(grammarAccess.getTableSelectionAccess().getHeaderModeAssignment_3_1_1(), "rule__TableSelection__HeaderModeAssignment_3_1_1");
-					put(grammarAccess.getTableSelectionAccess().getPollingAssignment_3_2_0(), "rule__TableSelection__PollingAssignment_3_2_0");
-					put(grammarAccess.getTableSelectionAccess().getPollingTimeAssignment_3_2_1(), "rule__TableSelection__PollingTimeAssignment_3_2_1");
-					put(grammarAccess.getTableSelectionAccess().getFilteringAssignment_3_3(), "rule__TableSelection__FilteringAssignment_3_3");
-					put(grammarAccess.getTableSelectionAccess().getEmbeddedAssignment_3_4(), "rule__TableSelection__EmbeddedAssignment_3_4");
-					put(grammarAccess.getTableSelectionAccess().getToolbarAssignment_3_5_1(), "rule__TableSelection__ToolbarAssignment_3_5_1");
+					put(grammarAccess.getTableSelectionAccess().getFilteringAssignment_3_2(), "rule__TableSelection__FilteringAssignment_3_2");
+					put(grammarAccess.getTableSelectionAccess().getEmbeddedAssignment_3_3(), "rule__TableSelection__EmbeddedAssignment_3_3");
+					put(grammarAccess.getTableSelectionAccess().getToolbarAssignment_3_4_1(), "rule__TableSelection__ToolbarAssignment_3_4_1");
 					put(grammarAccess.getTableSelectionAccess().getSourceAssignment_4_1(), "rule__TableSelection__SourceAssignment_4_1");
 					put(grammarAccess.getTableTableAccess().getSelectalwaysAssignment_2_0(), "rule__TableTable__SelectalwaysAssignment_2_0");
 					put(grammarAccess.getTableTableAccess().getSelectByIdAssignment_2_1(), "rule__TableTable__SelectByIdAssignment_2_1");
 					put(grammarAccess.getTableTableAccess().getHeaderModeAssignment_2_2_1(), "rule__TableTable__HeaderModeAssignment_2_2_1");
-					put(grammarAccess.getTableTableAccess().getPollingAssignment_2_3_0(), "rule__TableTable__PollingAssignment_2_3_0");
-					put(grammarAccess.getTableTableAccess().getPollingTimeAssignment_2_3_1(), "rule__TableTable__PollingTimeAssignment_2_3_1");
-					put(grammarAccess.getTableTableAccess().getFilteringAssignment_2_4(), "rule__TableTable__FilteringAssignment_2_4");
-					put(grammarAccess.getTableTableAccess().getEmbeddedAssignment_2_5(), "rule__TableTable__EmbeddedAssignment_2_5");
-					put(grammarAccess.getTableTableAccess().getToolbarAssignment_2_6_1(), "rule__TableTable__ToolbarAssignment_2_6_1");
+					put(grammarAccess.getTableTableAccess().getFilteringAssignment_2_3(), "rule__TableTable__FilteringAssignment_2_3");
+					put(grammarAccess.getTableTableAccess().getEmbeddedAssignment_2_4(), "rule__TableTable__EmbeddedAssignment_2_4");
+					put(grammarAccess.getTableTableAccess().getToolbarAssignment_2_5_1(), "rule__TableTable__ToolbarAssignment_2_5_1");
 					put(grammarAccess.getTableTableAccess().getSourceAssignment_3_1(), "rule__TableTable__SourceAssignment_3_1");
-					put(grammarAccess.getTableBeanAccess().getSelectalwaysAssignment_2_0(), "rule__TableBean__SelectalwaysAssignment_2_0");
-					put(grammarAccess.getTableBeanAccess().getSelectByIdAssignment_2_1(), "rule__TableBean__SelectByIdAssignment_2_1");
-					put(grammarAccess.getTableBeanAccess().getHeaderModeAssignment_2_2_1(), "rule__TableBean__HeaderModeAssignment_2_2_1");
-					put(grammarAccess.getTableBeanAccess().getPollingAssignment_2_3_0(), "rule__TableBean__PollingAssignment_2_3_0");
-					put(grammarAccess.getTableBeanAccess().getPollingTimeAssignment_2_3_1(), "rule__TableBean__PollingTimeAssignment_2_3_1");
-					put(grammarAccess.getTableBeanAccess().getFilteringAssignment_2_4(), "rule__TableBean__FilteringAssignment_2_4");
-					put(grammarAccess.getTableBeanAccess().getEmbeddedAssignment_2_5(), "rule__TableBean__EmbeddedAssignment_2_5");
-					put(grammarAccess.getTableBeanAccess().getToolbarAssignment_2_6_1(), "rule__TableBean__ToolbarAssignment_2_6_1");
-					put(grammarAccess.getTableBeanAccess().getSourceAssignment_3_1(), "rule__TableBean__SourceAssignment_3_1");
 					put(grammarAccess.getTablePreorderAccess().getColumnAssignment_2(), "rule__TablePreorder__ColumnAssignment_2");
 					put(grammarAccess.getTablePreorderAccess().getAscendingAssignment_3(), "rule__TablePreorder__AscendingAssignment_3");
 					put(grammarAccess.getTableValueAccess().getColumnAssignment_2(), "rule__TableValue__ColumnAssignment_2");
@@ -467,14 +455,7 @@ public class TableDSLParser extends AbstractContentAssistParser {
 					put(grammarAccess.getTableIconAccess().getIconAssignment_1(), "rule__TableIcon__IconAssignment_1");
 					put(grammarAccess.getTableTrendAccess().getIconAssignment_1(), "rule__TableTrend__IconAssignment_1");
 					put(grammarAccess.getTableTooltipAccess().getTooltipAssignment_1(), "rule__TableTooltip__TooltipAssignment_1");
-					put(grammarAccess.getTableGridAccess().getSelectalwaysAssignment_2_0(), "rule__TableGrid__SelectalwaysAssignment_2_0");
-					put(grammarAccess.getTableGridAccess().getHeaderModeAssignment_2_1_1(), "rule__TableGrid__HeaderModeAssignment_2_1_1");
-					put(grammarAccess.getTableGridAccess().getPollingAssignment_3_0_0(), "rule__TableGrid__PollingAssignment_3_0_0");
-					put(grammarAccess.getTableGridAccess().getPollingTimeAssignment_3_0_1(), "rule__TableGrid__PollingTimeAssignment_3_0_1");
-					put(grammarAccess.getTableGridAccess().getFilteringAssignment_3_1(), "rule__TableGrid__FilteringAssignment_3_1");
-					put(grammarAccess.getTableGridAccess().getEmbeddedAssignment_3_2(), "rule__TableGrid__EmbeddedAssignment_3_2");
-					put(grammarAccess.getTableGridAccess().getToolbarAssignment_3_3_1(), "rule__TableGrid__ToolbarAssignment_3_3_1");
-					put(grammarAccess.getTableGridAccess().getSourceAssignment_4_1(), "rule__TableGrid__SourceAssignment_4_1");
+					put(grammarAccess.getTableGridAccess().getSourceAssignment_3(), "rule__TableGrid__SourceAssignment_3");
 					put(grammarAccess.getPropertyAccess().getEditableAssignment_0(), "rule__Property__EditableAssignment_0");
 					put(grammarAccess.getPropertyAccess().getPathAssignment_2(), "rule__Property__PathAssignment_2");
 					put(grammarAccess.getPropertyAccess().getStyleAssignment_4(), "rule__Property__StyleAssignment_4");
@@ -665,13 +646,10 @@ public class TableDSLParser extends AbstractContentAssistParser {
 					put(grammarAccess.getXImportSectionAccess().getImportDeclarationsAssignment(), "rule__XImportSection__ImportDeclarationsAssignment");
 					put(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), "rule__TableSelection__UnorderedGroup_3");
 					put(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), "rule__TableTable__UnorderedGroup_2");
-					put(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), "rule__TableBean__UnorderedGroup_2");
 					put(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), "rule__TableValue__UnorderedGroup_3");
 					put(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), "rule__TableValue__UnorderedGroup_4");
 					put(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), "rule__TableImage__UnorderedGroup_3");
 					put(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), "rule__TableAxis__UnorderedGroup_2");
-					put(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), "rule__TableGrid__UnorderedGroup_2");
-					put(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), "rule__TableGrid__UnorderedGroup_3");
 				}
 			};
 		}
diff --git a/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSL.g b/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSL.g
index cb5ffd9..85de43f 100644
--- a/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSL.g
+++ b/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSL.g
@@ -200,31 +200,6 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-// Entry rule entryRuleTableBean
-entryRuleTableBean
-:
-{ before(grammarAccess.getTableBeanRule()); }
-	 ruleTableBean
-{ after(grammarAccess.getTableBeanRule()); } 
-	 EOF 
-;
-
-// Rule TableBean
-ruleTableBean 
-	@init {
-		int stackSize = keepStackSize();
-	}
-	:
-	(
-		{ before(grammarAccess.getTableBeanAccess().getGroup()); }
-		(rule__TableBean__Group__0)
-		{ after(grammarAccess.getTableBeanAccess().getGroup()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
 // Entry rule entryRuleTablePreorder
 entryRuleTablePreorder
 :
@@ -1425,6 +1400,31 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+// Entry rule entryRulePropertyBlobImageStyle
+entryRulePropertyBlobImageStyle
+:
+{ before(grammarAccess.getPropertyBlobImageStyleRule()); }
+	 rulePropertyBlobImageStyle
+{ after(grammarAccess.getPropertyBlobImageStyleRule()); } 
+	 EOF 
+;
+
+// Rule PropertyBlobImageStyle
+rulePropertyBlobImageStyle 
+	@init {
+		int stackSize = keepStackSize();
+	}
+	:
+	(
+		{ before(grammarAccess.getPropertyBlobImageStyleAccess().getGroup()); }
+		(rule__PropertyBlobImageStyle__Group__0)
+		{ after(grammarAccess.getPropertyBlobImageStyleAccess().getGroup()); }
+	)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 // Entry rule entryRulePropertyImageStyle
 entryRulePropertyImageStyle
 :
@@ -3783,12 +3783,6 @@ rule__TableOption__Alternatives
 		ruleTableGrid
 		{ after(grammarAccess.getTableOptionAccess().getTableGridParserRuleCall_2()); }
 	)
-	|
-	(
-		{ before(grammarAccess.getTableOptionAccess().getTableBeanParserRuleCall_3()); }
-		ruleTableBean
-		{ after(grammarAccess.getTableOptionAccess().getTableBeanParserRuleCall_3()); }
-	)
 ;
 finally {
 	restoreStackSize(stackSize);
@@ -4031,9 +4025,15 @@ rule__PropertyStyle__Alternatives
 	)
 	|
 	(
-		{ before(grammarAccess.getPropertyStyleAccess().getGridPropIndicatorStyleParserRuleCall_8()); }
+		{ before(grammarAccess.getPropertyStyleAccess().getPropertyBlobImageStyleParserRuleCall_8()); }
+		rulePropertyBlobImageStyle
+		{ after(grammarAccess.getPropertyStyleAccess().getPropertyBlobImageStyleParserRuleCall_8()); }
+	)
+	|
+	(
+		{ before(grammarAccess.getPropertyStyleAccess().getGridPropIndicatorStyleParserRuleCall_9()); }
 		ruleGridPropIndicatorStyle
-		{ after(grammarAccess.getPropertyStyleAccess().getGridPropIndicatorStyleParserRuleCall_8()); }
+		{ after(grammarAccess.getPropertyStyleAccess().getGridPropIndicatorStyleParserRuleCall_9()); }
 	)
 ;
 finally {
@@ -6053,107 +6053,53 @@ finally {
 }
 
 
-rule__TableSelection__Group_3_2__0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableSelection__Group_3_2__0__Impl
-	rule__TableSelection__Group_3_2__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableSelection__Group_3_2__0__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableSelectionAccess().getPollingAssignment_3_2_0()); }
-	(rule__TableSelection__PollingAssignment_3_2_0)
-	{ after(grammarAccess.getTableSelectionAccess().getPollingAssignment_3_2_0()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableSelection__Group_3_2__1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableSelection__Group_3_2__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableSelection__Group_3_2__1__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableSelectionAccess().getPollingTimeAssignment_3_2_1()); }
-	(rule__TableSelection__PollingTimeAssignment_3_2_1)
-	{ after(grammarAccess.getTableSelectionAccess().getPollingTimeAssignment_3_2_1()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__TableSelection__Group_3_5__0
+rule__TableSelection__Group_3_4__0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__TableSelection__Group_3_5__0__Impl
-	rule__TableSelection__Group_3_5__1
+	rule__TableSelection__Group_3_4__0__Impl
+	rule__TableSelection__Group_3_4__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__TableSelection__Group_3_5__0__Impl
+rule__TableSelection__Group_3_4__0__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getTableSelectionAccess().getToolbarKeyword_3_5_0()); }
+	{ before(grammarAccess.getTableSelectionAccess().getToolbarKeyword_3_4_0()); }
 	'toolbar'
-	{ after(grammarAccess.getTableSelectionAccess().getToolbarKeyword_3_5_0()); }
+	{ after(grammarAccess.getTableSelectionAccess().getToolbarKeyword_3_4_0()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__TableSelection__Group_3_5__1
+rule__TableSelection__Group_3_4__1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__TableSelection__Group_3_5__1__Impl
+	rule__TableSelection__Group_3_4__1__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__TableSelection__Group_3_5__1__Impl
+rule__TableSelection__Group_3_4__1__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getTableSelectionAccess().getToolbarAssignment_3_5_1()); }
-	(rule__TableSelection__ToolbarAssignment_3_5_1)
-	{ after(grammarAccess.getTableSelectionAccess().getToolbarAssignment_3_5_1()); }
+	{ before(grammarAccess.getTableSelectionAccess().getToolbarAssignment_3_4_1()); }
+	(rule__TableSelection__ToolbarAssignment_3_4_1)
+	{ after(grammarAccess.getTableSelectionAccess().getToolbarAssignment_3_4_1()); }
 )
 ;
 finally {
@@ -6260,9 +6206,9 @@ rule__TableTable__Group__1__Impl
 	}
 :
 (
-	{ before(grammarAccess.getTableTableAccess().getTableKeyword_1()); }
-	'table'
-	{ after(grammarAccess.getTableTableAccess().getTableKeyword_1()); }
+	{ before(grammarAccess.getTableTableAccess().getReadOnlyKeyword_1()); }
+	'readOnly'
+	{ after(grammarAccess.getTableTableAccess().getReadOnlyKeyword_1()); }
 )
 ;
 finally {
@@ -6377,107 +6323,53 @@ finally {
 }
 
 
-rule__TableTable__Group_2_3__0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableTable__Group_2_3__0__Impl
-	rule__TableTable__Group_2_3__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableTable__Group_2_3__0__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableTableAccess().getPollingAssignment_2_3_0()); }
-	(rule__TableTable__PollingAssignment_2_3_0)
-	{ after(grammarAccess.getTableTableAccess().getPollingAssignment_2_3_0()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableTable__Group_2_3__1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableTable__Group_2_3__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableTable__Group_2_3__1__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableTableAccess().getPollingTimeAssignment_2_3_1()); }
-	(rule__TableTable__PollingTimeAssignment_2_3_1)
-	{ after(grammarAccess.getTableTableAccess().getPollingTimeAssignment_2_3_1()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__TableTable__Group_2_6__0
+rule__TableTable__Group_2_5__0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__TableTable__Group_2_6__0__Impl
-	rule__TableTable__Group_2_6__1
+	rule__TableTable__Group_2_5__0__Impl
+	rule__TableTable__Group_2_5__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__TableTable__Group_2_6__0__Impl
+rule__TableTable__Group_2_5__0__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getTableTableAccess().getToolbarKeyword_2_6_0()); }
+	{ before(grammarAccess.getTableTableAccess().getToolbarKeyword_2_5_0()); }
 	'toolbar'
-	{ after(grammarAccess.getTableTableAccess().getToolbarKeyword_2_6_0()); }
+	{ after(grammarAccess.getTableTableAccess().getToolbarKeyword_2_5_0()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__TableTable__Group_2_6__1
+rule__TableTable__Group_2_5__1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__TableTable__Group_2_6__1__Impl
+	rule__TableTable__Group_2_5__1__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__TableTable__Group_2_6__1__Impl
+rule__TableTable__Group_2_5__1__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getTableTableAccess().getToolbarAssignment_2_6_1()); }
-	(rule__TableTable__ToolbarAssignment_2_6_1)
-	{ after(grammarAccess.getTableTableAccess().getToolbarAssignment_2_6_1()); }
+	{ before(grammarAccess.getTableTableAccess().getToolbarAssignment_2_5_1()); }
+	(rule__TableTable__ToolbarAssignment_2_5_1)
+	{ after(grammarAccess.getTableTableAccess().getToolbarAssignment_2_5_1()); }
 )
 ;
 finally {
@@ -6539,330 +6431,6 @@ finally {
 }
 
 
-rule__TableBean__Group__0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__Group__0__Impl
-	rule__TableBean__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group__0__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableBeanAccess().getTableBeanAction_0()); }
-	()
-	{ after(grammarAccess.getTableBeanAccess().getTableBeanAction_0()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group__1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__Group__1__Impl
-	rule__TableBean__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group__1__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableBeanAccess().getBeanKeyword_1()); }
-	'bean'
-	{ after(grammarAccess.getTableBeanAccess().getBeanKeyword_1()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group__2
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__Group__2__Impl
-	rule__TableBean__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group__2__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableBeanAccess().getUnorderedGroup_2()); }
-	(rule__TableBean__UnorderedGroup_2)
-	{ after(grammarAccess.getTableBeanAccess().getUnorderedGroup_2()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group__3
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__Group__3__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group__3__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableBeanAccess().getGroup_3()); }
-	(rule__TableBean__Group_3__0)?
-	{ after(grammarAccess.getTableBeanAccess().getGroup_3()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__TableBean__Group_2_2__0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__Group_2_2__0__Impl
-	rule__TableBean__Group_2_2__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group_2_2__0__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableBeanAccess().getRowHeaderKeyword_2_2_0()); }
-	'rowHeader'
-	{ after(grammarAccess.getTableBeanAccess().getRowHeaderKeyword_2_2_0()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group_2_2__1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__Group_2_2__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group_2_2__1__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableBeanAccess().getHeaderModeAssignment_2_2_1()); }
-	(rule__TableBean__HeaderModeAssignment_2_2_1)
-	{ after(grammarAccess.getTableBeanAccess().getHeaderModeAssignment_2_2_1()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__TableBean__Group_2_3__0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__Group_2_3__0__Impl
-	rule__TableBean__Group_2_3__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group_2_3__0__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableBeanAccess().getPollingAssignment_2_3_0()); }
-	(rule__TableBean__PollingAssignment_2_3_0)
-	{ after(grammarAccess.getTableBeanAccess().getPollingAssignment_2_3_0()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group_2_3__1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__Group_2_3__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group_2_3__1__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableBeanAccess().getPollingTimeAssignment_2_3_1()); }
-	(rule__TableBean__PollingTimeAssignment_2_3_1)
-	{ after(grammarAccess.getTableBeanAccess().getPollingTimeAssignment_2_3_1()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__TableBean__Group_2_6__0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__Group_2_6__0__Impl
-	rule__TableBean__Group_2_6__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group_2_6__0__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableBeanAccess().getToolbarKeyword_2_6_0()); }
-	'toolbar'
-	{ after(grammarAccess.getTableBeanAccess().getToolbarKeyword_2_6_0()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group_2_6__1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__Group_2_6__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group_2_6__1__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableBeanAccess().getToolbarAssignment_2_6_1()); }
-	(rule__TableBean__ToolbarAssignment_2_6_1)
-	{ after(grammarAccess.getTableBeanAccess().getToolbarAssignment_2_6_1()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__TableBean__Group_3__0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__Group_3__0__Impl
-	rule__TableBean__Group_3__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group_3__0__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableBeanAccess().getUsingKeyword_3_0()); }
-	'using'
-	{ after(grammarAccess.getTableBeanAccess().getUsingKeyword_3_0()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group_3__1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__Group_3__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__Group_3__1__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableBeanAccess().getSourceAssignment_3_1()); }
-	(rule__TableBean__SourceAssignment_3_1)
-	{ after(grammarAccess.getTableBeanAccess().getSourceAssignment_3_1()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
 rule__TablePreorder__Group__0
 	@init {
 		int stackSize = keepStackSize();
@@ -9959,9 +9527,9 @@ rule__TableGrid__Group__1__Impl
 	}
 :
 (
-	{ before(grammarAccess.getTableGridAccess().getGridKeyword_1()); }
-	'grid'
-	{ after(grammarAccess.getTableGridAccess().getGridKeyword_1()); }
+	{ before(grammarAccess.getTableGridAccess().getEditableKeyword_1()); }
+	'editable'
+	{ after(grammarAccess.getTableGridAccess().getEditableKeyword_1()); }
 )
 ;
 finally {
@@ -9986,9 +9554,9 @@ rule__TableGrid__Group__2__Impl
 	}
 :
 (
-	{ before(grammarAccess.getTableGridAccess().getUnorderedGroup_2()); }
-	(rule__TableGrid__UnorderedGroup_2)
-	{ after(grammarAccess.getTableGridAccess().getUnorderedGroup_2()); }
+	{ before(grammarAccess.getTableGridAccess().getUsingKeyword_2()); }
+	'using'
+	{ after(grammarAccess.getTableGridAccess().getUsingKeyword_2()); }
 )
 ;
 finally {
@@ -10001,7 +9569,6 @@ rule__TableGrid__Group__3
 	}
 :
 	rule__TableGrid__Group__3__Impl
-	rule__TableGrid__Group__4
 ;
 finally {
 	restoreStackSize(stackSize);
@@ -10013,251 +9580,9 @@ rule__TableGrid__Group__3__Impl
 	}
 :
 (
-	{ before(grammarAccess.getTableGridAccess().getUnorderedGroup_3()); }
-	(rule__TableGrid__UnorderedGroup_3)
-	{ after(grammarAccess.getTableGridAccess().getUnorderedGroup_3()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__Group__4
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableGrid__Group__4__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__Group__4__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableGridAccess().getGroup_4()); }
-	(rule__TableGrid__Group_4__0)?
-	{ after(grammarAccess.getTableGridAccess().getGroup_4()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__TableGrid__Group_2_1__0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableGrid__Group_2_1__0__Impl
-	rule__TableGrid__Group_2_1__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__Group_2_1__0__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableGridAccess().getRowheaderKeyword_2_1_0()); }
-	'rowheader'
-	{ after(grammarAccess.getTableGridAccess().getRowheaderKeyword_2_1_0()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__Group_2_1__1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableGrid__Group_2_1__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__Group_2_1__1__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableGridAccess().getHeaderModeAssignment_2_1_1()); }
-	(rule__TableGrid__HeaderModeAssignment_2_1_1)
-	{ after(grammarAccess.getTableGridAccess().getHeaderModeAssignment_2_1_1()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__TableGrid__Group_3_0__0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableGrid__Group_3_0__0__Impl
-	rule__TableGrid__Group_3_0__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__Group_3_0__0__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableGridAccess().getPollingAssignment_3_0_0()); }
-	(rule__TableGrid__PollingAssignment_3_0_0)
-	{ after(grammarAccess.getTableGridAccess().getPollingAssignment_3_0_0()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__Group_3_0__1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableGrid__Group_3_0__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__Group_3_0__1__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableGridAccess().getPollingTimeAssignment_3_0_1()); }
-	(rule__TableGrid__PollingTimeAssignment_3_0_1)
-	{ after(grammarAccess.getTableGridAccess().getPollingTimeAssignment_3_0_1()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__TableGrid__Group_3_3__0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableGrid__Group_3_3__0__Impl
-	rule__TableGrid__Group_3_3__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__Group_3_3__0__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableGridAccess().getToolbarKeyword_3_3_0()); }
-	'toolbar'
-	{ after(grammarAccess.getTableGridAccess().getToolbarKeyword_3_3_0()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__Group_3_3__1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableGrid__Group_3_3__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__Group_3_3__1__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableGridAccess().getToolbarAssignment_3_3_1()); }
-	(rule__TableGrid__ToolbarAssignment_3_3_1)
-	{ after(grammarAccess.getTableGridAccess().getToolbarAssignment_3_3_1()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__TableGrid__Group_4__0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableGrid__Group_4__0__Impl
-	rule__TableGrid__Group_4__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__Group_4__0__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableGridAccess().getUsingKeyword_4_0()); }
-	'using'
-	{ after(grammarAccess.getTableGridAccess().getUsingKeyword_4_0()); }
-)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__Group_4__1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableGrid__Group_4__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__Group_4__1__Impl
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-(
-	{ before(grammarAccess.getTableGridAccess().getSourceAssignment_4_1()); }
-	(rule__TableGrid__SourceAssignment_4_1)
-	{ after(grammarAccess.getTableGridAccess().getSourceAssignment_4_1()); }
+	{ before(grammarAccess.getTableGridAccess().getSourceAssignment_3()); }
+	(rule__TableGrid__SourceAssignment_3)
+	{ after(grammarAccess.getTableGridAccess().getSourceAssignment_3()); }
 )
 ;
 finally {
@@ -11507,6 +10832,60 @@ finally {
 }
 
 
+rule__PropertyBlobImageStyle__Group__0
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	rule__PropertyBlobImageStyle__Group__0__Impl
+	rule__PropertyBlobImageStyle__Group__1
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__PropertyBlobImageStyle__Group__0__Impl
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+(
+	{ before(grammarAccess.getPropertyBlobImageStyleAccess().getCxGridPropBlobImageStyleAction_0()); }
+	()
+	{ after(grammarAccess.getPropertyBlobImageStyleAccess().getCxGridPropBlobImageStyleAction_0()); }
+)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__PropertyBlobImageStyle__Group__1
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	rule__PropertyBlobImageStyle__Group__1__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__PropertyBlobImageStyle__Group__1__Impl
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+(
+	{ before(grammarAccess.getPropertyBlobImageStyleAccess().getBlobImageStyleKeyword_1()); }
+	'blobImageStyle'
+	{ after(grammarAccess.getPropertyBlobImageStyleAccess().getBlobImageStyleKeyword_1()); }
+)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
 rule__PropertyImageStyle__Group__0
 	@init {
 		int stackSize = keepStackSize();
@@ -25243,9 +24622,9 @@ rule__TableSelection__UnorderedGroup_3__Impl
 					selected = true;
 				}
 				(
-					{ before(grammarAccess.getTableSelectionAccess().getGroup_3_2()); }
-					(rule__TableSelection__Group_3_2__0)
-					{ after(grammarAccess.getTableSelectionAccess().getGroup_3_2()); }
+					{ before(grammarAccess.getTableSelectionAccess().getFilteringAssignment_3_2()); }
+					(rule__TableSelection__FilteringAssignment_3_2)
+					{ after(grammarAccess.getTableSelectionAccess().getFilteringAssignment_3_2()); }
 				)
 			)
 		)|
@@ -25258,9 +24637,9 @@ rule__TableSelection__UnorderedGroup_3__Impl
 					selected = true;
 				}
 				(
-					{ before(grammarAccess.getTableSelectionAccess().getFilteringAssignment_3_3()); }
-					(rule__TableSelection__FilteringAssignment_3_3)
-					{ after(grammarAccess.getTableSelectionAccess().getFilteringAssignment_3_3()); }
+					{ before(grammarAccess.getTableSelectionAccess().getEmbeddedAssignment_3_3()); }
+					(rule__TableSelection__EmbeddedAssignment_3_3)
+					{ after(grammarAccess.getTableSelectionAccess().getEmbeddedAssignment_3_3()); }
 				)
 			)
 		)|
@@ -25273,24 +24652,9 @@ rule__TableSelection__UnorderedGroup_3__Impl
 					selected = true;
 				}
 				(
-					{ before(grammarAccess.getTableSelectionAccess().getEmbeddedAssignment_3_4()); }
-					(rule__TableSelection__EmbeddedAssignment_3_4)
-					{ after(grammarAccess.getTableSelectionAccess().getEmbeddedAssignment_3_4()); }
-				)
-			)
-		)|
-		( 
-			{getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5)}?=>(
-				{
-					getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5);
-				}
-				{
-					selected = true;
-				}
-				(
-					{ before(grammarAccess.getTableSelectionAccess().getGroup_3_5()); }
-					(rule__TableSelection__Group_3_5__0)
-					{ after(grammarAccess.getTableSelectionAccess().getGroup_3_5()); }
+					{ before(grammarAccess.getTableSelectionAccess().getGroup_3_4()); }
+					(rule__TableSelection__Group_3_4__0)
+					{ after(grammarAccess.getTableSelectionAccess().getGroup_3_4()); }
 				)
 			)
 		)
@@ -25356,18 +24720,6 @@ rule__TableSelection__UnorderedGroup_3__4
 	}
 :
 	rule__TableSelection__UnorderedGroup_3__Impl
-	rule__TableSelection__UnorderedGroup_3__5?
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableSelection__UnorderedGroup_3__5
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableSelection__UnorderedGroup_3__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
@@ -25449,9 +24801,9 @@ rule__TableTable__UnorderedGroup_2__Impl
 					selected = true;
 				}
 				(
-					{ before(grammarAccess.getTableTableAccess().getGroup_2_3()); }
-					(rule__TableTable__Group_2_3__0)
-					{ after(grammarAccess.getTableTableAccess().getGroup_2_3()); }
+					{ before(grammarAccess.getTableTableAccess().getFilteringAssignment_2_3()); }
+					(rule__TableTable__FilteringAssignment_2_3)
+					{ after(grammarAccess.getTableTableAccess().getFilteringAssignment_2_3()); }
 				)
 			)
 		)|
@@ -25464,9 +24816,9 @@ rule__TableTable__UnorderedGroup_2__Impl
 					selected = true;
 				}
 				(
-					{ before(grammarAccess.getTableTableAccess().getFilteringAssignment_2_4()); }
-					(rule__TableTable__FilteringAssignment_2_4)
-					{ after(grammarAccess.getTableTableAccess().getFilteringAssignment_2_4()); }
+					{ before(grammarAccess.getTableTableAccess().getEmbeddedAssignment_2_4()); }
+					(rule__TableTable__EmbeddedAssignment_2_4)
+					{ after(grammarAccess.getTableTableAccess().getEmbeddedAssignment_2_4()); }
 				)
 			)
 		)|
@@ -25479,24 +24831,9 @@ rule__TableTable__UnorderedGroup_2__Impl
 					selected = true;
 				}
 				(
-					{ before(grammarAccess.getTableTableAccess().getEmbeddedAssignment_2_5()); }
-					(rule__TableTable__EmbeddedAssignment_2_5)
-					{ after(grammarAccess.getTableTableAccess().getEmbeddedAssignment_2_5()); }
-				)
-			)
-		)|
-		( 
-			{getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6)}?=>(
-				{
-					getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6);
-				}
-				{
-					selected = true;
-				}
-				(
-					{ before(grammarAccess.getTableTableAccess().getGroup_2_6()); }
-					(rule__TableTable__Group_2_6__0)
-					{ after(grammarAccess.getTableTableAccess().getGroup_2_6()); }
+					{ before(grammarAccess.getTableTableAccess().getGroup_2_5()); }
+					(rule__TableTable__Group_2_5__0)
+					{ after(grammarAccess.getTableTableAccess().getGroup_2_5()); }
 				)
 			)
 		)
@@ -25574,236 +24911,6 @@ rule__TableTable__UnorderedGroup_2__5
 	}
 :
 	rule__TableTable__UnorderedGroup_2__Impl
-	rule__TableTable__UnorderedGroup_2__6?
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableTable__UnorderedGroup_2__6
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableTable__UnorderedGroup_2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__TableBean__UnorderedGroup_2
-	@init {
-		int stackSize = keepStackSize();
-		getUnorderedGroupHelper().enter(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-	}
-:
-	rule__TableBean__UnorderedGroup_2__0
-	?
-;
-finally {
-	getUnorderedGroupHelper().leave(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__UnorderedGroup_2__Impl
-	@init {
-		int stackSize = keepStackSize();
-		boolean selected = false;
-	}
-:
-		(
-		( 
-			{getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0)}?=>(
-				{
-					getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0);
-				}
-				{
-					selected = true;
-				}
-				(
-					{ before(grammarAccess.getTableBeanAccess().getSelectalwaysAssignment_2_0()); }
-					(rule__TableBean__SelectalwaysAssignment_2_0)
-					{ after(grammarAccess.getTableBeanAccess().getSelectalwaysAssignment_2_0()); }
-				)
-			)
-		)|
-		( 
-			{getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1)}?=>(
-				{
-					getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1);
-				}
-				{
-					selected = true;
-				}
-				(
-					{ before(grammarAccess.getTableBeanAccess().getSelectByIdAssignment_2_1()); }
-					(rule__TableBean__SelectByIdAssignment_2_1)
-					{ after(grammarAccess.getTableBeanAccess().getSelectByIdAssignment_2_1()); }
-				)
-			)
-		)|
-		( 
-			{getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2)}?=>(
-				{
-					getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2);
-				}
-				{
-					selected = true;
-				}
-				(
-					{ before(grammarAccess.getTableBeanAccess().getGroup_2_2()); }
-					(rule__TableBean__Group_2_2__0)
-					{ after(grammarAccess.getTableBeanAccess().getGroup_2_2()); }
-				)
-			)
-		)|
-		( 
-			{getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3)}?=>(
-				{
-					getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3);
-				}
-				{
-					selected = true;
-				}
-				(
-					{ before(grammarAccess.getTableBeanAccess().getGroup_2_3()); }
-					(rule__TableBean__Group_2_3__0)
-					{ after(grammarAccess.getTableBeanAccess().getGroup_2_3()); }
-				)
-			)
-		)|
-		( 
-			{getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4)}?=>(
-				{
-					getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4);
-				}
-				{
-					selected = true;
-				}
-				(
-					{ before(grammarAccess.getTableBeanAccess().getFilteringAssignment_2_4()); }
-					(rule__TableBean__FilteringAssignment_2_4)
-					{ after(grammarAccess.getTableBeanAccess().getFilteringAssignment_2_4()); }
-				)
-			)
-		)|
-		( 
-			{getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5)}?=>(
-				{
-					getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5);
-				}
-				{
-					selected = true;
-				}
-				(
-					{ before(grammarAccess.getTableBeanAccess().getEmbeddedAssignment_2_5()); }
-					(rule__TableBean__EmbeddedAssignment_2_5)
-					{ after(grammarAccess.getTableBeanAccess().getEmbeddedAssignment_2_5()); }
-				)
-			)
-		)|
-		( 
-			{getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6)}?=>(
-				{
-					getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6);
-				}
-				{
-					selected = true;
-				}
-				(
-					{ before(grammarAccess.getTableBeanAccess().getGroup_2_6()); }
-					(rule__TableBean__Group_2_6__0)
-					{ after(grammarAccess.getTableBeanAccess().getGroup_2_6()); }
-				)
-			)
-		)
-		)
-;
-finally {
-	if (selected)
-		getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__UnorderedGroup_2__0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__UnorderedGroup_2__Impl
-	rule__TableBean__UnorderedGroup_2__1?
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__UnorderedGroup_2__1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__UnorderedGroup_2__Impl
-	rule__TableBean__UnorderedGroup_2__2?
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__UnorderedGroup_2__2
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__UnorderedGroup_2__Impl
-	rule__TableBean__UnorderedGroup_2__3?
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__UnorderedGroup_2__3
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__UnorderedGroup_2__Impl
-	rule__TableBean__UnorderedGroup_2__4?
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__UnorderedGroup_2__4
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__UnorderedGroup_2__Impl
-	rule__TableBean__UnorderedGroup_2__5?
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__UnorderedGroup_2__5
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__UnorderedGroup_2__Impl
-	rule__TableBean__UnorderedGroup_2__6?
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__UnorderedGroup_2__6
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableBean__UnorderedGroup_2__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
@@ -26250,226 +25357,6 @@ finally {
 }
 
 
-rule__TableGrid__UnorderedGroup_2
-	@init {
-		int stackSize = keepStackSize();
-		getUnorderedGroupHelper().enter(grammarAccess.getTableGridAccess().getUnorderedGroup_2());
-	}
-:
-	rule__TableGrid__UnorderedGroup_2__0
-	?
-;
-finally {
-	getUnorderedGroupHelper().leave(grammarAccess.getTableGridAccess().getUnorderedGroup_2());
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__UnorderedGroup_2__Impl
-	@init {
-		int stackSize = keepStackSize();
-		boolean selected = false;
-	}
-:
-		(
-		( 
-			{getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0)}?=>(
-				{
-					getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0);
-				}
-				{
-					selected = true;
-				}
-				(
-					{ before(grammarAccess.getTableGridAccess().getSelectalwaysAssignment_2_0()); }
-					(rule__TableGrid__SelectalwaysAssignment_2_0)
-					{ after(grammarAccess.getTableGridAccess().getSelectalwaysAssignment_2_0()); }
-				)
-			)
-		)|
-		( 
-			{getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 1)}?=>(
-				{
-					getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 1);
-				}
-				{
-					selected = true;
-				}
-				(
-					{ before(grammarAccess.getTableGridAccess().getGroup_2_1()); }
-					(rule__TableGrid__Group_2_1__0)
-					{ after(grammarAccess.getTableGridAccess().getGroup_2_1()); }
-				)
-			)
-		)
-		)
-;
-finally {
-	if (selected)
-		getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_2());
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__UnorderedGroup_2__0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableGrid__UnorderedGroup_2__Impl
-	rule__TableGrid__UnorderedGroup_2__1?
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__UnorderedGroup_2__1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableGrid__UnorderedGroup_2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__TableGrid__UnorderedGroup_3
-	@init {
-		int stackSize = keepStackSize();
-		getUnorderedGroupHelper().enter(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-	}
-:
-	rule__TableGrid__UnorderedGroup_3__0
-	?
-;
-finally {
-	getUnorderedGroupHelper().leave(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__UnorderedGroup_3__Impl
-	@init {
-		int stackSize = keepStackSize();
-		boolean selected = false;
-	}
-:
-		(
-		( 
-			{getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0)}?=>(
-				{
-					getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0);
-				}
-				{
-					selected = true;
-				}
-				(
-					{ before(grammarAccess.getTableGridAccess().getGroup_3_0()); }
-					(rule__TableGrid__Group_3_0__0)
-					{ after(grammarAccess.getTableGridAccess().getGroup_3_0()); }
-				)
-			)
-		)|
-		( 
-			{getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1)}?=>(
-				{
-					getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1);
-				}
-				{
-					selected = true;
-				}
-				(
-					{ before(grammarAccess.getTableGridAccess().getFilteringAssignment_3_1()); }
-					(rule__TableGrid__FilteringAssignment_3_1)
-					{ after(grammarAccess.getTableGridAccess().getFilteringAssignment_3_1()); }
-				)
-			)
-		)|
-		( 
-			{getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2)}?=>(
-				{
-					getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2);
-				}
-				{
-					selected = true;
-				}
-				(
-					{ before(grammarAccess.getTableGridAccess().getEmbeddedAssignment_3_2()); }
-					(rule__TableGrid__EmbeddedAssignment_3_2)
-					{ after(grammarAccess.getTableGridAccess().getEmbeddedAssignment_3_2()); }
-				)
-			)
-		)|
-		( 
-			{getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3)}?=>(
-				{
-					getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3);
-				}
-				{
-					selected = true;
-				}
-				(
-					{ before(grammarAccess.getTableGridAccess().getGroup_3_3()); }
-					(rule__TableGrid__Group_3_3__0)
-					{ after(grammarAccess.getTableGridAccess().getGroup_3_3()); }
-				)
-			)
-		)
-		)
-;
-finally {
-	if (selected)
-		getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__UnorderedGroup_3__0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableGrid__UnorderedGroup_3__Impl
-	rule__TableGrid__UnorderedGroup_3__1?
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__UnorderedGroup_3__1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableGrid__UnorderedGroup_3__Impl
-	rule__TableGrid__UnorderedGroup_3__2?
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__UnorderedGroup_3__2
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableGrid__UnorderedGroup_3__Impl
-	rule__TableGrid__UnorderedGroup_3__3?
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__UnorderedGroup_3__3
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	rule__TableGrid__UnorderedGroup_3__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
 rule__TableModel__ImportSectionAssignment_0
 	@init {
 		int stackSize = keepStackSize();
@@ -26647,91 +25534,57 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__TableSelection__PollingAssignment_3_2_0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableSelectionAccess().getPollingPollingKeyword_3_2_0_0()); }
-		(
-			{ before(grammarAccess.getTableSelectionAccess().getPollingPollingKeyword_3_2_0_0()); }
-			'polling'
-			{ after(grammarAccess.getTableSelectionAccess().getPollingPollingKeyword_3_2_0_0()); }
-		)
-		{ after(grammarAccess.getTableSelectionAccess().getPollingPollingKeyword_3_2_0_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableSelection__PollingTimeAssignment_3_2_1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableSelectionAccess().getPollingTimeNumberParserRuleCall_3_2_1_0()); }
-		ruleNumber
-		{ after(grammarAccess.getTableSelectionAccess().getPollingTimeNumberParserRuleCall_3_2_1_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableSelection__FilteringAssignment_3_3
+rule__TableSelection__FilteringAssignment_3_2
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_3_0()); }
+		{ before(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_2_0()); }
 		(
-			{ before(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_3_0()); }
+			{ before(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_2_0()); }
 			'filtering'
-			{ after(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_3_0()); }
+			{ after(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_2_0()); }
 		)
-		{ after(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_3_0()); }
+		{ after(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_2_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__TableSelection__EmbeddedAssignment_3_4
+rule__TableSelection__EmbeddedAssignment_3_3
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_4_0()); }
+		{ before(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_3_0()); }
 		(
-			{ before(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_4_0()); }
+			{ before(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_3_0()); }
 			'embedded'
-			{ after(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_4_0()); }
+			{ after(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_3_0()); }
 		)
-		{ after(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_4_0()); }
+		{ after(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_3_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__TableSelection__ToolbarAssignment_3_5_1
+rule__TableSelection__ToolbarAssignment_3_4_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarCrossReference_3_5_1_0()); }
+		{ before(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarCrossReference_3_4_1_0()); }
 		(
-			{ before(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarIDTerminalRuleCall_3_5_1_0_1()); }
+			{ before(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarIDTerminalRuleCall_3_4_1_0_1()); }
 			RULE_ID
-			{ after(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarIDTerminalRuleCall_3_5_1_0_1()); }
+			{ after(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarIDTerminalRuleCall_3_4_1_0_1()); }
 		)
-		{ after(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarCrossReference_3_5_1_0()); }
+		{ after(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarCrossReference_3_4_1_0()); }
 	)
 ;
 finally {
@@ -26806,91 +25659,57 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__TableTable__PollingAssignment_2_3_0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableTableAccess().getPollingPollingKeyword_2_3_0_0()); }
-		(
-			{ before(grammarAccess.getTableTableAccess().getPollingPollingKeyword_2_3_0_0()); }
-			'polling'
-			{ after(grammarAccess.getTableTableAccess().getPollingPollingKeyword_2_3_0_0()); }
-		)
-		{ after(grammarAccess.getTableTableAccess().getPollingPollingKeyword_2_3_0_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableTable__PollingTimeAssignment_2_3_1
+rule__TableTable__FilteringAssignment_2_3
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getTableTableAccess().getPollingTimeNumberParserRuleCall_2_3_1_0()); }
-		ruleNumber
-		{ after(grammarAccess.getTableTableAccess().getPollingTimeNumberParserRuleCall_2_3_1_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableTable__FilteringAssignment_2_4
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_4_0()); }
+		{ before(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_3_0()); }
 		(
-			{ before(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_4_0()); }
+			{ before(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_3_0()); }
 			'filtering'
-			{ after(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_4_0()); }
+			{ after(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_3_0()); }
 		)
-		{ after(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_4_0()); }
+		{ after(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_3_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__TableTable__EmbeddedAssignment_2_5
+rule__TableTable__EmbeddedAssignment_2_4
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_5_0()); }
+		{ before(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_4_0()); }
 		(
-			{ before(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_5_0()); }
+			{ before(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_4_0()); }
 			'embedded'
-			{ after(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_5_0()); }
+			{ after(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_4_0()); }
 		)
-		{ after(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_5_0()); }
+		{ after(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_4_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__TableTable__ToolbarAssignment_2_6_1
+rule__TableTable__ToolbarAssignment_2_5_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getTableTableAccess().getToolbarActionToolbarCrossReference_2_6_1_0()); }
+		{ before(grammarAccess.getTableTableAccess().getToolbarActionToolbarCrossReference_2_5_1_0()); }
 		(
-			{ before(grammarAccess.getTableTableAccess().getToolbarActionToolbarIDTerminalRuleCall_2_6_1_0_1()); }
+			{ before(grammarAccess.getTableTableAccess().getToolbarActionToolbarIDTerminalRuleCall_2_5_1_0_1()); }
 			RULE_ID
-			{ after(grammarAccess.getTableTableAccess().getToolbarActionToolbarIDTerminalRuleCall_2_6_1_0_1()); }
+			{ after(grammarAccess.getTableTableAccess().getToolbarActionToolbarIDTerminalRuleCall_2_5_1_0_1()); }
 		)
-		{ after(grammarAccess.getTableTableAccess().getToolbarActionToolbarCrossReference_2_6_1_0()); }
+		{ after(grammarAccess.getTableTableAccess().getToolbarActionToolbarCrossReference_2_5_1_0()); }
 	)
 ;
 finally {
@@ -26912,165 +25731,6 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__TableBean__SelectalwaysAssignment_2_0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableBeanAccess().getSelectalwaysAlwaysSelectedKeyword_2_0_0()); }
-		(
-			{ before(grammarAccess.getTableBeanAccess().getSelectalwaysAlwaysSelectedKeyword_2_0_0()); }
-			'alwaysSelected'
-			{ after(grammarAccess.getTableBeanAccess().getSelectalwaysAlwaysSelectedKeyword_2_0_0()); }
-		)
-		{ after(grammarAccess.getTableBeanAccess().getSelectalwaysAlwaysSelectedKeyword_2_0_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__SelectByIdAssignment_2_1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableBeanAccess().getSelectByIdSelectByIdKeyword_2_1_0()); }
-		(
-			{ before(grammarAccess.getTableBeanAccess().getSelectByIdSelectByIdKeyword_2_1_0()); }
-			'selectById'
-			{ after(grammarAccess.getTableBeanAccess().getSelectByIdSelectByIdKeyword_2_1_0()); }
-		)
-		{ after(grammarAccess.getTableBeanAccess().getSelectByIdSelectByIdKeyword_2_1_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__HeaderModeAssignment_2_2_1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableBeanAccess().getHeaderModeRowHeaderModeEnumRuleCall_2_2_1_0()); }
-		ruleRowHeaderMode
-		{ after(grammarAccess.getTableBeanAccess().getHeaderModeRowHeaderModeEnumRuleCall_2_2_1_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__PollingAssignment_2_3_0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableBeanAccess().getPollingPollingKeyword_2_3_0_0()); }
-		(
-			{ before(grammarAccess.getTableBeanAccess().getPollingPollingKeyword_2_3_0_0()); }
-			'polling'
-			{ after(grammarAccess.getTableBeanAccess().getPollingPollingKeyword_2_3_0_0()); }
-		)
-		{ after(grammarAccess.getTableBeanAccess().getPollingPollingKeyword_2_3_0_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__PollingTimeAssignment_2_3_1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableBeanAccess().getPollingTimeNumberParserRuleCall_2_3_1_0()); }
-		ruleNumber
-		{ after(grammarAccess.getTableBeanAccess().getPollingTimeNumberParserRuleCall_2_3_1_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__FilteringAssignment_2_4
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableBeanAccess().getFilteringFilteringKeyword_2_4_0()); }
-		(
-			{ before(grammarAccess.getTableBeanAccess().getFilteringFilteringKeyword_2_4_0()); }
-			'filtering'
-			{ after(grammarAccess.getTableBeanAccess().getFilteringFilteringKeyword_2_4_0()); }
-		)
-		{ after(grammarAccess.getTableBeanAccess().getFilteringFilteringKeyword_2_4_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__EmbeddedAssignment_2_5
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableBeanAccess().getEmbeddedEmbeddedKeyword_2_5_0()); }
-		(
-			{ before(grammarAccess.getTableBeanAccess().getEmbeddedEmbeddedKeyword_2_5_0()); }
-			'embedded'
-			{ after(grammarAccess.getTableBeanAccess().getEmbeddedEmbeddedKeyword_2_5_0()); }
-		)
-		{ after(grammarAccess.getTableBeanAccess().getEmbeddedEmbeddedKeyword_2_5_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__ToolbarAssignment_2_6_1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableBeanAccess().getToolbarActionToolbarCrossReference_2_6_1_0()); }
-		(
-			{ before(grammarAccess.getTableBeanAccess().getToolbarActionToolbarIDTerminalRuleCall_2_6_1_0_1()); }
-			RULE_ID
-			{ after(grammarAccess.getTableBeanAccess().getToolbarActionToolbarIDTerminalRuleCall_2_6_1_0_1()); }
-		)
-		{ after(grammarAccess.getTableBeanAccess().getToolbarActionToolbarCrossReference_2_6_1_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableBean__SourceAssignment_3_1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableBeanAccess().getSourceTableDatamartParserRuleCall_3_1_0()); }
-		ruleTableDatamart
-		{ after(grammarAccess.getTableBeanAccess().getSourceTableDatamartParserRuleCall_3_1_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
 rule__TablePreorder__ColumnAssignment_2
 	@init {
 		int stackSize = keepStackSize();
@@ -27998,140 +26658,15 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__TableGrid__SelectalwaysAssignment_2_0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableGridAccess().getSelectalwaysSelectalwaysKeyword_2_0_0()); }
-		(
-			{ before(grammarAccess.getTableGridAccess().getSelectalwaysSelectalwaysKeyword_2_0_0()); }
-			'selectalways'
-			{ after(grammarAccess.getTableGridAccess().getSelectalwaysSelectalwaysKeyword_2_0_0()); }
-		)
-		{ after(grammarAccess.getTableGridAccess().getSelectalwaysSelectalwaysKeyword_2_0_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__HeaderModeAssignment_2_1_1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableGridAccess().getHeaderModeRowHeaderModeEnumRuleCall_2_1_1_0()); }
-		ruleRowHeaderMode
-		{ after(grammarAccess.getTableGridAccess().getHeaderModeRowHeaderModeEnumRuleCall_2_1_1_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__PollingAssignment_3_0_0
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableGridAccess().getPollingPollingKeyword_3_0_0_0()); }
-		(
-			{ before(grammarAccess.getTableGridAccess().getPollingPollingKeyword_3_0_0_0()); }
-			'polling'
-			{ after(grammarAccess.getTableGridAccess().getPollingPollingKeyword_3_0_0_0()); }
-		)
-		{ after(grammarAccess.getTableGridAccess().getPollingPollingKeyword_3_0_0_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__PollingTimeAssignment_3_0_1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableGridAccess().getPollingTimeNumberParserRuleCall_3_0_1_0()); }
-		ruleNumber
-		{ after(grammarAccess.getTableGridAccess().getPollingTimeNumberParserRuleCall_3_0_1_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__FilteringAssignment_3_1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableGridAccess().getFilteringFilteringKeyword_3_1_0()); }
-		(
-			{ before(grammarAccess.getTableGridAccess().getFilteringFilteringKeyword_3_1_0()); }
-			'filtering'
-			{ after(grammarAccess.getTableGridAccess().getFilteringFilteringKeyword_3_1_0()); }
-		)
-		{ after(grammarAccess.getTableGridAccess().getFilteringFilteringKeyword_3_1_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__EmbeddedAssignment_3_2
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableGridAccess().getEmbeddedEmbeddedKeyword_3_2_0()); }
-		(
-			{ before(grammarAccess.getTableGridAccess().getEmbeddedEmbeddedKeyword_3_2_0()); }
-			'embedded'
-			{ after(grammarAccess.getTableGridAccess().getEmbeddedEmbeddedKeyword_3_2_0()); }
-		)
-		{ after(grammarAccess.getTableGridAccess().getEmbeddedEmbeddedKeyword_3_2_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__ToolbarAssignment_3_3_1
-	@init {
-		int stackSize = keepStackSize();
-	}
-:
-	(
-		{ before(grammarAccess.getTableGridAccess().getToolbarActionToolbarCrossReference_3_3_1_0()); }
-		(
-			{ before(grammarAccess.getTableGridAccess().getToolbarActionToolbarIDTerminalRuleCall_3_3_1_0_1()); }
-			RULE_ID
-			{ after(grammarAccess.getTableGridAccess().getToolbarActionToolbarIDTerminalRuleCall_3_3_1_0_1()); }
-		)
-		{ after(grammarAccess.getTableGridAccess().getToolbarActionToolbarCrossReference_3_3_1_0()); }
-	)
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__TableGrid__SourceAssignment_4_1
+rule__TableGrid__SourceAssignment_3
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getTableGridAccess().getSourceTableDtoDatasourceParserRuleCall_4_1_0()); }
+		{ before(grammarAccess.getTableGridAccess().getSourceTableDtoDatasourceParserRuleCall_3_0()); }
 		ruleTableDtoDatasource
-		{ after(grammarAccess.getTableGridAccess().getSourceTableDtoDatasourceParserRuleCall_4_1_0()); }
+		{ after(grammarAccess.getTableGridAccess().getSourceTableDtoDatasourceParserRuleCall_3_0()); }
 	)
 ;
 finally {
diff --git a/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSL.tokens b/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSL.tokens
index 50f402e..6af0d89 100644
--- a/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSL.tokens
+++ b/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSL.tokens
@@ -25,7 +25,7 @@
 '/'=41
 '/='=24
 ':'=145
-'::'=180
+'::'=177
 ';'=133
 '<'=32
 '<>'=37
@@ -36,7 +36,7 @@
 '>'=31
 '>='=30
 '?'=159
-'?.'=181
+'?.'=178
 '?:'=38
 '@'=134
 '['=140
@@ -45,58 +45,57 @@
 'allColumns'=93
 'alwaysSelected'=163
 'as'=78
-'ascending'=168
+'ascending'=167
 'axis'=108
 'bad-rising'=61
-'bean'=83
-'boolStyle'=121
-'buttonStyle'=118
+'blobImageStyle'=130
+'boolStyle'=120
+'buttonStyle'=117
 'case'=146
 'catch'=158
 'cellcolor'=110
 'chapters'=73
-'collapse'=169
+'collapse'=168
 'column'=95
 'columns'=69
 'datamart'=107
-'dateStyle'=122
+'dateStyle'=121
 'daysInPast'=103
 'default'=68
 'derived'=97
 'describedBy'=161
-'details'=175
+'details'=174
 'do'=149
-'dto'=117
-'dynamic'=172
-'editable'=178
+'dto'=116
+'dynamic'=171
+'editable'=113
 'else'=143
-'embedded'=166
+'embedded'=165
 'equal'=54
-'eventTopic'=119
+'eventTopic'=118
 'explicit'=66
 'extends'=48
 'extension'=51
 'false'=53
-'filtering'=165
+'filtering'=164
 'finally'=156
 'for'=147
-'format'=123
+'format'=122
 'formatter'=89
 'good-sloping'=63
 'greater equal'=55
 'greater than'=56
-'greenFrom'=128
-'grid'=113
+'greenFrom'=127
 'hidden'=65
-'hidelabel'=171
-'htmlStyle'=120
+'hidelabel'=170
+'htmlStyle'=119
 'icon'=86
 'if'=142
-'image'=170
+'image'=169
 'imageStyle'=131
 'import'=50
 'indexed'=67
-'indicatorStyle'=127
+'indicatorStyle'=126
 'instanceof'=141
 'integer'=104
 'intervals'=87
@@ -104,49 +103,47 @@
 'lookups'=88
 'lower equal'=57
 'lower than'=58
-'max'=126
+'max'=125
 'measure'=96
 'multiple'=162
 'new'=150
 'not equal'=59
-'notifyOnSelect'=176
-'ns'=179
+'notifyOnSelect'=175
+'ns'=176
 'null'=151
 'number'=105
-'numberStyle'=124
+'numberStyle'=123
 'ordinal'=94
 'package'=74
 'pages'=71
 'path'=90
-'polling'=164
 'preorder'=84
-'progressbarStyle'=125
-'prop'=115
+'progressbarStyle'=124
+'prop'=114
 'property'=99
-'redUntil'=129
-'resize'=173
+'readOnly'=83
+'redUntil'=128
+'resize'=172
 'return'=154
 'rising'=60
 'rowHeader'=80
-'rowheader'=114
-'rowheight'=174
+'rowheight'=173
 'rows'=70
 'sections'=72
-'selectById'=167
-'selectalways'=177
+'selectById'=166
 'selection'=79
 'single'=18
 'sloping'=62
 'stagnating'=64
 'static'=49
 'string'=106
-'style'=116
+'style'=115
 'super'=52
 'switch'=144
 'synchronized'=157
 'table'=77
 'taskId'=92
-'textStyle'=130
+'textStyle'=129
 'textcolor'=109
 'then'=132
 'throw'=153
@@ -154,7 +151,7 @@
 'tooltip'=112
 'tooltipPattern'=91
 'trend'=111
-'true'=184
+'true'=181
 'try'=155
 'typeof'=152
 'upToInteger'=102
@@ -162,10 +159,10 @@
 'using'=82
 'val'=47
 'value'=85
-'var'=183
+'var'=180
 'while'=148
 '{'=75
-'|'=182
+'|'=179
 '||'=16
 '}'=76
 RULE_ANY_OTHER=14
@@ -264,9 +261,6 @@ T__179=179
 T__17=17
 T__180=180
 T__181=181
-T__182=182
-T__183=183
-T__184=184
 T__18=18
 T__19=19
 T__20=20
diff --git a/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSLLexer.java b/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSLLexer.java
index 760d9c7..9fdec7f 100644
--- a/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSLLexer.java
+++ b/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSLLexer.java
@@ -1,3 +1,17 @@
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
+ */
 package org.eclipse.osbp.xtext.table.ide.contentassist.antlr.internal;
 
 // Hack: Use our own Lexer superclass by means of import. 
@@ -109,11 +123,8 @@ public class InternalTableDSLLexer extends Lexer {
     public static final int T__102=102;
     public static final int T__94=94;
     public static final int T__101=101;
-    public static final int T__184=184;
-    public static final int T__183=183;
     public static final int T__90=90;
     public static final int T__180=180;
-    public static final int T__182=182;
     public static final int T__181=181;
     public static final int T__19=19;
     public static final int T__15=15;
@@ -1629,10 +1640,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__83;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:79:7: ( 'bean' )
-            // InternalTableDSL.g:79:9: 'bean'
+            // InternalTableDSL.g:79:7: ( 'readOnly' )
+            // InternalTableDSL.g:79:9: 'readOnly'
             {
-            match("bean"); 
+            match("readOnly"); 
 
 
             }
@@ -2259,10 +2270,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__113;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:109:8: ( 'grid' )
-            // InternalTableDSL.g:109:10: 'grid'
+            // InternalTableDSL.g:109:8: ( 'editable' )
+            // InternalTableDSL.g:109:10: 'editable'
             {
-            match("grid"); 
+            match("editable"); 
 
 
             }
@@ -2280,10 +2291,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__114;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:110:8: ( 'rowheader' )
-            // InternalTableDSL.g:110:10: 'rowheader'
+            // InternalTableDSL.g:110:8: ( 'prop' )
+            // InternalTableDSL.g:110:10: 'prop'
             {
-            match("rowheader"); 
+            match("prop"); 
 
 
             }
@@ -2301,10 +2312,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__115;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:111:8: ( 'prop' )
-            // InternalTableDSL.g:111:10: 'prop'
+            // InternalTableDSL.g:111:8: ( 'style' )
+            // InternalTableDSL.g:111:10: 'style'
             {
-            match("prop"); 
+            match("style"); 
 
 
             }
@@ -2322,10 +2333,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__116;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:112:8: ( 'style' )
-            // InternalTableDSL.g:112:10: 'style'
+            // InternalTableDSL.g:112:8: ( 'dto' )
+            // InternalTableDSL.g:112:10: 'dto'
             {
-            match("style"); 
+            match("dto"); 
 
 
             }
@@ -2343,10 +2354,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__117;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:113:8: ( 'dto' )
-            // InternalTableDSL.g:113:10: 'dto'
+            // InternalTableDSL.g:113:8: ( 'buttonStyle' )
+            // InternalTableDSL.g:113:10: 'buttonStyle'
             {
-            match("dto"); 
+            match("buttonStyle"); 
 
 
             }
@@ -2364,10 +2375,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__118;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:114:8: ( 'buttonStyle' )
-            // InternalTableDSL.g:114:10: 'buttonStyle'
+            // InternalTableDSL.g:114:8: ( 'eventTopic' )
+            // InternalTableDSL.g:114:10: 'eventTopic'
             {
-            match("buttonStyle"); 
+            match("eventTopic"); 
 
 
             }
@@ -2385,10 +2396,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__119;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:115:8: ( 'eventTopic' )
-            // InternalTableDSL.g:115:10: 'eventTopic'
+            // InternalTableDSL.g:115:8: ( 'htmlStyle' )
+            // InternalTableDSL.g:115:10: 'htmlStyle'
             {
-            match("eventTopic"); 
+            match("htmlStyle"); 
 
 
             }
@@ -2406,10 +2417,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__120;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:116:8: ( 'htmlStyle' )
-            // InternalTableDSL.g:116:10: 'htmlStyle'
+            // InternalTableDSL.g:116:8: ( 'boolStyle' )
+            // InternalTableDSL.g:116:10: 'boolStyle'
             {
-            match("htmlStyle"); 
+            match("boolStyle"); 
 
 
             }
@@ -2427,10 +2438,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__121;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:117:8: ( 'boolStyle' )
-            // InternalTableDSL.g:117:10: 'boolStyle'
+            // InternalTableDSL.g:117:8: ( 'dateStyle' )
+            // InternalTableDSL.g:117:10: 'dateStyle'
             {
-            match("boolStyle"); 
+            match("dateStyle"); 
 
 
             }
@@ -2448,10 +2459,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__122;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:118:8: ( 'dateStyle' )
-            // InternalTableDSL.g:118:10: 'dateStyle'
+            // InternalTableDSL.g:118:8: ( 'format' )
+            // InternalTableDSL.g:118:10: 'format'
             {
-            match("dateStyle"); 
+            match("format"); 
 
 
             }
@@ -2469,10 +2480,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__123;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:119:8: ( 'format' )
-            // InternalTableDSL.g:119:10: 'format'
+            // InternalTableDSL.g:119:8: ( 'numberStyle' )
+            // InternalTableDSL.g:119:10: 'numberStyle'
             {
-            match("format"); 
+            match("numberStyle"); 
 
 
             }
@@ -2490,10 +2501,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__124;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:120:8: ( 'numberStyle' )
-            // InternalTableDSL.g:120:10: 'numberStyle'
+            // InternalTableDSL.g:120:8: ( 'progressbarStyle' )
+            // InternalTableDSL.g:120:10: 'progressbarStyle'
             {
-            match("numberStyle"); 
+            match("progressbarStyle"); 
 
 
             }
@@ -2511,10 +2522,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__125;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:121:8: ( 'progressbarStyle' )
-            // InternalTableDSL.g:121:10: 'progressbarStyle'
+            // InternalTableDSL.g:121:8: ( 'max' )
+            // InternalTableDSL.g:121:10: 'max'
             {
-            match("progressbarStyle"); 
+            match("max"); 
 
 
             }
@@ -2532,10 +2543,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__126;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:122:8: ( 'max' )
-            // InternalTableDSL.g:122:10: 'max'
+            // InternalTableDSL.g:122:8: ( 'indicatorStyle' )
+            // InternalTableDSL.g:122:10: 'indicatorStyle'
             {
-            match("max"); 
+            match("indicatorStyle"); 
 
 
             }
@@ -2553,10 +2564,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__127;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:123:8: ( 'indicatorStyle' )
-            // InternalTableDSL.g:123:10: 'indicatorStyle'
+            // InternalTableDSL.g:123:8: ( 'greenFrom' )
+            // InternalTableDSL.g:123:10: 'greenFrom'
             {
-            match("indicatorStyle"); 
+            match("greenFrom"); 
 
 
             }
@@ -2574,10 +2585,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__128;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:124:8: ( 'greenFrom' )
-            // InternalTableDSL.g:124:10: 'greenFrom'
+            // InternalTableDSL.g:124:8: ( 'redUntil' )
+            // InternalTableDSL.g:124:10: 'redUntil'
             {
-            match("greenFrom"); 
+            match("redUntil"); 
 
 
             }
@@ -2595,10 +2606,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__129;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:125:8: ( 'redUntil' )
-            // InternalTableDSL.g:125:10: 'redUntil'
+            // InternalTableDSL.g:125:8: ( 'textStyle' )
+            // InternalTableDSL.g:125:10: 'textStyle'
             {
-            match("redUntil"); 
+            match("textStyle"); 
 
 
             }
@@ -2616,10 +2627,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__130;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:126:8: ( 'textStyle' )
-            // InternalTableDSL.g:126:10: 'textStyle'
+            // InternalTableDSL.g:126:8: ( 'blobImageStyle' )
+            // InternalTableDSL.g:126:10: 'blobImageStyle'
             {
-            match("textStyle"); 
+            match("blobImageStyle"); 
 
 
             }
@@ -3319,10 +3330,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__164;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:160:8: ( 'polling' )
-            // InternalTableDSL.g:160:10: 'polling'
+            // InternalTableDSL.g:160:8: ( 'filtering' )
+            // InternalTableDSL.g:160:10: 'filtering'
             {
-            match("polling"); 
+            match("filtering"); 
 
 
             }
@@ -3340,10 +3351,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__165;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:161:8: ( 'filtering' )
-            // InternalTableDSL.g:161:10: 'filtering'
+            // InternalTableDSL.g:161:8: ( 'embedded' )
+            // InternalTableDSL.g:161:10: 'embedded'
             {
-            match("filtering"); 
+            match("embedded"); 
 
 
             }
@@ -3361,10 +3372,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__166;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:162:8: ( 'embedded' )
-            // InternalTableDSL.g:162:10: 'embedded'
+            // InternalTableDSL.g:162:8: ( 'selectById' )
+            // InternalTableDSL.g:162:10: 'selectById'
             {
-            match("embedded"); 
+            match("selectById"); 
 
 
             }
@@ -3382,10 +3393,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__167;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:163:8: ( 'selectById' )
-            // InternalTableDSL.g:163:10: 'selectById'
+            // InternalTableDSL.g:163:8: ( 'ascending' )
+            // InternalTableDSL.g:163:10: 'ascending'
             {
-            match("selectById"); 
+            match("ascending"); 
 
 
             }
@@ -3403,10 +3414,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__168;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:164:8: ( 'ascending' )
-            // InternalTableDSL.g:164:10: 'ascending'
+            // InternalTableDSL.g:164:8: ( 'collapse' )
+            // InternalTableDSL.g:164:10: 'collapse'
             {
-            match("ascending"); 
+            match("collapse"); 
 
 
             }
@@ -3424,10 +3435,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__169;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:165:8: ( 'collapse' )
-            // InternalTableDSL.g:165:10: 'collapse'
+            // InternalTableDSL.g:165:8: ( 'image' )
+            // InternalTableDSL.g:165:10: 'image'
             {
-            match("collapse"); 
+            match("image"); 
 
 
             }
@@ -3445,10 +3456,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__170;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:166:8: ( 'image' )
-            // InternalTableDSL.g:166:10: 'image'
+            // InternalTableDSL.g:166:8: ( 'hidelabel' )
+            // InternalTableDSL.g:166:10: 'hidelabel'
             {
-            match("image"); 
+            match("hidelabel"); 
 
 
             }
@@ -3466,10 +3477,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__171;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:167:8: ( 'hidelabel' )
-            // InternalTableDSL.g:167:10: 'hidelabel'
+            // InternalTableDSL.g:167:8: ( 'dynamic' )
+            // InternalTableDSL.g:167:10: 'dynamic'
             {
-            match("hidelabel"); 
+            match("dynamic"); 
 
 
             }
@@ -3487,10 +3498,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__172;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:168:8: ( 'dynamic' )
-            // InternalTableDSL.g:168:10: 'dynamic'
+            // InternalTableDSL.g:168:8: ( 'resize' )
+            // InternalTableDSL.g:168:10: 'resize'
             {
-            match("dynamic"); 
+            match("resize"); 
 
 
             }
@@ -3508,10 +3519,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__173;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:169:8: ( 'resize' )
-            // InternalTableDSL.g:169:10: 'resize'
+            // InternalTableDSL.g:169:8: ( 'rowheight' )
+            // InternalTableDSL.g:169:10: 'rowheight'
             {
-            match("resize"); 
+            match("rowheight"); 
 
 
             }
@@ -3529,10 +3540,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__174;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:170:8: ( 'rowheight' )
-            // InternalTableDSL.g:170:10: 'rowheight'
+            // InternalTableDSL.g:170:8: ( 'details' )
+            // InternalTableDSL.g:170:10: 'details'
             {
-            match("rowheight"); 
+            match("details"); 
 
 
             }
@@ -3550,10 +3561,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__175;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:171:8: ( 'details' )
-            // InternalTableDSL.g:171:10: 'details'
+            // InternalTableDSL.g:171:8: ( 'notifyOnSelect' )
+            // InternalTableDSL.g:171:10: 'notifyOnSelect'
             {
-            match("details"); 
+            match("notifyOnSelect"); 
 
 
             }
@@ -3571,10 +3582,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__176;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:172:8: ( 'notifyOnSelect' )
-            // InternalTableDSL.g:172:10: 'notifyOnSelect'
+            // InternalTableDSL.g:172:8: ( 'ns' )
+            // InternalTableDSL.g:172:10: 'ns'
             {
-            match("notifyOnSelect"); 
+            match("ns"); 
 
 
             }
@@ -3592,10 +3603,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__177;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:173:8: ( 'selectalways' )
-            // InternalTableDSL.g:173:10: 'selectalways'
+            // InternalTableDSL.g:173:8: ( '::' )
+            // InternalTableDSL.g:173:10: '::'
             {
-            match("selectalways"); 
+            match("::"); 
 
 
             }
@@ -3613,10 +3624,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__178;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:174:8: ( 'editable' )
-            // InternalTableDSL.g:174:10: 'editable'
+            // InternalTableDSL.g:174:8: ( '?.' )
+            // InternalTableDSL.g:174:10: '?.'
             {
-            match("editable"); 
+            match("?."); 
 
 
             }
@@ -3634,11 +3645,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__179;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:175:8: ( 'ns' )
-            // InternalTableDSL.g:175:10: 'ns'
+            // InternalTableDSL.g:175:8: ( '|' )
+            // InternalTableDSL.g:175:10: '|'
             {
-            match("ns"); 
-
+            match('|'); 
 
             }
 
@@ -3655,10 +3665,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__180;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:176:8: ( '::' )
-            // InternalTableDSL.g:176:10: '::'
+            // InternalTableDSL.g:176:8: ( 'var' )
+            // InternalTableDSL.g:176:10: 'var'
             {
-            match("::"); 
+            match("var"); 
 
 
             }
@@ -3676,70 +3686,8 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__181;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:177:8: ( '?.' )
-            // InternalTableDSL.g:177:10: '?.'
-            {
-            match("?."); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__181"
-
-    // $ANTLR start "T__182"
-    public final void mT__182() throws RecognitionException {
-        try {
-            int _type = T__182;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:178:8: ( '|' )
-            // InternalTableDSL.g:178:10: '|'
-            {
-            match('|'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__182"
-
-    // $ANTLR start "T__183"
-    public final void mT__183() throws RecognitionException {
-        try {
-            int _type = T__183;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:179:8: ( 'var' )
-            // InternalTableDSL.g:179:10: 'var'
-            {
-            match("var"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__183"
-
-    // $ANTLR start "T__184"
-    public final void mT__184() throws RecognitionException {
-        try {
-            int _type = T__184;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:180:8: ( 'true' )
-            // InternalTableDSL.g:180:10: 'true'
+            // InternalTableDSL.g:177:8: ( 'true' )
+            // InternalTableDSL.g:177:10: 'true'
             {
             match("true"); 
 
@@ -3752,19 +3700,19 @@ public class InternalTableDSLLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "T__184"
+    // $ANTLR end "T__181"
 
     // $ANTLR start "RULE_THEME_RESOURCE"
     public final void mRULE_THEME_RESOURCE() throws RecognitionException {
         try {
             int _type = RULE_THEME_RESOURCE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:30960:21: ( 'theme:/' ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '.' | '/' | '0' .. '9' )* )
-            // InternalTableDSL.g:30960:23: 'theme:/' ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '.' | '/' | '0' .. '9' )*
+            // InternalTableDSL.g:29495:21: ( 'theme:/' ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '.' | '/' | '0' .. '9' )* )
+            // InternalTableDSL.g:29495:23: 'theme:/' ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '.' | '/' | '0' .. '9' )*
             {
             match("theme:/"); 
 
-            // InternalTableDSL.g:30960:33: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '.' | '/' | '0' .. '9' )*
+            // InternalTableDSL.g:29495:33: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '.' | '/' | '0' .. '9' )*
             loop1:
             do {
                 int alt1=2;
@@ -3813,12 +3761,12 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_EVENT_TOPIC;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:30962:18: ( '\\'' RULE_ID ( '/' RULE_ID )* ( '/*' )? '\\'' )
-            // InternalTableDSL.g:30962:20: '\\'' RULE_ID ( '/' RULE_ID )* ( '/*' )? '\\''
+            // InternalTableDSL.g:29497:18: ( '\\'' RULE_ID ( '/' RULE_ID )* ( '/*' )? '\\'' )
+            // InternalTableDSL.g:29497:20: '\\'' RULE_ID ( '/' RULE_ID )* ( '/*' )? '\\''
             {
             match('\''); 
             mRULE_ID(); 
-            // InternalTableDSL.g:30962:33: ( '/' RULE_ID )*
+            // InternalTableDSL.g:29497:33: ( '/' RULE_ID )*
             loop2:
             do {
                 int alt2=2;
@@ -3837,7 +3785,7 @@ public class InternalTableDSLLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // InternalTableDSL.g:30962:34: '/' RULE_ID
+            	    // InternalTableDSL.g:29497:34: '/' RULE_ID
             	    {
             	    match('/'); 
             	    mRULE_ID(); 
@@ -3850,7 +3798,7 @@ public class InternalTableDSLLexer extends Lexer {
                 }
             } while (true);
 
-            // InternalTableDSL.g:30962:48: ( '/*' )?
+            // InternalTableDSL.g:29497:48: ( '/*' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -3859,7 +3807,7 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // InternalTableDSL.g:30962:48: '/*'
+                    // InternalTableDSL.g:29497:48: '/*'
                     {
                     match("/*"); 
 
@@ -3886,10 +3834,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:30964:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
-            // InternalTableDSL.g:30964:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalTableDSL.g:29499:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
+            // InternalTableDSL.g:29499:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             {
-            // InternalTableDSL.g:30964:12: ( '0x' | '0X' )
+            // InternalTableDSL.g:29499:12: ( '0x' | '0X' )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -3917,7 +3865,7 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt4) {
                 case 1 :
-                    // InternalTableDSL.g:30964:13: '0x'
+                    // InternalTableDSL.g:29499:13: '0x'
                     {
                     match("0x"); 
 
@@ -3925,7 +3873,7 @@ public class InternalTableDSLLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:30964:18: '0X'
+                    // InternalTableDSL.g:29499:18: '0X'
                     {
                     match("0X"); 
 
@@ -3935,7 +3883,7 @@ public class InternalTableDSLLexer extends Lexer {
 
             }
 
-            // InternalTableDSL.g:30964:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
+            // InternalTableDSL.g:29499:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
             int cnt5=0;
             loop5:
             do {
@@ -3973,7 +3921,7 @@ public class InternalTableDSLLexer extends Lexer {
                 cnt5++;
             } while (true);
 
-            // InternalTableDSL.g:30964:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalTableDSL.g:29499:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -3982,10 +3930,10 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt7) {
                 case 1 :
-                    // InternalTableDSL.g:30964:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalTableDSL.g:29499:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     {
                     match('#'); 
-                    // InternalTableDSL.g:30964:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalTableDSL.g:29499:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -4003,7 +3951,7 @@ public class InternalTableDSLLexer extends Lexer {
                     }
                     switch (alt6) {
                         case 1 :
-                            // InternalTableDSL.g:30964:64: ( 'b' | 'B' ) ( 'i' | 'I' )
+                            // InternalTableDSL.g:29499:64: ( 'b' | 'B' ) ( 'i' | 'I' )
                             {
                             if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                                 input.consume();
@@ -4027,7 +3975,7 @@ public class InternalTableDSLLexer extends Lexer {
                             }
                             break;
                         case 2 :
-                            // InternalTableDSL.g:30964:84: ( 'l' | 'L' )
+                            // InternalTableDSL.g:29499:84: ( 'l' | 'L' )
                             {
                             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                                 input.consume();
@@ -4066,11 +4014,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:30966:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
-            // InternalTableDSL.g:30966:12: '0' .. '9' ( '0' .. '9' | '_' )*
+            // InternalTableDSL.g:29501:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
+            // InternalTableDSL.g:29501:12: '0' .. '9' ( '0' .. '9' | '_' )*
             {
             matchRange('0','9'); 
-            // InternalTableDSL.g:30966:21: ( '0' .. '9' | '_' )*
+            // InternalTableDSL.g:29501:21: ( '0' .. '9' | '_' )*
             loop8:
             do {
                 int alt8=2;
@@ -4119,11 +4067,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_DECIMAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:30968:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
-            // InternalTableDSL.g:30968:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalTableDSL.g:29503:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
+            // InternalTableDSL.g:29503:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             {
             mRULE_INT(); 
-            // InternalTableDSL.g:30968:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
+            // InternalTableDSL.g:29503:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -4132,7 +4080,7 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt10) {
                 case 1 :
-                    // InternalTableDSL.g:30968:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
+                    // InternalTableDSL.g:29503:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
                     {
                     if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                         input.consume();
@@ -4143,7 +4091,7 @@ public class InternalTableDSLLexer extends Lexer {
                         recover(mse);
                         throw mse;}
 
-                    // InternalTableDSL.g:30968:36: ( '+' | '-' )?
+                    // InternalTableDSL.g:29503:36: ( '+' | '-' )?
                     int alt9=2;
                     int LA9_0 = input.LA(1);
 
@@ -4176,7 +4124,7 @@ public class InternalTableDSLLexer extends Lexer {
 
             }
 
-            // InternalTableDSL.g:30968:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalTableDSL.g:29503:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             int alt11=3;
             int LA11_0 = input.LA(1);
 
@@ -4188,7 +4136,7 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt11) {
                 case 1 :
-                    // InternalTableDSL.g:30968:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
+                    // InternalTableDSL.g:29503:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
                     {
                     if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                         input.consume();
@@ -4212,7 +4160,7 @@ public class InternalTableDSLLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:30968:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
+                    // InternalTableDSL.g:29503:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
                     {
                     if ( input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='L'||input.LA(1)=='d'||input.LA(1)=='f'||input.LA(1)=='l' ) {
                         input.consume();
@@ -4245,10 +4193,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:30970:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
-            // InternalTableDSL.g:30970:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalTableDSL.g:29505:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
+            // InternalTableDSL.g:29505:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             {
-            // InternalTableDSL.g:30970:11: ( '^' )?
+            // InternalTableDSL.g:29505:11: ( '^' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -4257,7 +4205,7 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // InternalTableDSL.g:30970:11: '^'
+                    // InternalTableDSL.g:29505:11: '^'
                     {
                     match('^'); 
 
@@ -4275,7 +4223,7 @@ public class InternalTableDSLLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // InternalTableDSL.g:30970:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalTableDSL.g:29505:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             loop13:
             do {
                 int alt13=2;
@@ -4324,10 +4272,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:30972:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
-            // InternalTableDSL.g:30972:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalTableDSL.g:29507:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
+            // InternalTableDSL.g:29507:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             {
-            // InternalTableDSL.g:30972:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalTableDSL.g:29507:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -4345,10 +4293,10 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt18) {
                 case 1 :
-                    // InternalTableDSL.g:30972:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
+                    // InternalTableDSL.g:29507:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
                     {
                     match('\"'); 
-                    // InternalTableDSL.g:30972:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalTableDSL.g:29507:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop14:
                     do {
                         int alt14=3;
@@ -4364,7 +4312,7 @@ public class InternalTableDSLLexer extends Lexer {
 
                         switch (alt14) {
                     	case 1 :
-                    	    // InternalTableDSL.g:30972:21: '\\\\' .
+                    	    // InternalTableDSL.g:29507:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -4372,7 +4320,7 @@ public class InternalTableDSLLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // InternalTableDSL.g:30972:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalTableDSL.g:29507:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -4392,7 +4340,7 @@ public class InternalTableDSLLexer extends Lexer {
                         }
                     } while (true);
 
-                    // InternalTableDSL.g:30972:44: ( '\"' )?
+                    // InternalTableDSL.g:29507:44: ( '\"' )?
                     int alt15=2;
                     int LA15_0 = input.LA(1);
 
@@ -4401,7 +4349,7 @@ public class InternalTableDSLLexer extends Lexer {
                     }
                     switch (alt15) {
                         case 1 :
-                            // InternalTableDSL.g:30972:44: '\"'
+                            // InternalTableDSL.g:29507:44: '\"'
                             {
                             match('\"'); 
 
@@ -4414,10 +4362,10 @@ public class InternalTableDSLLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:30972:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
+                    // InternalTableDSL.g:29507:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
                     {
                     match('\''); 
-                    // InternalTableDSL.g:30972:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalTableDSL.g:29507:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop16:
                     do {
                         int alt16=3;
@@ -4433,7 +4381,7 @@ public class InternalTableDSLLexer extends Lexer {
 
                         switch (alt16) {
                     	case 1 :
-                    	    // InternalTableDSL.g:30972:55: '\\\\' .
+                    	    // InternalTableDSL.g:29507:55: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -4441,7 +4389,7 @@ public class InternalTableDSLLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // InternalTableDSL.g:30972:62: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalTableDSL.g:29507:62: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -4461,7 +4409,7 @@ public class InternalTableDSLLexer extends Lexer {
                         }
                     } while (true);
 
-                    // InternalTableDSL.g:30972:79: ( '\\'' )?
+                    // InternalTableDSL.g:29507:79: ( '\\'' )?
                     int alt17=2;
                     int LA17_0 = input.LA(1);
 
@@ -4470,7 +4418,7 @@ public class InternalTableDSLLexer extends Lexer {
                     }
                     switch (alt17) {
                         case 1 :
-                            // InternalTableDSL.g:30972:79: '\\''
+                            // InternalTableDSL.g:29507:79: '\\''
                             {
                             match('\''); 
 
@@ -4501,12 +4449,12 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:30974:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalTableDSL.g:30974:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalTableDSL.g:29509:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalTableDSL.g:29509:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalTableDSL.g:30974:24: ( options {greedy=false; } : . )*
+            // InternalTableDSL.g:29509:24: ( options {greedy=false; } : . )*
             loop19:
             do {
                 int alt19=2;
@@ -4531,7 +4479,7 @@ public class InternalTableDSLLexer extends Lexer {
 
                 switch (alt19) {
             	case 1 :
-            	    // InternalTableDSL.g:30974:52: .
+            	    // InternalTableDSL.g:29509:52: .
             	    {
             	    matchAny(); 
 
@@ -4561,12 +4509,12 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:30976:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalTableDSL.g:30976:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalTableDSL.g:29511:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalTableDSL.g:29511:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // InternalTableDSL.g:30976:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalTableDSL.g:29511:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop20:
             do {
                 int alt20=2;
@@ -4579,7 +4527,7 @@ public class InternalTableDSLLexer extends Lexer {
 
                 switch (alt20) {
             	case 1 :
-            	    // InternalTableDSL.g:30976:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalTableDSL.g:29511:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -4599,7 +4547,7 @@ public class InternalTableDSLLexer extends Lexer {
                 }
             } while (true);
 
-            // InternalTableDSL.g:30976:40: ( ( '\\r' )? '\\n' )?
+            // InternalTableDSL.g:29511:40: ( ( '\\r' )? '\\n' )?
             int alt22=2;
             int LA22_0 = input.LA(1);
 
@@ -4608,9 +4556,9 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt22) {
                 case 1 :
-                    // InternalTableDSL.g:30976:41: ( '\\r' )? '\\n'
+                    // InternalTableDSL.g:29511:41: ( '\\r' )? '\\n'
                     {
-                    // InternalTableDSL.g:30976:41: ( '\\r' )?
+                    // InternalTableDSL.g:29511:41: ( '\\r' )?
                     int alt21=2;
                     int LA21_0 = input.LA(1);
 
@@ -4619,7 +4567,7 @@ public class InternalTableDSLLexer extends Lexer {
                     }
                     switch (alt21) {
                         case 1 :
-                            // InternalTableDSL.g:30976:41: '\\r'
+                            // InternalTableDSL.g:29511:41: '\\r'
                             {
                             match('\r'); 
 
@@ -4651,10 +4599,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:30978:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalTableDSL.g:30978:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalTableDSL.g:29513:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalTableDSL.g:29513:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalTableDSL.g:30978:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalTableDSL.g:29513:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt23=0;
             loop23:
             do {
@@ -4708,8 +4656,8 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:30980:16: ( . )
-            // InternalTableDSL.g:30980:18: .
+            // InternalTableDSL.g:29515:16: ( . )
+            // InternalTableDSL.g:29515:18: .
             {
             matchAny(); 
 
@@ -4724,8 +4672,8 @@ public class InternalTableDSLLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // InternalTableDSL.g:1:8: ( T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | T__135 | T__136 | T__137 | T__138 | T__139 | T__140 | T__141 | T__142 | T__143 | T__144 | T__145 | T__146 | T__147 | T__148 | T__149 | T__150 | T__151 | T__152 | T__153 | T__154 | T__155 | T__156 | T__157 | T__158 | T__159 | T__160 | T__161 | T__162 | T__163 | T__164 | T__165 | T__166 | T__167 | T__168 | T__169 | T__170 | T__171 | T__172 | T__173 | T__174 | T__175 | T__176 | T__177 | T__178 | T__179 | T__180 | T__181 | T__182 | T__183 | T__184 | RULE_THEME_RESOURCE | RULE_EVENT_TOPIC | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt24=181;
+        // InternalTableDSL.g:1:8: ( T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | T__135 | T__136 | T__137 | T__138 | T__139 | T__140 | T__141 | T__142 | T__143 | T__144 | T__145 | T__146 | T__147 | T__148 | T__149 | T__150 | T__151 | T__152 | T__153 | T__154 | T__155 | T__156 | T__157 | T__158 | T__159 | T__160 | T__161 | T__162 | T__163 | T__164 | T__165 | T__166 | T__167 | T__168 | T__169 | T__170 | T__171 | T__172 | T__173 | T__174 | T__175 | T__176 | T__177 | T__178 | T__179 | T__180 | T__181 | RULE_THEME_RESOURCE | RULE_EVENT_TOPIC | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt24=178;
         alt24 = dfa24.predict(input);
         switch (alt24) {
             case 1 :
@@ -5898,98 +5846,77 @@ public class InternalTableDSLLexer extends Lexer {
                 }
                 break;
             case 168 :
-                // InternalTableDSL.g:1:1094: T__182
-                {
-                mT__182(); 
-
-                }
-                break;
-            case 169 :
-                // InternalTableDSL.g:1:1101: T__183
-                {
-                mT__183(); 
-
-                }
-                break;
-            case 170 :
-                // InternalTableDSL.g:1:1108: T__184
-                {
-                mT__184(); 
-
-                }
-                break;
-            case 171 :
-                // InternalTableDSL.g:1:1115: RULE_THEME_RESOURCE
+                // InternalTableDSL.g:1:1094: RULE_THEME_RESOURCE
                 {
                 mRULE_THEME_RESOURCE(); 
 
                 }
                 break;
-            case 172 :
-                // InternalTableDSL.g:1:1135: RULE_EVENT_TOPIC
+            case 169 :
+                // InternalTableDSL.g:1:1114: RULE_EVENT_TOPIC
                 {
                 mRULE_EVENT_TOPIC(); 
 
                 }
                 break;
-            case 173 :
-                // InternalTableDSL.g:1:1152: RULE_HEX
+            case 170 :
+                // InternalTableDSL.g:1:1131: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
-            case 174 :
-                // InternalTableDSL.g:1:1161: RULE_INT
+            case 171 :
+                // InternalTableDSL.g:1:1140: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
-            case 175 :
-                // InternalTableDSL.g:1:1170: RULE_DECIMAL
+            case 172 :
+                // InternalTableDSL.g:1:1149: RULE_DECIMAL
                 {
                 mRULE_DECIMAL(); 
 
                 }
                 break;
-            case 176 :
-                // InternalTableDSL.g:1:1183: RULE_ID
+            case 173 :
+                // InternalTableDSL.g:1:1162: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
-            case 177 :
-                // InternalTableDSL.g:1:1191: RULE_STRING
+            case 174 :
+                // InternalTableDSL.g:1:1170: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
-            case 178 :
-                // InternalTableDSL.g:1:1203: RULE_ML_COMMENT
+            case 175 :
+                // InternalTableDSL.g:1:1182: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
-            case 179 :
-                // InternalTableDSL.g:1:1219: RULE_SL_COMMENT
+            case 176 :
+                // InternalTableDSL.g:1:1198: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
-            case 180 :
-                // InternalTableDSL.g:1:1235: RULE_WS
+            case 177 :
+                // InternalTableDSL.g:1:1214: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
-            case 181 :
-                // InternalTableDSL.g:1:1243: RULE_ANY_OTHER
+            case 178 :
+                // InternalTableDSL.g:1:1222: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -6003,17 +5930,17 @@ public class InternalTableDSLLexer extends Lexer {
 
     protected DFA24 dfa24 = new DFA24(this);
     static final String DFA24_eotS =
-        "\1\uffff\1\67\1\71\1\73\1\103\1\106\1\112\1\115\1\121\1\123\1\125\1\127\1\131\1\133\1\136\15\103\2\uffff\5\103\10\uffff\1\u00a5\1\103\1\u00a7\2\u00ac\1\64\4\uffff\1\u00b0\6\uffff\7\103\21\uffff\1\u00bc\5\uffff\1\u00be\4\uffff\12\103\1\u00ce\12\103\1\u00dd\14\103\1\u00f0\10\103\2\uffff\6\103\1\u0108\11\103\12\uffff\1\103\1\uffff\2\u00a7\1\uffff\1\u00ac\5\uffff\12\103\4\uffff\1\u0123\1\u0124\15\103\1\uffff\1\103\1\u0135\13\103\1\u0143\1\uffff\21\103\1\u0159\1\uffff\21\103\1\u016d\5\103\1\uffff\10\103\1\u017c\2\103\2\u00a7\1\uffff\14\103\2\uffff\4\103\1\u0193\10\103\1\u019d\2\103\1\uffff\4\103\1\u01a4\4\103\1\uffff\2\103\1\u01ab\1\uffff\1\103\1\u01ad\5\103\1\uffff\1\u01b3\14\103\1\uffff\5\103\1\u01c5\3\103\1\u01c9\1\103\1\u01cc\7\103\1\uffff\1\u01d6\1\u01d7\7\103\1\u01df\4\103\1\uffff\2\103\3\u00a7\1\uffff\4\103\1\u01ec\1\u01ed\5\103\1\u01f3\2\103\1\u01f7\1\103\1\uffff\3\103\1\u01fd\5\103\1\uffff\1\u0203\5\103\2\uffff\2\103\1\u020b\2\103\1\uffff\1\103\1\uffff\5\103\1\uffff\21\103\1\uffff\1\u0226\1\u0227\1\103\1\uffff\2\103\1\uffff\2\103\1\u022d\5\103\1\u0233\2\uffff\1\103\1\u0235\5\103\1\uffff\1\u023b\5\103\1\u0241\1\u00a7\1\u0242\1\u0243\1\103\1\u0245\2\uffff\3\103\1\u024b\1\103\1\uffff\3\103\1\uffff\3\103\1\u0253\1\103\1\uffff\5\103\1\uffff\1\u025b\4\103\1\uffff\1\103\1\uffff\1\103\1\u0265\1\u0266\4\103\1\u026b\1\u026c\2\103\1\u026f\12\103\1\u027b\3\103\2\uffff\5\103\1\uffff\1\u0284\4\103\3\uffff\1\u0289\4\103\1\uffff\5\103\3\uffff\1\103\1\uffff\1\u0294\4\103\1\uffff\1\103\1\u029a\5\103\1\uffff\1\103\1\u02a1\2\103\1\u02a4\2\103\1\uffff\1\u02a7\3\103\2\uffff\1\u02ab\2\103\2\uffff\4\103\2\uffff\2\103\1\uffff\2\103\1\u02b6\1\u02b7\1\103\1\u02b9\3\103\1\u02bd\1\u02be\1\uffff\3\103\1\u02c2\3\103\1\u02c6\1\uffff\1\u02c7\1\u02c9\2\103\1\uffff\6\103\1\u02d2\1\u02d3\2\103\1\uffff\1\u02d6\4\103\1\uffff\1\103\1\u02dc\1\103\1\u02de\1\u02df\1\103\1\uffff\2\103\1\uffff\2\103\1\uffff\1\103\1\uffff\1\103\1\uffff\5\103\1\u02ee\4\103\2\uffff\1\103\1\uffff\1\103\1\u02f5\1\103\2\uffff\1\u02f7\1\u02f8\1\103\1\uffff\1\u02fa\1\u02fb\1\103\2\uffff\1\103\1\uffff\10\103\2\uffff\1\u0306\1\103\1\uffff\1\u0308\3\103\1\u030c\1\uffff\1\103\2\uffff\2\103\1\u0310\1\103\1\u0312\1\u0313\2\uffff\1\u0314\2\103\1\u0317\1\u0318\1\u0319\1\uffff\1\103\1\u031b\1\u031c\1\u031d\2\103\1\uffff\1\u0320\2\uffff\1\u0321\2\uffff\2\103\1\u0324\1\u0325\1\u0326\5\103\1\uffff\1\u032c\1\uffff\1\u032d\2\103\1\uffff\1\u0330\1\u0331\1\103\1\uffff\1\u0333\3\uffff\2\103\3\uffff\1\103\3\uffff\1\103\1\u0338\2\uffff\2\103\3\uffff\1\u033b\2\103\1\u033e\1\103\2\uffff\2\103\2\uffff\1\103\1\uffff\1\103\1\u0344\1\u0345\1\u0346\1\uffff\2\103\1\uffff\1\103\1\u034a\1\uffff\1\u034b\1\u034c\1\u034d\2\103\3\uffff\3\103\4\uffff\5\103\1\u0358\1\u0359\1\103\1\u035b\1\u035c\2\uffff\1\103\2\uffff\1\u035e\1\uffff";
+        "\1\uffff\1\67\1\71\1\73\1\103\1\106\1\112\1\115\1\121\1\123\1\125\1\127\1\131\1\133\1\136\15\103\2\uffff\5\103\10\uffff\1\u00a4\1\103\1\u00a6\2\u00ab\1\64\4\uffff\1\u00af\6\uffff\7\103\21\uffff\1\u00bb\5\uffff\1\u00bd\4\uffff\12\103\1\u00cd\12\103\1\u00db\14\103\1\u00ef\7\103\2\uffff\6\103\1\u0106\11\103\12\uffff\1\103\1\uffff\2\u00a6\1\uffff\1\u00ab\5\uffff\12\103\4\uffff\1\u0121\1\u0122\15\103\1\uffff\1\103\1\u0133\12\103\1\u0140\1\uffff\22\103\1\u0157\1\uffff\20\103\1\u016a\5\103\1\uffff\10\103\1\u0179\2\103\1\uffff\2\u00a6\14\103\2\uffff\5\103\1\u0191\7\103\1\u019a\2\103\1\uffff\10\103\1\uffff\2\103\1\u01a7\1\uffff\1\103\1\u01a9\6\103\1\uffff\15\103\1\uffff\5\103\1\u01c2\3\103\1\u01c6\1\103\1\u01c9\6\103\1\uffff\1\u01d2\1\u01d3\7\103\1\u01db\4\103\1\uffff\2\103\1\uffff\3\u00a6\4\103\1\u01e8\1\u01e9\5\103\1\u01ef\2\103\1\u01f3\2\103\1\uffff\2\103\1\u01f9\5\103\1\uffff\1\u01ff\5\103\1\uffff\2\103\1\u0207\2\103\1\uffff\1\103\1\uffff\30\103\1\uffff\1\u0223\1\u0224\1\103\1\uffff\2\103\1\uffff\1\103\1\u0229\5\103\1\u022f\2\uffff\1\103\1\u0231\5\103\1\uffff\1\u0237\5\103\1\u023d\1\u00a6\1\u023e\1\u023f\1\103\1\u0241\2\uffff\3\103\1\u0246\1\103\1\uffff\3\103\1\uffff\3\103\1\u024e\1\103\1\uffff\5\103\1\uffff\1\u0256\4\103\1\uffff\1\103\1\uffff\1\103\1\u0260\1\u0261\4\103\1\u0266\1\u0267\3\103\1\u026b\12\103\1\u0277\3\103\2\uffff\4\103\1\uffff\1\u027f\4\103\3\uffff\1\u0284\4\103\1\uffff\5\103\3\uffff\1\103\1\uffff\1\u028f\3\103\1\uffff\1\103\1\u0294\5\103\1\uffff\1\103\1\u029b\2\103\1\u029e\2\103\1\uffff\1\u02a1\3\103\2\uffff\1\u02a5\2\103\2\uffff\4\103\2\uffff\3\103\1\uffff\2\103\1\u02b1\1\u02b2\1\103\1\u02b4\3\103\1\u02b8\1\u02b9\1\uffff\3\103\1\u02bd\3\103\1\uffff\1\u02c1\1\u02c3\2\103\1\uffff\6\103\1\u02cc\1\u02cd\2\103\1\uffff\1\u02d0\3\103\1\uffff\1\103\1\u02d5\1\u02d6\1\103\1\u02d8\1\103\1\uffff\2\103\1\uffff\2\103\1\uffff\1\103\1\uffff\1\103\1\uffff\4\103\1\u02e6\1\u02e7\5\103\2\uffff\1\103\1\uffff\1\103\1\u02ef\1\103\2\uffff\1\u02f1\1\u02f2\1\103\1\uffff\1\u02f4\1\u02f5\1\103\1\uffff\1\103\1\uffff\10\103\2\uffff\1\u0300\1\103\1\uffff\1\u0302\2\103\1\u0305\2\uffff\1\103\1\uffff\2\103\1\u0309\1\103\1\u030b\1\u030c\2\uffff\1\u030d\2\103\1\u0310\1\u0311\2\uffff\1\103\1\u0313\1\103\1\u0315\1\u0316\2\103\1\uffff\1\u0319\2\uffff\1\u031a\2\uffff\2\103\1\u031d\1\u031e\1\u031f\5\103\1\uffff\1\u0325\1\uffff\1\u0326\1\103\1\uffff\1\u0328\1\u0329\1\103\1\uffff\1\u032b\3\uffff\2\103\2\uffff\1\103\1\uffff\1\103\2\uffff\1\103\1\u0331\2\uffff\2\103\3\uffff\1\u0334\2\103\1\u0337\1\103\2\uffff\1\103\2\uffff\1\103\1\uffff\1\103\1\u033c\1\u033d\1\103\1\u033f\1\uffff\2\103\1\uffff\1\103\1\u0343\1\uffff\1\u0344\1\u0345\2\103\2\uffff\1\103\1\uffff\3\103\3\uffff\6\103\1\u0352\1\u0353\1\u0354\1\103\1\u0356\1\u0357\3\uffff\1\103\2\uffff\1\u0359\1\uffff";
     static final String DFA24_eofS =
-        "\u035f\uffff";
+        "\u035a\uffff";
     static final String DFA24_minS =
-        "\1\0\1\75\1\174\1\46\1\145\1\53\1\55\2\52\3\75\1\76\2\56\1\141\1\144\1\143\1\141\1\157\3\145\1\141\1\151\3\141\2\uffff\1\141\1\147\1\160\1\162\1\141\10\uffff\1\72\1\150\1\44\2\60\1\44\4\uffff\1\75\6\uffff\1\156\1\141\1\160\1\157\1\143\1\151\1\156\21\uffff\1\75\5\uffff\1\74\4\uffff\1\154\1\160\1\165\1\145\1\163\1\142\1\151\1\141\1\144\1\157\1\44\1\154\1\162\1\154\1\145\2\157\1\166\1\164\1\154\1\167\1\44\1\163\1\167\2\144\1\141\1\164\1\157\1\144\1\155\1\146\1\164\1\157\1\44\1\156\1\154\1\141\1\154\1\163\1\143\1\145\1\154\2\uffff\1\142\1\157\1\170\2\145\1\160\1\44\1\154\1\147\2\151\1\124\1\144\1\141\1\170\1\154\12\uffff\1\151\1\uffff\2\44\1\uffff\1\60\5\uffff\2\147\1\151\1\154\1\145\1\160\1\164\1\145\1\164\1\143\4\uffff\2\44\1\145\1\154\1\141\1\156\2\145\1\164\1\157\1\147\2\145\1\164\1\156\1\uffff\1\163\1\44\1\141\1\164\1\141\2\144\1\145\1\153\1\145\1\40\1\142\1\154\1\44\1\uffff\1\151\1\110\1\125\1\165\1\151\1\55\1\156\1\164\1\154\1\144\1\154\1\141\1\151\1\143\1\141\1\163\1\141\1\44\1\uffff\1\141\1\154\1\160\1\154\1\145\1\143\1\145\1\153\1\150\1\157\1\147\2\154\1\153\1\154\1\164\1\156\1\44\1\145\1\155\1\157\2\145\1\uffff\1\103\1\141\1\162\1\163\1\156\1\157\1\151\1\163\1\44\1\164\1\154\2\44\1\uffff\1\154\1\151\2\156\1\145\1\162\2\151\2\143\1\150\1\145\2\uffff\1\156\1\151\1\154\1\164\1\44\1\144\1\141\1\162\1\145\1\170\1\143\1\147\1\141\1\44\1\145\1\141\1\uffff\1\154\1\145\1\164\1\156\1\44\1\55\1\162\1\165\1\154\1\uffff\1\146\1\145\1\44\1\uffff\1\156\1\44\2\145\1\156\1\162\1\172\1\uffff\1\44\1\157\1\123\1\145\1\154\1\123\1\165\1\166\1\162\1\151\1\111\1\155\1\123\1\uffff\2\155\1\141\1\164\1\143\1\44\1\150\1\163\1\141\1\44\1\162\1\44\1\162\1\151\1\145\1\111\1\142\1\123\1\144\1\uffff\2\44\1\145\1\167\1\157\1\156\1\157\1\171\1\145\1\44\1\147\1\111\1\156\1\165\1\uffff\1\151\1\145\1\47\2\44\1\uffff\1\145\1\143\1\141\1\147\2\44\1\156\1\157\1\164\1\150\1\162\1\44\1\144\1\143\1\44\1\124\1\uffff\1\144\1\142\1\164\1\44\1\145\1\141\1\166\1\145\1\156\1\uffff\1\44\1\164\1\154\1\162\1\145\1\106\2\uffff\1\40\1\160\1\44\1\171\1\162\1\uffff\1\147\1\uffff\2\141\1\164\1\156\1\145\1\uffff\1\156\1\164\1\156\1\141\1\164\1\154\1\145\1\151\1\154\1\156\1\141\1\164\1\151\1\156\1\160\1\145\1\157\1\uffff\2\44\1\147\1\uffff\1\144\1\162\1\uffff\1\145\1\156\1\44\1\144\1\141\1\151\1\157\1\164\1\44\2\uffff\1\72\1\44\1\146\1\144\1\154\1\163\1\147\1\uffff\1\44\1\165\1\156\1\141\1\162\1\160\4\44\1\164\1\44\2\uffff\1\147\1\156\1\102\1\44\1\157\1\uffff\1\163\2\151\1\uffff\1\157\1\145\1\154\1\44\1\164\1\uffff\1\144\1\164\1\141\1\162\1\143\1\uffff\1\44\1\171\1\151\2\162\1\145\1\163\1\uffff\1\117\2\44\2\144\1\147\1\151\2\44\1\123\1\171\1\44\1\142\1\171\1\164\1\144\1\142\1\163\1\120\1\162\1\171\1\143\1\44\1\163\1\162\1\154\2\uffff\2\145\1\164\1\163\1\147\1\uffff\1\44\1\162\1\160\1\154\1\171\3\uffff\1\44\1\151\1\165\1\123\1\141\1\uffff\1\155\1\164\1\154\1\145\1\154\3\uffff\1\151\1\uffff\1\44\1\163\1\157\1\171\1\154\1\uffff\1\156\1\44\1\157\1\164\1\160\1\144\1\145\1\uffff\1\171\1\44\1\157\1\154\1\44\2\145\1\uffff\1\44\1\156\1\40\1\157\2\uffff\1\44\1\156\1\164\2\uffff\2\145\1\150\1\154\2\uffff\1\164\1\154\1\uffff\1\145\1\154\2\44\1\145\1\44\1\141\1\164\1\154\2\44\1\uffff\1\145\1\163\1\157\1\44\1\162\1\171\1\163\1\44\1\uffff\2\44\1\157\1\154\1\uffff\1\156\1\155\1\145\1\164\1\142\1\145\2\44\1\145\1\156\1\uffff\1\44\1\156\1\111\1\167\1\151\1\uffff\1\156\1\44\1\151\2\44\1\154\1\uffff\1\162\1\163\1\uffff\1\157\1\162\1\uffff\1\147\1\145\1\155\1\uffff\1\123\1\171\2\162\1\164\1\44\1\171\1\145\1\154\1\145\2\uffff\1\144\1\uffff\1\163\1\44\1\145\2\uffff\2\44\1\162\1\uffff\2\44\1\142\2\uffff\1\141\1\uffff\1\162\1\145\1\147\1\156\1\154\1\151\1\145\1\147\2\uffff\1\44\1\147\1\uffff\1\44\1\144\1\141\1\172\1\44\1\uffff\1\143\2\uffff\1\145\1\123\1\44\1\146\2\44\2\uffff\1\44\1\145\1\154\3\44\1\uffff\1\154\3\44\1\102\1\164\1\uffff\1\44\2\uffff\1\44\2\uffff\1\141\1\164\3\44\1\163\1\145\1\157\1\162\1\145\1\uffff\1\44\1\uffff\1\44\1\171\1\145\1\uffff\2\44\1\164\1\uffff\1\44\3\uffff\1\154\1\145\3\uffff\1\145\3\uffff\1\171\1\44\2\uffff\1\162\1\164\3\uffff\1\44\1\143\1\156\1\44\1\162\2\uffff\1\163\1\144\2\uffff\1\171\1\uffff\1\145\3\44\1\uffff\1\123\1\145\1\uffff\1\164\1\44\1\uffff\3\44\1\154\1\143\3\uffff\1\164\1\162\1\145\4\uffff\1\145\1\164\1\171\1\156\1\144\2\44\1\154\2\44\2\uffff\1\145\2\uffff\1\44\1\uffff";
+        "\1\0\1\75\1\174\1\46\1\145\1\53\1\55\2\52\3\75\1\76\2\56\1\141\1\144\1\143\1\141\1\157\3\145\1\141\1\151\3\141\2\uffff\1\141\1\147\1\160\1\162\1\141\10\uffff\1\72\1\150\1\44\2\60\1\44\4\uffff\1\75\6\uffff\1\156\1\141\1\160\1\157\1\143\1\151\1\156\21\uffff\1\75\5\uffff\1\74\4\uffff\1\154\1\160\1\165\1\151\1\145\1\163\1\142\1\141\1\144\1\157\1\44\1\154\1\162\1\154\1\145\2\157\1\166\1\164\1\154\1\167\1\44\1\163\1\167\1\141\1\144\1\164\2\157\1\144\1\155\1\146\1\164\1\157\1\44\1\156\1\154\1\141\1\154\1\163\1\143\1\145\2\uffff\1\142\1\157\1\170\2\145\1\160\1\44\1\154\1\147\2\151\1\124\1\144\1\141\1\170\1\154\12\uffff\1\151\1\uffff\2\44\1\uffff\1\60\5\uffff\2\147\1\151\1\154\1\145\1\160\1\164\1\145\1\164\1\143\4\uffff\2\44\1\145\1\154\1\141\1\164\1\156\2\145\1\157\1\147\2\145\1\164\1\156\1\uffff\1\163\1\44\1\141\1\164\1\141\1\144\1\145\1\153\1\145\1\40\1\142\1\154\1\44\1\uffff\1\151\1\110\1\144\1\125\1\165\1\151\1\55\1\164\1\154\1\142\1\144\1\154\1\141\1\151\1\143\1\141\1\163\1\141\1\44\1\uffff\1\141\1\154\1\160\1\154\1\145\1\143\1\145\1\153\1\150\1\157\1\147\1\154\1\153\1\154\1\164\1\156\1\44\1\145\1\155\1\157\2\145\1\uffff\1\103\1\141\1\162\1\163\1\156\1\157\1\151\1\163\1\44\1\164\1\154\1\uffff\2\44\1\154\1\151\2\156\1\145\1\162\2\151\2\143\1\150\1\145\2\uffff\1\156\1\151\1\154\1\141\1\164\1\44\1\144\1\162\1\145\1\170\1\143\1\147\1\141\1\44\1\145\1\141\1\uffff\1\154\1\145\1\164\1\156\1\55\1\162\1\165\1\154\1\uffff\1\146\1\145\1\44\1\uffff\1\156\1\44\2\145\1\117\1\156\1\162\1\172\1\uffff\1\157\1\123\1\111\1\145\1\154\1\123\1\165\1\166\1\162\1\151\1\111\1\155\1\123\1\uffff\2\155\1\141\1\164\1\143\1\44\1\150\1\163\1\141\1\44\1\162\1\44\1\162\1\145\1\111\1\142\1\123\1\144\1\uffff\2\44\1\145\1\167\1\157\1\156\1\157\1\171\1\145\1\44\1\147\1\111\1\156\1\165\1\uffff\1\151\1\145\1\uffff\1\47\2\44\1\145\1\143\1\141\1\147\2\44\1\156\1\157\1\164\1\150\1\162\1\44\1\144\1\143\1\44\1\142\1\124\1\uffff\1\144\1\164\1\44\1\145\1\141\1\166\1\145\1\156\1\uffff\1\44\1\164\1\154\1\162\1\145\1\106\1\uffff\1\40\1\160\1\44\1\171\1\162\1\uffff\1\147\1\uffff\1\141\1\151\1\156\1\164\1\156\1\145\1\156\1\164\1\155\1\156\1\141\1\164\1\154\1\145\1\151\1\154\1\156\1\141\1\164\1\151\1\156\1\160\1\145\1\157\1\uffff\2\44\1\147\1\uffff\1\144\1\162\1\uffff\1\145\1\44\1\144\1\141\1\151\1\157\1\164\1\44\2\uffff\1\72\1\44\1\146\1\144\1\154\1\163\1\147\1\uffff\1\44\1\165\1\156\1\141\1\162\1\160\4\44\1\164\1\44\2\uffff\1\147\1\156\1\102\1\44\1\157\1\uffff\1\163\2\151\1\uffff\1\154\1\157\1\145\1\44\1\164\1\uffff\1\144\1\164\1\141\1\162\1\143\1\uffff\1\44\1\171\1\151\2\162\1\145\1\163\1\uffff\1\117\2\44\1\144\1\147\1\154\1\151\2\44\1\123\1\171\1\141\1\44\1\142\1\171\1\164\1\144\1\142\1\163\1\120\1\162\1\171\1\143\1\44\1\163\1\162\1\154\2\uffff\2\145\1\164\1\163\1\uffff\1\44\1\162\1\160\1\154\1\171\3\uffff\1\44\1\151\1\165\1\123\1\141\1\uffff\1\155\1\164\1\154\1\145\1\154\3\uffff\1\151\1\uffff\1\44\1\163\1\157\1\171\1\uffff\1\156\1\44\1\157\1\164\1\145\1\160\1\144\1\uffff\1\171\1\44\1\157\1\154\1\44\2\145\1\uffff\1\44\1\156\1\40\1\157\2\uffff\1\44\1\156\1\164\2\uffff\1\145\1\150\1\171\1\154\2\uffff\1\164\1\154\1\147\1\uffff\1\145\1\154\2\44\1\145\1\44\1\141\1\164\1\154\2\44\1\uffff\1\145\1\163\1\157\1\44\1\162\1\171\1\163\1\uffff\2\44\1\157\1\154\1\uffff\1\156\1\155\1\145\1\164\1\142\1\145\2\44\1\145\1\156\1\uffff\1\44\1\156\1\111\1\151\1\uffff\1\156\2\44\1\151\1\44\1\154\1\uffff\1\162\1\163\1\uffff\1\157\1\162\1\uffff\1\147\1\145\1\155\1\uffff\1\123\1\171\1\162\1\164\2\44\1\171\2\145\1\154\1\145\2\uffff\1\144\1\uffff\1\163\1\44\1\145\2\uffff\2\44\1\162\1\uffff\2\44\1\142\1\uffff\1\141\1\uffff\1\162\1\145\1\147\1\156\1\154\1\151\1\145\1\147\2\uffff\1\44\1\147\1\uffff\1\44\1\144\1\172\1\44\2\uffff\1\143\1\uffff\1\145\1\123\1\44\1\146\2\44\2\uffff\1\44\1\145\1\154\2\44\2\uffff\1\154\1\44\1\123\2\44\1\102\1\164\1\uffff\1\44\2\uffff\1\44\2\uffff\1\141\1\164\3\44\1\163\1\145\1\157\1\162\1\145\1\uffff\1\44\1\uffff\1\44\1\145\1\uffff\2\44\1\164\1\uffff\1\44\3\uffff\1\154\1\145\2\uffff\1\145\1\uffff\1\164\2\uffff\1\171\1\44\2\uffff\1\162\1\164\3\uffff\1\44\1\143\1\156\1\44\1\162\2\uffff\1\144\2\uffff\1\171\1\uffff\1\145\2\44\1\171\1\44\1\uffff\1\123\1\145\1\uffff\1\164\1\44\1\uffff\2\44\1\154\1\143\2\uffff\1\154\1\uffff\1\164\1\162\1\145\3\uffff\1\145\1\164\1\145\1\171\1\156\1\144\3\44\1\154\2\44\3\uffff\1\145\2\uffff\1\44\1\uffff";
     static final String DFA24_maxS =
-        "\1\uffff\1\76\1\174\1\46\1\171\1\75\1\76\5\75\1\76\1\56\1\72\1\141\1\170\1\156\1\157\1\162\1\157\1\165\1\157\1\165\1\164\1\171\1\157\1\162\2\uffff\1\171\1\170\1\163\1\162\1\165\10\uffff\1\72\1\150\1\172\1\170\1\154\1\172\4\uffff\1\75\6\uffff\1\156\1\171\1\160\1\157\1\154\1\151\1\156\21\uffff\1\75\5\uffff\1\74\4\uffff\1\162\1\164\1\165\1\145\1\163\1\142\1\151\1\160\1\164\1\157\1\172\1\154\1\162\1\156\1\151\1\157\1\167\1\166\1\164\1\155\1\167\1\172\1\163\1\167\1\164\1\144\1\141\1\164\1\157\1\144\1\155\1\164\1\171\1\157\1\172\1\156\1\154\1\141\1\154\2\164\1\157\1\154\2\uffff\1\163\1\157\1\170\1\171\1\162\1\160\1\172\1\167\1\147\2\151\1\124\1\144\1\141\1\170\1\154\12\uffff\1\151\1\uffff\2\172\1\uffff\1\154\5\uffff\1\147\1\164\1\151\1\154\1\145\1\160\1\164\1\145\1\164\1\143\4\uffff\2\172\1\145\1\154\1\141\1\156\2\145\1\164\1\157\1\147\1\151\1\145\1\164\1\156\1\uffff\1\163\1\172\1\141\1\164\1\145\2\144\1\145\1\153\1\145\1\151\1\142\1\154\1\172\1\uffff\1\151\1\163\1\125\1\165\1\151\1\55\1\156\1\164\1\154\1\145\1\154\1\141\1\151\1\143\1\141\1\163\1\145\1\172\1\uffff\1\141\1\165\1\160\1\154\1\145\1\143\1\145\1\153\1\150\1\157\1\160\2\154\1\153\1\154\1\164\1\156\1\172\1\145\1\156\1\157\2\145\1\uffff\1\103\1\141\1\162\1\163\1\156\1\157\1\151\1\163\1\172\1\164\1\154\2\172\1\uffff\1\154\1\151\2\156\1\145\1\162\2\151\2\143\1\150\1\145\2\uffff\1\156\1\151\1\154\1\164\1\172\1\144\1\141\1\162\1\145\1\170\1\143\1\162\1\141\1\172\1\145\1\141\1\uffff\1\154\1\145\1\164\1\156\1\172\1\55\1\162\1\165\1\154\1\uffff\1\146\1\145\1\172\1\uffff\1\156\1\172\2\145\1\156\1\162\1\172\1\uffff\1\172\1\157\1\123\1\145\1\154\1\123\1\165\1\166\1\162\1\151\1\111\1\155\1\123\1\uffff\2\155\1\141\1\164\1\143\1\172\1\150\1\163\1\141\1\172\1\162\1\172\1\162\1\151\1\145\1\111\1\164\1\143\1\144\1\uffff\2\172\1\145\1\167\1\157\1\156\1\157\1\171\1\145\1\172\1\147\1\116\1\156\1\165\1\uffff\1\151\1\145\1\47\2\172\1\uffff\1\145\1\143\1\141\1\147\2\172\1\156\1\157\1\164\1\150\1\162\1\172\1\163\1\143\1\172\1\124\1\uffff\1\144\1\142\1\164\1\172\1\145\1\141\1\166\1\145\1\156\1\uffff\1\172\1\164\1\154\1\162\1\145\1\106\2\uffff\1\40\1\160\1\172\1\171\1\162\1\uffff\1\147\1\uffff\1\141\1\151\1\164\1\156\1\145\1\uffff\1\156\1\164\1\156\1\141\1\164\1\154\1\145\1\151\1\154\1\156\1\141\1\164\1\151\1\156\1\160\1\145\1\157\1\uffff\2\172\1\147\1\uffff\1\144\1\162\1\uffff\1\145\1\156\1\172\1\144\1\141\1\151\1\157\1\164\1\172\2\uffff\1\72\1\172\1\146\1\144\1\154\1\163\1\147\1\uffff\1\172\1\165\1\156\1\141\1\162\1\160\4\172\1\164\1\172\2\uffff\1\147\1\156\1\151\1\172\1\157\1\uffff\1\163\2\151\1\uffff\1\157\1\145\1\154\1\172\1\164\1\uffff\1\144\1\164\1\141\1\162\1\143\1\uffff\1\172\1\171\1\151\2\162\1\164\1\163\1\uffff\1\117\2\172\2\144\1\147\1\151\2\172\1\123\1\171\1\172\1\142\1\171\1\164\1\144\1\142\1\163\1\120\1\162\1\171\1\143\1\172\1\163\1\162\1\154\2\uffff\2\145\1\164\1\163\1\147\1\uffff\1\172\1\162\1\160\1\154\1\171\3\uffff\1\172\1\151\1\165\1\123\1\141\1\uffff\1\155\1\164\1\154\1\145\1\154\3\uffff\1\151\1\uffff\1\172\1\163\1\157\1\171\1\154\1\uffff\1\156\1\172\1\157\1\164\1\160\1\144\1\145\1\uffff\1\171\1\172\1\157\1\154\1\172\2\145\1\uffff\1\172\1\156\1\40\1\157\2\uffff\1\172\1\156\1\164\2\uffff\2\145\1\150\1\154\2\uffff\1\164\1\154\1\uffff\1\145\1\154\2\172\1\145\1\172\1\141\1\164\1\154\2\172\1\uffff\1\145\1\163\1\157\1\172\1\162\1\171\1\163\1\172\1\uffff\2\172\1\157\1\154\1\uffff\1\156\1\155\1\145\1\164\1\142\1\145\2\172\1\145\1\156\1\uffff\1\172\1\156\1\111\1\167\1\151\1\uffff\1\156\1\172\1\151\2\172\1\154\1\uffff\1\162\1\163\1\uffff\1\157\1\162\1\uffff\1\147\1\164\1\155\1\uffff\1\123\1\171\2\162\1\164\1\172\1\171\1\145\1\154\1\145\2\uffff\1\144\1\uffff\1\163\1\172\1\145\2\uffff\2\172\1\162\1\uffff\2\172\1\142\2\uffff\1\141\1\uffff\1\162\1\145\1\147\1\156\1\154\1\151\1\145\1\147\2\uffff\1\172\1\147\1\uffff\1\172\1\144\1\141\2\172\1\uffff\1\143\2\uffff\1\145\1\123\1\172\1\146\2\172\2\uffff\1\172\1\145\1\154\3\172\1\uffff\1\154\3\172\1\102\1\164\1\uffff\1\172\2\uffff\1\172\2\uffff\1\141\1\164\3\172\1\163\1\145\1\157\1\162\1\145\1\uffff\1\172\1\uffff\1\172\1\171\1\145\1\uffff\2\172\1\164\1\uffff\1\172\3\uffff\1\154\1\145\3\uffff\1\145\3\uffff\1\171\1\172\2\uffff\1\162\1\164\3\uffff\1\172\1\143\1\156\1\172\1\162\2\uffff\1\163\1\144\2\uffff\1\171\1\uffff\1\145\3\172\1\uffff\1\123\1\145\1\uffff\1\164\1\172\1\uffff\3\172\1\154\1\143\3\uffff\1\164\1\162\1\145\4\uffff\1\145\1\164\1\171\1\156\1\144\2\172\1\154\2\172\2\uffff\1\145\2\uffff\1\172\1\uffff";
+        "\1\uffff\1\76\1\174\1\46\1\171\1\75\1\76\5\75\1\76\1\56\1\72\1\141\1\170\1\156\1\157\1\162\1\157\1\165\1\157\1\165\1\164\1\171\1\157\1\162\2\uffff\1\171\1\170\1\163\1\162\1\165\10\uffff\1\72\1\150\1\172\1\170\1\154\1\172\4\uffff\1\75\6\uffff\1\156\1\171\1\160\1\157\1\154\1\151\1\156\21\uffff\1\75\5\uffff\1\74\4\uffff\1\162\1\164\1\165\1\151\1\145\1\163\1\142\1\160\1\164\1\157\1\172\1\154\1\162\1\156\1\145\1\157\1\167\1\166\1\164\1\155\1\167\1\172\1\163\1\167\1\164\1\144\1\164\2\157\1\144\1\155\1\164\1\171\1\157\1\172\1\156\1\154\1\141\1\154\2\164\1\157\2\uffff\1\163\1\157\1\170\1\171\1\162\1\160\1\172\1\167\1\147\2\151\1\124\1\144\1\141\1\170\1\154\12\uffff\1\151\1\uffff\2\172\1\uffff\1\154\5\uffff\1\147\1\164\1\151\1\154\1\145\1\160\1\164\1\145\1\164\1\143\4\uffff\2\172\1\145\1\154\1\141\1\164\1\156\2\145\1\157\1\147\1\151\1\145\1\164\1\156\1\uffff\1\163\1\172\1\141\1\164\1\145\1\144\1\145\1\153\1\145\1\151\1\142\1\154\1\172\1\uffff\1\151\1\163\1\144\1\125\1\165\1\151\1\55\1\164\1\154\1\142\1\145\1\154\1\141\1\151\1\143\1\141\1\163\1\145\1\172\1\uffff\1\141\1\165\1\160\1\154\1\145\1\143\1\145\1\153\1\150\1\157\1\160\1\154\1\153\1\154\1\164\1\156\1\172\1\145\1\156\1\157\2\145\1\uffff\1\103\1\141\1\162\1\163\1\156\1\157\1\151\1\163\1\172\1\164\1\154\1\uffff\2\172\1\154\1\151\2\156\1\145\1\162\2\151\2\143\1\150\1\145\2\uffff\1\156\1\151\1\154\1\141\1\164\1\172\1\144\1\162\1\145\1\170\1\143\1\162\1\141\1\172\1\145\1\141\1\uffff\1\154\1\145\1\164\1\156\1\55\1\162\1\165\1\154\1\uffff\1\146\1\145\1\172\1\uffff\1\156\1\172\2\145\1\117\1\156\1\162\1\172\1\uffff\1\157\1\123\1\111\1\145\1\154\1\123\1\165\1\166\1\162\1\151\1\111\1\155\1\123\1\uffff\2\155\1\141\1\164\1\143\1\172\1\150\1\163\1\141\1\172\1\162\1\172\1\162\1\145\1\111\1\164\1\143\1\144\1\uffff\2\172\1\145\1\167\1\157\1\156\1\157\1\171\1\145\1\172\1\147\1\116\1\156\1\165\1\uffff\1\151\1\145\1\uffff\1\47\2\172\1\145\1\143\1\141\1\147\2\172\1\156\1\157\1\164\1\150\1\162\1\172\1\163\1\143\1\172\1\142\1\124\1\uffff\1\144\1\164\1\172\1\145\1\141\1\166\1\145\1\156\1\uffff\1\172\1\164\1\154\1\162\1\145\1\106\1\uffff\1\40\1\160\1\172\1\171\1\162\1\uffff\1\147\1\uffff\1\141\1\151\1\156\1\164\1\156\1\145\1\156\1\164\1\155\1\156\1\141\1\164\1\154\1\145\1\151\1\154\1\156\1\141\1\164\1\151\1\156\1\160\1\145\1\157\1\uffff\2\172\1\147\1\uffff\1\144\1\162\1\uffff\1\145\1\172\1\144\1\141\1\151\1\157\1\164\1\172\2\uffff\1\72\1\172\1\146\1\144\1\154\1\163\1\147\1\uffff\1\172\1\165\1\156\1\141\1\162\1\160\4\172\1\164\1\172\2\uffff\1\147\1\156\1\151\1\172\1\157\1\uffff\1\163\2\151\1\uffff\1\154\1\157\1\145\1\172\1\164\1\uffff\1\144\1\164\1\141\1\162\1\143\1\uffff\1\172\1\171\1\151\2\162\1\164\1\163\1\uffff\1\117\2\172\1\144\1\147\1\154\1\151\2\172\1\123\1\171\1\141\1\172\1\142\1\171\1\164\1\144\1\142\1\163\1\120\1\162\1\171\1\143\1\172\1\163\1\162\1\154\2\uffff\2\145\1\164\1\163\1\uffff\1\172\1\162\1\160\1\154\1\171\3\uffff\1\172\1\151\1\165\1\123\1\141\1\uffff\1\155\1\164\1\154\1\145\1\154\3\uffff\1\151\1\uffff\1\172\1\163\1\157\1\171\1\uffff\1\156\1\172\1\157\1\164\1\145\1\160\1\144\1\uffff\1\171\1\172\1\157\1\154\1\172\2\145\1\uffff\1\172\1\156\1\40\1\157\2\uffff\1\172\1\156\1\164\2\uffff\1\145\1\150\1\171\1\154\2\uffff\1\164\1\154\1\147\1\uffff\1\145\1\154\2\172\1\145\1\172\1\141\1\164\1\154\2\172\1\uffff\1\145\1\163\1\157\1\172\1\162\1\171\1\163\1\uffff\2\172\1\157\1\154\1\uffff\1\156\1\155\1\145\1\164\1\142\1\145\2\172\1\145\1\156\1\uffff\1\172\1\156\1\111\1\151\1\uffff\1\156\2\172\1\151\1\172\1\154\1\uffff\1\162\1\163\1\uffff\1\157\1\162\1\uffff\1\147\1\164\1\155\1\uffff\1\123\1\171\1\162\1\164\2\172\1\171\2\145\1\154\1\145\2\uffff\1\144\1\uffff\1\163\1\172\1\145\2\uffff\2\172\1\162\1\uffff\2\172\1\142\1\uffff\1\141\1\uffff\1\162\1\145\1\147\1\156\1\154\1\151\1\145\1\147\2\uffff\1\172\1\147\1\uffff\1\172\1\144\2\172\2\uffff\1\143\1\uffff\1\145\1\123\1\172\1\146\2\172\2\uffff\1\172\1\145\1\154\2\172\2\uffff\1\154\1\172\1\123\2\172\1\102\1\164\1\uffff\1\172\2\uffff\1\172\2\uffff\1\141\1\164\3\172\1\163\1\145\1\157\1\162\1\145\1\uffff\1\172\1\uffff\1\172\1\145\1\uffff\2\172\1\164\1\uffff\1\172\3\uffff\1\154\1\145\2\uffff\1\145\1\uffff\1\164\2\uffff\1\171\1\172\2\uffff\1\162\1\164\3\uffff\1\172\1\143\1\156\1\172\1\162\2\uffff\1\144\2\uffff\1\171\1\uffff\1\145\2\172\1\171\1\172\1\uffff\1\123\1\145\1\uffff\1\164\1\172\1\uffff\2\172\1\154\1\143\2\uffff\1\154\1\uffff\1\164\1\162\1\145\3\uffff\1\145\1\164\1\145\1\171\1\156\1\144\3\172\1\154\2\172\3\uffff\1\145\2\uffff\1\172\1\uffff";
     static final String DFA24_acceptS =
-        "\34\uffff\1\75\1\76\5\uffff\1\167\1\170\1\171\1\172\1\173\1\174\1\175\1\176\6\uffff\1\u00b0\1\u00b1\1\u00b4\1\u00b5\1\uffff\1\26\1\1\1\2\1\u00a8\1\3\1\u0092\7\uffff\1\u00b0\1\7\1\36\1\5\1\10\1\23\1\37\1\6\1\11\1\32\1\31\1\12\1\u00b2\1\u00b3\1\33\1\13\1\34\1\uffff\1\35\1\20\1\21\1\27\1\22\1\uffff\1\40\1\30\1\u00a7\1\u0091\53\uffff\1\75\1\76\20\uffff\1\167\1\170\1\171\1\172\1\173\1\174\1\175\1\176\1\u00a6\1\u0083\1\uffff\1\u00b1\2\uffff\1\u00ad\1\uffff\1\u00ae\1\u00af\1\u00b4\1\16\1\14\12\uffff\1\17\1\15\1\24\1\25\17\uffff\1\u0080\16\uffff\1\u00a5\22\uffff\1\u0087\27\uffff\1\100\15\uffff\1\u00ac\14\uffff\1\41\1\u00a9\20\uffff\1\u0085\11\uffff\1\55\3\uffff\1\u0088\7\uffff\1\57\15\uffff\1\147\23\uffff\1\u008d\16\uffff\1\160\5\uffff\1\u00ac\20\uffff\1\u0081\11\uffff\1\110\6\uffff\1\143\1\61\5\uffff\1\u0089\1\uffff\1\70\5\uffff\1\105\21\uffff\1\u0084\3\uffff\1\114\2\uffff\1\145\11\uffff\1\u00aa\1\166\7\uffff\1\136\14\uffff\1\146\1\46\5\uffff\1\107\3\uffff\1\50\5\uffff\1\u009c\5\uffff\1\47\7\uffff\1\124\32\uffff\1\u0090\1\71\5\uffff\1\77\5\uffff\1\141\1\u00ab\1\u008b\5\uffff\1\104\5\uffff\1\u0086\1\4\1\43\1\uffff\1\134\5\uffff\1\u0082\7\uffff\1\44\7\uffff\1\155\4\uffff\1\53\1\54\3\uffff\1\133\1\56\4\uffff\1\u008c\1\u009f\2\uffff\1\63\13\uffff\1\121\10\uffff\1\116\4\uffff\1\u008a\12\uffff\1\60\5\uffff\1\42\6\uffff\1\65\2\uffff\1\132\2\uffff\1\u008e\3\uffff\1\112\12\uffff\1\66\1\123\1\uffff\1\u00a1\3\uffff\1\u009e\1\67\3\uffff\1\74\3\uffff\1\u0096\1\103\1\uffff\1\142\10\uffff\1\120\1\122\2\uffff\1\72\5\uffff\1\64\1\uffff\1\u0098\1\u00a4\6\uffff\1\51\1\52\6\uffff\1\163\6\uffff\1\135\1\uffff\1\u009b\1\73\1\uffff\1\106\1\125\12\uffff\1\u0094\1\uffff\1\101\3\uffff\1\45\3\uffff\1\111\1\uffff\1\113\1\u0097\1\162\2\uffff\1\102\1\144\1\u00a0\1\uffff\1\153\1\u009d\1\152\2\uffff\1\154\1\140\2\uffff\1\137\1\164\1\u009a\5\uffff\1\62\1\u0099\2\uffff\1\151\1\165\1\uffff\1\177\4\uffff\1\131\2\uffff\1\117\2\uffff\1\127\5\uffff\1\156\1\150\1\u0093\3\uffff\1\126\1\130\1\u00a3\1\u008f\12\uffff\1\161\1\u00a2\1\uffff\1\115\1\u0095\1\uffff\1\157";
+        "\34\uffff\1\75\1\76\5\uffff\1\167\1\170\1\171\1\172\1\173\1\174\1\175\1\176\6\uffff\1\u00ad\1\u00ae\1\u00b1\1\u00b2\1\uffff\1\26\1\1\1\2\1\u00a5\1\3\1\u0092\7\uffff\1\u00ad\1\7\1\36\1\5\1\10\1\23\1\37\1\6\1\11\1\32\1\31\1\12\1\u00af\1\u00b0\1\33\1\13\1\34\1\uffff\1\35\1\20\1\21\1\27\1\22\1\uffff\1\40\1\30\1\u00a4\1\u0091\52\uffff\1\75\1\76\20\uffff\1\167\1\170\1\171\1\172\1\173\1\174\1\175\1\176\1\u00a3\1\u0083\1\uffff\1\u00ae\2\uffff\1\u00aa\1\uffff\1\u00ab\1\u00ac\1\u00b1\1\16\1\14\12\uffff\1\17\1\15\1\24\1\25\17\uffff\1\u0080\15\uffff\1\u00a2\23\uffff\1\u0087\26\uffff\1\100\13\uffff\1\u00a9\16\uffff\1\41\1\u00a6\20\uffff\1\u0085\10\uffff\1\55\3\uffff\1\u0088\10\uffff\1\57\15\uffff\1\146\22\uffff\1\u008d\16\uffff\1\157\2\uffff\1\u00a9\24\uffff\1\u0081\10\uffff\1\110\6\uffff\1\61\5\uffff\1\u0089\1\uffff\1\70\30\uffff\1\u0084\3\uffff\1\114\2\uffff\1\144\10\uffff\1\u00a7\1\166\7\uffff\1\136\14\uffff\1\145\1\46\5\uffff\1\107\3\uffff\1\50\5\uffff\1\u009b\5\uffff\1\47\7\uffff\1\124\33\uffff\1\u0090\1\71\4\uffff\1\77\5\uffff\1\141\1\u00a8\1\u008b\5\uffff\1\104\5\uffff\1\u0086\1\4\1\43\1\uffff\1\134\4\uffff\1\u0082\7\uffff\1\44\7\uffff\1\154\4\uffff\1\53\1\54\3\uffff\1\133\1\56\4\uffff\1\u008c\1\u009e\3\uffff\1\63\13\uffff\1\121\7\uffff\1\116\4\uffff\1\u008a\12\uffff\1\60\4\uffff\1\42\6\uffff\1\65\2\uffff\1\132\2\uffff\1\u008e\3\uffff\1\112\13\uffff\1\66\1\123\1\uffff\1\u00a0\3\uffff\1\u009d\1\67\3\uffff\1\74\3\uffff\1\103\1\uffff\1\142\10\uffff\1\120\1\122\2\uffff\1\72\4\uffff\1\64\1\143\1\uffff\1\u0097\6\uffff\1\51\1\52\5\uffff\1\105\1\162\7\uffff\1\135\1\uffff\1\u009a\1\73\1\uffff\1\106\1\125\12\uffff\1\u0094\1\uffff\1\101\2\uffff\1\45\3\uffff\1\111\1\uffff\1\113\1\u0096\1\161\2\uffff\1\102\1\u009f\1\uffff\1\152\1\uffff\1\u009c\1\151\2\uffff\1\153\1\140\2\uffff\1\137\1\163\1\u0099\5\uffff\1\62\1\u0098\1\uffff\1\150\1\165\1\uffff\1\177\5\uffff\1\131\2\uffff\1\117\2\uffff\1\127\4\uffff\1\155\1\147\1\uffff\1\u0093\3\uffff\1\126\1\130\1\u008f\14\uffff\1\160\1\u00a1\1\164\1\uffff\1\115\1\u0095\1\uffff\1\156";
     static final String DFA24_specialS =
-        "\1\0\u035e\uffff}>";
+        "\1\0\u0359\uffff}>";
     static final String[] DFA24_transitionS = {
             "\11\64\2\63\2\64\1\63\22\64\1\63\1\12\1\62\1\51\1\61\1\11\1\3\1\55\1\45\1\46\1\7\1\5\1\47\1\6\1\15\1\10\1\56\11\57\1\53\1\43\1\14\1\1\1\13\1\16\1\44\32\61\1\52\1\64\1\50\1\60\1\61\1\64\1\37\1\27\1\32\1\31\1\20\1\22\1\23\1\30\1\21\2\61\1\24\1\42\1\25\1\41\1\33\1\61\1\26\1\4\1\36\1\40\1\17\1\54\3\61\1\34\1\2\1\35\uff82\64",
             "\1\65\1\66",
@@ -6031,25 +5958,25 @@ public class InternalTableDSLLexer extends Lexer {
             "\1\132",
             "\1\135\13\uffff\1\134",
             "\1\137",
-            "\1\145\7\uffff\1\143\1\144\3\uffff\1\141\4\uffff\1\142\1\uffff\1\140",
+            "\1\142\7\uffff\1\144\1\145\3\uffff\1\141\4\uffff\1\143\1\uffff\1\140",
             "\1\150\2\uffff\1\151\6\uffff\1\146\1\147",
             "\1\152\7\uffff\1\154\5\uffff\1\153",
             "\1\156\2\uffff\1\155",
             "\1\160\11\uffff\1\157",
             "\1\163\11\uffff\1\161\3\uffff\1\164\1\uffff\1\162",
             "\1\167\3\uffff\1\165\5\uffff\1\166",
-            "\1\170\3\uffff\1\171\11\uffff\1\173\5\uffff\1\172",
+            "\1\170\12\uffff\1\173\2\uffff\1\172\5\uffff\1\171",
             "\1\174\12\uffff\1\175",
             "\1\177\3\uffff\1\176\11\uffff\1\u0081\4\uffff\1\u0080\4\uffff\1\u0082",
             "\1\u0086\3\uffff\1\u0085\2\uffff\1\u0084\6\uffff\1\u0083",
-            "\1\u0087\15\uffff\1\u0089\2\uffff\1\u0088",
+            "\1\u0087\20\uffff\1\u0088",
             "",
             "",
-            "\1\u008c\3\uffff\1\u008e\2\uffff\1\u0090\6\uffff\1\u008d\2\uffff\1\u008f\6\uffff\1\u0091",
-            "\1\u0094\4\uffff\1\u0093\6\uffff\1\u0092\4\uffff\1\u0095",
-            "\1\u0097\2\uffff\1\u0096",
-            "\1\u0098",
-            "\1\u009a\3\uffff\1\u0099\17\uffff\1\u009b",
+            "\1\u008b\3\uffff\1\u008d\2\uffff\1\u008f\6\uffff\1\u008c\2\uffff\1\u008e\6\uffff\1\u0090",
+            "\1\u0093\4\uffff\1\u0092\6\uffff\1\u0091\4\uffff\1\u0094",
+            "\1\u0096\2\uffff\1\u0095",
+            "\1\u0097",
+            "\1\u0099\3\uffff\1\u0098\17\uffff\1\u009a",
             "",
             "",
             "",
@@ -6058,30 +5985,30 @@ public class InternalTableDSLLexer extends Lexer {
             "",
             "",
             "",
-            "\1\u00a4",
-            "\1\u00a6",
-            "\1\u00a9\34\uffff\32\u00a9\3\uffff\1\u00a8\1\u00a9\1\uffff\32\u00a9",
-            "\12\u00ab\10\uffff\1\u00ad\1\uffff\3\u00ad\5\uffff\1\u00ad\13\uffff\1\u00aa\6\uffff\1\u00ab\2\uffff\1\u00ad\1\uffff\3\u00ad\5\uffff\1\u00ad\13\uffff\1\u00aa",
-            "\12\u00ab\10\uffff\1\u00ad\1\uffff\3\u00ad\5\uffff\1\u00ad\22\uffff\1\u00ab\2\uffff\1\u00ad\1\uffff\3\u00ad\5\uffff\1\u00ad",
+            "\1\u00a3",
+            "\1\u00a5",
+            "\1\u00a8\34\uffff\32\u00a8\3\uffff\1\u00a7\1\u00a8\1\uffff\32\u00a8",
+            "\12\u00aa\10\uffff\1\u00ac\1\uffff\3\u00ac\5\uffff\1\u00ac\13\uffff\1\u00a9\6\uffff\1\u00aa\2\uffff\1\u00ac\1\uffff\3\u00ac\5\uffff\1\u00ac\13\uffff\1\u00a9",
+            "\12\u00aa\10\uffff\1\u00ac\1\uffff\3\u00ac\5\uffff\1\u00ac\22\uffff\1\u00aa\2\uffff\1\u00ac\1\uffff\3\u00ac\5\uffff\1\u00ac",
             "\1\103\34\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
             "",
             "",
             "",
-            "\1\u00af",
+            "\1\u00ae",
             "",
             "",
             "",
             "",
             "",
             "",
-            "\1\u00b1",
-            "\1\u00b2\20\uffff\1\u00b3\6\uffff\1\u00b4",
+            "\1\u00b0",
+            "\1\u00b1\20\uffff\1\u00b2\6\uffff\1\u00b3",
+            "\1\u00b4",
             "\1\u00b5",
-            "\1\u00b6",
-            "\1\u00b7\10\uffff\1\u00b8",
+            "\1\u00b6\10\uffff\1\u00b7",
+            "\1\u00b8",
             "\1\u00b9",
-            "\1\u00ba",
             "",
             "",
             "",
@@ -6099,78 +6026,77 @@ public class InternalTableDSLLexer extends Lexer {
             "",
             "",
             "",
-            "\1\u00bb",
+            "\1\u00ba",
             "",
             "",
             "",
             "",
             "",
-            "\1\u00bd",
+            "\1\u00bc",
             "",
             "",
             "",
             "",
-            "\1\u00bf\5\uffff\1\u00c0",
-            "\1\u00c2\3\uffff\1\u00c1",
+            "\1\u00be\5\uffff\1\u00bf",
+            "\1\u00c1\3\uffff\1\u00c0",
+            "\1\u00c2",
             "\1\u00c3",
             "\1\u00c4",
             "\1\u00c5",
             "\1\u00c6",
-            "\1\u00c7",
-            "\1\u00c9\16\uffff\1\u00c8",
-            "\1\u00ca\16\uffff\1\u00cc\1\u00cb",
-            "\1\u00cd",
+            "\1\u00c8\16\uffff\1\u00c7",
+            "\1\u00c9\16\uffff\1\u00cb\1\u00ca",
+            "\1\u00cc",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u00ce",
             "\1\u00cf",
-            "\1\u00d0",
-            "\1\u00d2\1\uffff\1\u00d1",
-            "\1\u00d3\3\uffff\1\u00d4",
-            "\1\u00d5",
-            "\1\u00d7\7\uffff\1\u00d6",
-            "\1\u00d8",
-            "\1\u00d9",
-            "\1\u00db\1\u00da",
-            "\1\u00dc",
+            "\1\u00d1\1\uffff\1\u00d0",
+            "\1\u00d2",
+            "\1\u00d3",
+            "\1\u00d5\7\uffff\1\u00d4",
+            "\1\u00d6",
+            "\1\u00d7",
+            "\1\u00d9\1\u00d8",
+            "\1\u00da",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u00de",
-            "\1\u00df",
-            "\1\u00e0\16\uffff\1\u00e2\1\u00e1",
+            "\1\u00dc",
+            "\1\u00dd",
+            "\1\u00de\2\uffff\1\u00df\16\uffff\1\u00e1\1\u00e0",
+            "\1\u00e2",
             "\1\u00e3",
             "\1\u00e4",
             "\1\u00e5",
             "\1\u00e6",
             "\1\u00e7",
-            "\1\u00e8",
-            "\1\u00e9\13\uffff\1\u00ea\1\u00eb\1\u00ec",
-            "\1\u00ee\4\uffff\1\u00ed",
-            "\1\u00ef",
+            "\1\u00e8\13\uffff\1\u00e9\1\u00ea\1\u00eb",
+            "\1\u00ed\4\uffff\1\u00ec",
+            "\1\u00ee",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u00f0",
             "\1\u00f1",
             "\1\u00f2",
             "\1\u00f3",
-            "\1\u00f4",
-            "\1\u00f5\1\u00f6",
-            "\1\u00f8\3\uffff\1\u00f7\14\uffff\1\u00f9",
-            "\1\u00fa\11\uffff\1\u00fb",
-            "\1\u00fc",
-            "",
-            "",
-            "\1\u00fd\20\uffff\1\u00fe",
-            "\1\u00ff",
-            "\1\u0100",
-            "\1\u0101\17\uffff\1\u0103\3\uffff\1\u0102",
-            "\1\u0104\14\uffff\1\u0105",
-            "\1\u0106",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\2\103\1\u0107\27\103",
-            "\1\u0109\12\uffff\1\u010a",
+            "\1\u00f4\1\u00f5",
+            "\1\u00f7\3\uffff\1\u00f6\14\uffff\1\u00f8",
+            "\1\u00f9\11\uffff\1\u00fa",
+            "",
+            "",
+            "\1\u00fb\20\uffff\1\u00fc",
+            "\1\u00fd",
+            "\1\u00fe",
+            "\1\u00ff\17\uffff\1\u0101\3\uffff\1\u0100",
+            "\1\u0102\14\uffff\1\u0103",
+            "\1\u0104",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\2\103\1\u0105\27\103",
+            "\1\u0107\12\uffff\1\u0108",
+            "\1\u0109",
+            "\1\u010a",
             "\1\u010b",
             "\1\u010c",
             "\1\u010d",
             "\1\u010e",
             "\1\u010f",
             "\1\u0110",
-            "\1\u0111",
-            "\1\u0112",
             "",
             "",
             "",
@@ -6181,33 +6107,35 @@ public class InternalTableDSLLexer extends Lexer {
             "",
             "",
             "",
-            "\1\u0113",
+            "\1\u0111",
             "",
-            "\1\u00a9\34\uffff\32\u00a9\4\uffff\1\u00a9\1\uffff\32\u00a9",
-            "\1\u0114\2\uffff\1\u0116\7\uffff\1\u0115\12\u0114\7\uffff\32\u0114\4\uffff\1\u0114\1\uffff\32\u0114",
+            "\1\u00a8\34\uffff\32\u00a8\4\uffff\1\u00a8\1\uffff\32\u00a8",
+            "\1\u0113\2\uffff\1\u0112\7\uffff\1\u0114\12\u0113\7\uffff\32\u0113\4\uffff\1\u0113\1\uffff\32\u0113",
             "",
-            "\12\u00ab\10\uffff\1\u00ad\1\uffff\3\u00ad\5\uffff\1\u00ad\22\uffff\1\u00ab\2\uffff\1\u00ad\1\uffff\3\u00ad\5\uffff\1\u00ad",
+            "\12\u00aa\10\uffff\1\u00ac\1\uffff\3\u00ac\5\uffff\1\u00ac\22\uffff\1\u00aa\2\uffff\1\u00ac\1\uffff\3\u00ac\5\uffff\1\u00ac",
             "",
             "",
             "",
             "",
             "",
-            "\1\u0117",
-            "\1\u0119\14\uffff\1\u0118",
+            "\1\u0115",
+            "\1\u0117\14\uffff\1\u0116",
+            "\1\u0118",
+            "\1\u0119",
             "\1\u011a",
             "\1\u011b",
             "\1\u011c",
             "\1\u011d",
             "\1\u011e",
             "\1\u011f",
-            "\1\u0120",
-            "\1\u0121",
             "",
             "",
             "",
             "",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\24\103\1\u0122\5\103",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\24\103\1\u0120\5\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u0123",
+            "\1\u0124",
             "\1\u0125",
             "\1\u0126",
             "\1\u0127",
@@ -6215,85 +6143,85 @@ public class InternalTableDSLLexer extends Lexer {
             "\1\u0129",
             "\1\u012a",
             "\1\u012b",
-            "\1\u012c",
-            "\1\u012d",
-            "\1\u012e\3\uffff\1\u012f",
+            "\1\u012c\3\uffff\1\u012d",
+            "\1\u012e",
+            "\1\u012f",
             "\1\u0130",
-            "\1\u0131",
-            "\1\u0132",
             "",
-            "\1\u0133",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\14\103\1\u0134\15\103",
-            "\1\u0136",
-            "\1\u0137",
-            "\1\u0138\3\uffff\1\u0139",
+            "\1\u0131",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\14\103\1\u0132\15\103",
+            "\1\u0134",
+            "\1\u0135",
+            "\1\u0136\3\uffff\1\u0137",
+            "\1\u0138",
+            "\1\u0139",
             "\1\u013a",
             "\1\u013b",
-            "\1\u013c",
-            "\1\u013d",
+            "\1\u013c\110\uffff\1\u013d",
             "\1\u013e",
-            "\1\u013f\110\uffff\1\u0140",
-            "\1\u0141",
-            "\1\u0142",
+            "\1\u013f",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
-            "\1\u0144",
-            "\1\u0146\37\uffff\1\u0147\12\uffff\1\u0145",
+            "\1\u0141",
+            "\1\u0143\37\uffff\1\u0144\12\uffff\1\u0142",
+            "\1\u0145",
+            "\1\u0146",
+            "\1\u0147",
             "\1\u0148",
             "\1\u0149",
             "\1\u014a",
             "\1\u014b",
             "\1\u014c",
-            "\1\u014d",
-            "\1\u014e",
-            "\1\u014f\1\u0150",
+            "\1\u014d\1\u014e",
+            "\1\u014f",
+            "\1\u0150",
             "\1\u0151",
             "\1\u0152",
             "\1\u0153",
             "\1\u0154",
-            "\1\u0155",
-            "\1\u0156",
-            "\1\u0157\3\uffff\1\u0158",
+            "\1\u0155\3\uffff\1\u0156",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
-            "\1\u015a",
-            "\1\u015c\10\uffff\1\u015b",
+            "\1\u0158",
+            "\1\u015a\10\uffff\1\u0159",
+            "\1\u015b",
+            "\1\u015c",
             "\1\u015d",
             "\1\u015e",
             "\1\u015f",
             "\1\u0160",
             "\1\u0161",
             "\1\u0162",
-            "\1\u0163",
-            "\1\u0164",
-            "\1\u0166\10\uffff\1\u0165",
+            "\1\u0164\10\uffff\1\u0163",
+            "\1\u0165",
+            "\1\u0166",
             "\1\u0167",
             "\1\u0168",
             "\1\u0169",
-            "\1\u016a",
-            "\1\u016b",
-            "\1\u016c",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u016b",
+            "\1\u016d\1\u016c",
             "\1\u016e",
-            "\1\u0170\1\u016f",
+            "\1\u016f",
+            "\1\u0170",
+            "",
             "\1\u0171",
             "\1\u0172",
             "\1\u0173",
-            "",
             "\1\u0174",
             "\1\u0175",
             "\1\u0176",
             "\1\u0177",
             "\1\u0178",
-            "\1\u0179",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u017a",
             "\1\u017b",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u017d",
-            "\1\u017e",
-            "\1\u0114\2\uffff\1\u0116\7\uffff\1\u0115\12\u0114\7\uffff\32\u0114\4\uffff\1\u0114\1\uffff\32\u0114",
-            "\1\u0181\5\uffff\1\u017f\26\uffff\32\u0181\3\uffff\1\u0180\1\u0181\1\uffff\32\u0181",
             "",
+            "\1\u0113\2\uffff\1\u0112\7\uffff\1\u0114\12\u0113\7\uffff\32\u0113\4\uffff\1\u0113\1\uffff\32\u0113",
+            "\1\u017f\5\uffff\1\u017d\26\uffff\32\u017f\3\uffff\1\u017e\1\u017f\1\uffff\32\u017f",
+            "\1\u0180",
+            "\1\u0181",
+            "\1\u0182",
             "\1\u0183",
             "\1\u0184",
             "\1\u0185",
@@ -6303,51 +6231,51 @@ public class InternalTableDSLLexer extends Lexer {
             "\1\u0189",
             "\1\u018a",
             "\1\u018b",
+            "",
+            "",
             "\1\u018c",
             "\1\u018d",
             "\1\u018e",
-            "",
-            "",
             "\1\u018f",
             "\1\u0190",
-            "\1\u0191",
-            "\1\u0192",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u0192",
+            "\1\u0193",
             "\1\u0194",
             "\1\u0195",
             "\1\u0196",
-            "\1\u0197",
-            "\1\u0198",
+            "\1\u0198\12\uffff\1\u0197",
             "\1\u0199",
-            "\1\u019b\12\uffff\1\u019a",
-            "\1\u019c",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u019b",
+            "\1\u019c",
+            "",
+            "\1\u019d",
             "\1\u019e",
             "\1\u019f",
-            "",
             "\1\u01a0",
             "\1\u01a1",
             "\1\u01a2",
             "\1\u01a3",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u01a4",
+            "",
             "\1\u01a5",
             "\1\u01a6",
-            "\1\u01a7",
-            "\1\u01a8",
-            "",
-            "\1\u01a9",
-            "\1\u01aa",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
-            "\1\u01ac",
+            "\1\u01a8",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u01aa",
+            "\1\u01ab",
+            "\1\u01ac",
+            "\1\u01ad",
             "\1\u01ae",
             "\1\u01af",
+            "",
             "\1\u01b0",
             "\1\u01b1",
             "\1\u01b2",
-            "",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u01b3",
             "\1\u01b4",
             "\1\u01b5",
             "\1\u01b6",
@@ -6357,100 +6285,99 @@ public class InternalTableDSLLexer extends Lexer {
             "\1\u01ba",
             "\1\u01bb",
             "\1\u01bc",
+            "",
             "\1\u01bd",
             "\1\u01be",
             "\1\u01bf",
-            "",
             "\1\u01c0",
             "\1\u01c1",
-            "\1\u01c2",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u01c3",
             "\1\u01c4",
+            "\1\u01c5",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u01c6",
             "\1\u01c7",
-            "\1\u01c8",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\4\103\1\u01c8\25\103",
             "\1\u01ca",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\4\103\1\u01cb\25\103",
-            "\1\u01cd",
-            "\1\u01ce",
-            "\1\u01cf",
-            "\1\u01d0",
-            "\1\u01d1\21\uffff\1\u01d2",
-            "\1\u01d4\17\uffff\1\u01d3",
-            "\1\u01d5",
+            "\1\u01cb",
+            "\1\u01cc",
+            "\1\u01cd\21\uffff\1\u01ce",
+            "\1\u01d0\17\uffff\1\u01cf",
+            "\1\u01d1",
             "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u01d4",
+            "\1\u01d5",
+            "\1\u01d6",
+            "\1\u01d7",
             "\1\u01d8",
             "\1\u01d9",
             "\1\u01da",
-            "\1\u01db",
-            "\1\u01dc",
-            "\1\u01dd",
-            "\1\u01de",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u01dc",
+            "\1\u01de\4\uffff\1\u01dd",
+            "\1\u01df",
             "\1\u01e0",
-            "\1\u01e2\4\uffff\1\u01e1",
-            "\1\u01e3",
-            "\1\u01e4",
             "",
+            "\1\u01e1",
+            "\1\u01e2",
+            "",
+            "\1\u0112",
+            "\1\u017f\34\uffff\32\u017f\4\uffff\1\u017f\1\uffff\32\u017f",
+            "\1\u01e3\2\uffff\1\u0112\7\uffff\1\u0114\12\u01e3\7\uffff\32\u01e3\4\uffff\1\u01e3\1\uffff\32\u01e3",
+            "\1\u01e4",
             "\1\u01e5",
             "\1\u01e6",
-            "\1\u0116",
-            "\1\u0181\34\uffff\32\u0181\4\uffff\1\u0181\1\uffff\32\u0181",
-            "\1\u01e7\2\uffff\1\u0116\7\uffff\1\u0115\12\u01e7\7\uffff\32\u01e7\4\uffff\1\u01e7\1\uffff\32\u01e7",
-            "",
-            "\1\u01e8",
-            "\1\u01e9",
-            "\1\u01ea",
-            "\1\u01eb",
+            "\1\u01e7",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u01ea",
+            "\1\u01eb",
+            "\1\u01ec",
+            "\1\u01ed",
             "\1\u01ee",
-            "\1\u01ef",
-            "\1\u01f0",
-            "\1\u01f1",
-            "\1\u01f2",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u01f4\16\uffff\1\u01f5",
-            "\1\u01f6",
+            "\1\u01f0\16\uffff\1\u01f1",
+            "\1\u01f2",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u01f8",
+            "\1\u01f4",
+            "\1\u01f5",
             "",
-            "\1\u01f9",
+            "\1\u01f6",
+            "\1\u01f7",
+            "\1\103\13\uffff\12\103\7\uffff\22\103\1\u01f8\7\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u01fa",
             "\1\u01fb",
-            "\1\103\13\uffff\12\103\7\uffff\22\103\1\u01fc\7\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u01fc",
+            "\1\u01fd",
             "\1\u01fe",
-            "\1\u01ff",
+            "",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u0200",
             "\1\u0201",
             "\1\u0202",
-            "",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u0203",
             "\1\u0204",
+            "",
             "\1\u0205",
             "\1\u0206",
-            "\1\u0207",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u0208",
-            "",
-            "",
             "\1\u0209",
+            "",
             "\1\u020a",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "",
+            "\1\u020b",
             "\1\u020c",
             "\1\u020d",
-            "",
             "\1\u020e",
-            "",
             "\1\u020f",
-            "\1\u0210\7\uffff\1\u0211",
+            "\1\u0210",
+            "\1\u0211",
             "\1\u0212",
             "\1\u0213",
             "\1\u0214",
-            "",
             "\1\u0215",
             "\1\u0216",
             "\1\u0217",
@@ -6465,313 +6392,307 @@ public class InternalTableDSLLexer extends Lexer {
             "\1\u0220",
             "\1\u0221",
             "\1\u0222",
-            "\1\u0223",
-            "\1\u0224",
-            "\1\u0225",
             "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u0228",
+            "\1\u0225",
             "",
-            "\1\u0229",
-            "\1\u022a",
+            "\1\u0226",
+            "\1\u0227",
             "",
+            "\1\u0228",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u022a",
             "\1\u022b",
             "\1\u022c",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u022d",
             "\1\u022e",
-            "\1\u022f",
-            "\1\u0230",
-            "\1\u0231",
-            "\1\u0232",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
             "",
-            "\1\u0234",
+            "\1\u0230",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u0232",
+            "\1\u0233",
+            "\1\u0234",
+            "\1\u0235",
             "\1\u0236",
-            "\1\u0237",
+            "",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u0238",
             "\1\u0239",
             "\1\u023a",
-            "",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u023b",
             "\1\u023c",
-            "\1\u023d",
-            "\1\u023e",
-            "\1\u023f",
-            "\1\u0240",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u01e7\2\uffff\1\u0116\7\uffff\1\u0115\12\u01e7\7\uffff\32\u01e7\4\uffff\1\u01e7\1\uffff\32\u01e7",
+            "\1\u01e3\2\uffff\1\u0112\7\uffff\1\u0114\12\u01e3\7\uffff\32\u01e3\4\uffff\1\u01e3\1\uffff\32\u01e3",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u0244",
+            "\1\u0240",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
             "",
-            "\1\u0246",
-            "\1\u0247",
-            "\1\u0249\36\uffff\1\u024a\7\uffff\1\u0248",
+            "\1\u0242",
+            "\1\u0243",
+            "\1\u0245\46\uffff\1\u0244",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u024c",
+            "\1\u0247",
+            "",
+            "\1\u0248",
+            "\1\u0249",
+            "\1\u024a",
             "",
+            "\1\u024b",
+            "\1\u024c",
             "\1\u024d",
-            "\1\u024e",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u024f",
             "",
             "\1\u0250",
             "\1\u0251",
             "\1\u0252",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u0253",
             "\1\u0254",
             "",
-            "\1\u0255",
-            "\1\u0256",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\23\103\1\u0255\6\103",
             "\1\u0257",
             "\1\u0258",
             "\1\u0259",
-            "",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\23\103\1\u025a\6\103",
-            "\1\u025c",
+            "\1\u025a",
+            "\1\u025b\16\uffff\1\u025c",
             "\1\u025d",
+            "",
             "\1\u025e",
-            "\1\u025f",
-            "\1\u0260\16\uffff\1\u0261",
+            "\1\103\13\uffff\12\103\7\uffff\22\103\1\u025f\7\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u0262",
-            "",
             "\1\u0263",
-            "\1\103\13\uffff\12\103\7\uffff\22\103\1\u0264\7\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u0264",
+            "\1\u0265",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u0267",
             "\1\u0268",
             "\1\u0269",
             "\1\u026a",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u026c",
             "\1\u026d",
             "\1\u026e",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u026f",
             "\1\u0270",
             "\1\u0271",
             "\1\u0272",
             "\1\u0273",
             "\1\u0274",
             "\1\u0275",
-            "\1\u0276",
-            "\1\u0277",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\22\103\1\u0276\7\103",
             "\1\u0278",
             "\1\u0279",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\22\103\1\u027a\7\103",
+            "\1\u027a",
+            "",
+            "",
+            "\1\u027b",
             "\1\u027c",
             "\1\u027d",
             "\1\u027e",
             "",
-            "",
-            "\1\u027f",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u0280",
             "\1\u0281",
             "\1\u0282",
             "\1\u0283",
             "",
+            "",
+            "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u0285",
             "\1\u0286",
             "\1\u0287",
             "\1\u0288",
             "",
-            "",
-            "",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u0289",
             "\1\u028a",
             "\1\u028b",
             "\1\u028c",
             "\1\u028d",
             "",
+            "",
+            "",
             "\1\u028e",
-            "\1\u028f",
+            "",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u0290",
             "\1\u0291",
             "\1\u0292",
             "",
-            "",
-            "",
             "\1\u0293",
-            "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u0295",
             "\1\u0296",
             "\1\u0297",
             "\1\u0298",
-            "",
             "\1\u0299",
+            "",
+            "\1\u029a",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u029b",
             "\1\u029c",
             "\1\u029d",
-            "\1\u029e",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u029f",
-            "",
             "\1\u02a0",
+            "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u02a2",
             "\1\u02a3",
+            "\1\u02a4",
+            "",
+            "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u02a5",
             "\1\u02a6",
+            "\1\u02a7",
+            "",
             "",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u02a8",
             "\1\u02a9",
             "\1\u02aa",
+            "\1\u02ab",
             "",
             "",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u02ac",
             "\1\u02ad",
-            "",
-            "",
             "\1\u02ae",
+            "",
             "\1\u02af",
             "\1\u02b0",
-            "\1\u02b1",
-            "",
-            "",
-            "\1\u02b2",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u02b3",
-            "",
-            "\1\u02b4",
-            "\1\u02b5",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u02b5",
+            "\1\u02b6",
+            "\1\u02b7",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u02b8",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "",
             "\1\u02ba",
             "\1\u02bb",
             "\1\u02bc",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "",
+            "\1\u02be",
             "\1\u02bf",
             "\1\u02c0",
-            "\1\u02c1",
+            "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u02c3",
+            "\1\103\13\uffff\12\103\7\uffff\17\103\1\u02c2\12\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u02c4",
             "\1\u02c5",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\103\13\uffff\12\103\7\uffff\17\103\1\u02c8\12\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u02c6",
+            "\1\u02c7",
+            "\1\u02c8",
+            "\1\u02c9",
             "\1\u02ca",
             "\1\u02cb",
-            "",
-            "\1\u02cc",
-            "\1\u02cd",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u02ce",
             "\1\u02cf",
-            "\1\u02d0",
-            "\1\u02d1",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u02d4",
-            "\1\u02d5",
+            "\1\u02d1",
+            "\1\u02d2",
+            "\1\u02d3",
             "",
+            "\1\u02d4",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u02d7",
-            "\1\u02d8",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u02d9",
-            "\1\u02da",
             "",
+            "\1\u02da",
             "\1\u02db",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "",
+            "\1\u02dc",
             "\1\u02dd",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u02e0",
             "",
+            "\1\u02de",
+            "\1\u02df\16\uffff\1\u02e0",
             "\1\u02e1",
-            "\1\u02e2",
             "",
+            "\1\u02e2",
             "\1\u02e3",
             "\1\u02e4",
-            "",
             "\1\u02e5",
-            "\1\u02e6\16\uffff\1\u02e7",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\u02e8",
-            "",
             "\1\u02e9",
             "\1\u02ea",
             "\1\u02eb",
             "\1\u02ec",
-            "\1\u02ed",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u02ef",
-            "\1\u02f0",
-            "\1\u02f1",
-            "\1\u02f2",
             "",
             "",
-            "\1\u02f3",
+            "\1\u02ed",
             "",
-            "\1\u02f4",
+            "\1\u02ee",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u02f6",
+            "\1\u02f0",
             "",
             "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u02f9",
+            "\1\u02f3",
             "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u02fc",
+            "\1\u02f6",
             "",
+            "\1\u02f7",
             "",
+            "\1\u02f8",
+            "\1\u02f9",
+            "\1\u02fa",
+            "\1\u02fb",
+            "\1\u02fc",
             "\1\u02fd",
-            "",
             "\1\u02fe",
             "\1\u02ff",
-            "\1\u0300",
-            "\1\u0301",
-            "\1\u0302",
-            "\1\u0303",
-            "\1\u0304",
-            "\1\u0305",
             "",
             "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u0307",
+            "\1\u0301",
             "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u0309",
-            "\1\u030a",
-            "\1\u030b",
+            "\1\u0303",
+            "\1\u0304",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
-            "\1\u030d",
             "",
+            "\1\u0306",
             "",
-            "\1\u030e",
-            "\1\u030f",
+            "\1\u0307",
+            "\1\u0308",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u0311",
+            "\1\u030a",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
             "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u0315",
-            "\1\u0316",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u030e",
+            "\1\u030f",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
-            "\1\u031a",
+            "",
+            "\1\u0312",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u0314",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u031e",
-            "\1\u031f",
+            "\1\u0317",
+            "\1\u0318",
             "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
@@ -6779,101 +6700,102 @@ public class InternalTableDSLLexer extends Lexer {
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
             "",
-            "\1\u0322",
-            "\1\u0323",
+            "\1\u031b",
+            "\1\u031c",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u0327",
-            "\1\u0328",
-            "\1\u0329",
-            "\1\u032a",
-            "\1\u032b",
+            "\1\u0320",
+            "\1\u0321",
+            "\1\u0322",
+            "\1\u0323",
+            "\1\u0324",
             "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u032e",
-            "\1\u032f",
+            "\1\u0327",
             "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u0332",
+            "\1\u032a",
             "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
             "",
             "",
-            "\1\u0334",
-            "\1\u0335",
-            "",
+            "\1\u032c",
+            "\1\u032d",
             "",
             "",
-            "\1\u0336",
+            "\1\u032e",
             "",
+            "\1\u032f",
             "",
             "",
-            "\1\u0337",
+            "\1\u0330",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
             "",
-            "\1\u0339",
-            "\1\u033a",
+            "\1\u0332",
+            "\1\u0333",
             "",
             "",
             "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u033c",
-            "\1\u033d",
+            "\1\u0335",
+            "\1\u0336",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u033f",
+            "\1\u0338",
             "",
             "",
-            "\1\u0340",
-            "\1\u0341",
+            "\1\u0339",
             "",
             "",
-            "\1\u0342",
+            "\1\u033a",
             "",
-            "\1\u0343",
+            "\1\u033b",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u033e",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
-            "\1\u0347",
-            "\1\u0348",
+            "\1\u0340",
+            "\1\u0341",
             "",
-            "\1\u0349",
+            "\1\u0342",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u034e",
-            "\1\u034f",
-            "",
+            "\1\u0346",
+            "\1\u0347",
             "",
             "",
-            "\1\u0350",
-            "\1\u0351",
-            "\1\u0352",
+            "\1\u0348",
             "",
+            "\1\u0349",
+            "\1\u034a",
+            "\1\u034b",
             "",
             "",
             "",
-            "\1\u0353",
-            "\1\u0354",
-            "\1\u0355",
-            "\1\u0356",
-            "\1\u0357",
+            "\1\u034c",
+            "\1\u034d",
+            "\1\u034e",
+            "\1\u034f",
+            "\1\u0350",
+            "\1\u0351",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
-            "\1\u035a",
+            "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
+            "\1\u0355",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
             "",
             "",
-            "\1\u035d",
+            "",
+            "\1\u0358",
             "",
             "",
             "\1\103\13\uffff\12\103\7\uffff\32\103\4\uffff\1\103\1\uffff\32\103",
@@ -6910,7 +6832,7 @@ public class InternalTableDSLLexer extends Lexer {
             this.transition = DFA24_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | T__135 | T__136 | T__137 | T__138 | T__139 | T__140 | T__141 | T__142 | T__143 | T__144 | T__145 | T__146 | T__147 | T__148 | T__149 | T__150 | T__151 | T__152 | T__153 | T__154 | T__155 | T__156 | T__157 | T__158 | T__159 | T__160 | T__161 | T__162 | T__163 | T__164 | T__165 | T__166 | T__167 | T__168 | T__169 | T__170 | T__171 | T__172 | T__173 | T__174 | T__175 | T__176 | T__177 | T__178 | T__179 | T__180 | T__181 | T__182 | T__183 | T__184 | RULE_THEME_RESOURCE | RULE_EVENT_TOPIC | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            return "1:1: Tokens : ( T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | T__135 | T__136 | T__137 | T__138 | T__139 | T__140 | T__141 | T__142 | T__143 | T__144 | T__145 | T__146 | T__147 | T__148 | T__149 | T__150 | T__151 | T__152 | T__153 | T__154 | T__155 | T__156 | T__157 | T__158 | T__159 | T__160 | T__161 | T__162 | T__163 | T__164 | T__165 | T__166 | T__167 | T__168 | T__169 | T__170 | T__171 | T__172 | T__173 | T__174 | T__175 | T__176 | T__177 | T__178 | T__179 | T__180 | T__181 | RULE_THEME_RESOURCE | RULE_EVENT_TOPIC | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             IntStream input = _input;
diff --git a/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSLParser.java b/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSLParser.java
index 02333a6..b5c0272 100644
--- a/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSLParser.java
+++ b/org.eclipse.osbp.xtext.table.ide/src-gen/org/eclipse/osbp/xtext/table/ide/contentassist/antlr/internal/InternalTableDSLParser.java
@@ -1,3 +1,17 @@
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
+ */
 package org.eclipse.osbp.xtext.table.ide.contentassist.antlr.internal;
 
 import java.io.InputStream;
@@ -23,7 +37,7 @@ import java.util.HashMap;
 @SuppressWarnings("all")
 public class InternalTableDSLParser extends AbstractInternalContentAssistParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_ID", "RULE_HEX", "RULE_INT", "RULE_DECIMAL", "RULE_THEME_RESOURCE", "RULE_EVENT_TOPIC", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'='", "'||'", "'&&'", "'single'", "'+'", "'-'", "'+='", "'-='", "'*='", "'/='", "'%='", "'=='", "'!='", "'==='", "'!=='", "'>='", "'>'", "'<'", "'->'", "'..<'", "'..'", "'=>'", "'<>'", "'?:'", "'*'", "'**'", "'/'", "'%'", "'!'", "'++'", "'--'", "'.'", "'val'", "'extends'", "'static'", "'import'", "'extension'", "'super'", "'false'", "'equal'", "'greater equal'", "'greater than'", "'lower equal'", "'lower than'", "'not equal'", "'rising'", "'bad-rising'", "'sloping'", "'good-sloping'", "'stagnating'", "'hidden'", "'explicit'", "'indexed'", "'default'", "'columns'", "'rows'", "'pages'", "'sections'", "'chapters'", "'package'", "'{'", "'}'", "'table'", "'as'", "'selection'", "'rowHeader'", "'toolbar'", "'using'", "'bean'", "'preorder'", "'value'", "'icon'", "'intervals'", "'lookups'", "'formatter'", "'path'", "'tooltipPattern'", "'taskId'", "'allColumns'", "'ordinal'", "'column'", "'measure'", "'derived'", "'level'", "'property'", "'aggregation'", "'upToNumber'", "'upToInteger'", "'daysInPast'", "'integer'", "'number'", "'string'", "'datamart'", "'axis'", "'textcolor'", "'cellcolor'", "'trend'", "'tooltip'", "'grid'", "'rowheader'", "'prop'", "'style'", "'dto'", "'buttonStyle'", "'eventTopic'", "'htmlStyle'", "'boolStyle'", "'dateStyle'", "'format'", "'numberStyle'", "'progressbarStyle'", "'max'", "'indicatorStyle'", "'greenFrom'", "'redUntil'", "'textStyle'", "'imageStyle'", "'then'", "';'", "'@'", "'('", "')'", "','", "']'", "'#'", "'['", "'instanceof'", "'if'", "'else'", "'switch'", "':'", "'case'", "'for'", "'while'", "'do'", "'new'", "'null'", "'typeof'", "'throw'", "'return'", "'try'", "'finally'", "'synchronized'", "'catch'", "'?'", "'&'", "'describedBy'", "'multiple'", "'alwaysSelected'", "'polling'", "'filtering'", "'embedded'", "'selectById'", "'ascending'", "'collapse'", "'image'", "'hidelabel'", "'dynamic'", "'resize'", "'rowheight'", "'details'", "'notifyOnSelect'", "'selectalways'", "'editable'", "'ns'", "'::'", "'?.'", "'|'", "'var'", "'true'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_ID", "RULE_HEX", "RULE_INT", "RULE_DECIMAL", "RULE_THEME_RESOURCE", "RULE_EVENT_TOPIC", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'='", "'||'", "'&&'", "'single'", "'+'", "'-'", "'+='", "'-='", "'*='", "'/='", "'%='", "'=='", "'!='", "'==='", "'!=='", "'>='", "'>'", "'<'", "'->'", "'..<'", "'..'", "'=>'", "'<>'", "'?:'", "'*'", "'**'", "'/'", "'%'", "'!'", "'++'", "'--'", "'.'", "'val'", "'extends'", "'static'", "'import'", "'extension'", "'super'", "'false'", "'equal'", "'greater equal'", "'greater than'", "'lower equal'", "'lower than'", "'not equal'", "'rising'", "'bad-rising'", "'sloping'", "'good-sloping'", "'stagnating'", "'hidden'", "'explicit'", "'indexed'", "'default'", "'columns'", "'rows'", "'pages'", "'sections'", "'chapters'", "'package'", "'{'", "'}'", "'table'", "'as'", "'selection'", "'rowHeader'", "'toolbar'", "'using'", "'readOnly'", "'preorder'", "'value'", "'icon'", "'intervals'", "'lookups'", "'formatter'", "'path'", "'tooltipPattern'", "'taskId'", "'allColumns'", "'ordinal'", "'column'", "'measure'", "'derived'", "'level'", "'property'", "'aggregation'", "'upToNumber'", "'upToInteger'", "'daysInPast'", "'integer'", "'number'", "'string'", "'datamart'", "'axis'", "'textcolor'", "'cellcolor'", "'trend'", "'tooltip'", "'editable'", "'prop'", "'style'", "'dto'", "'buttonStyle'", "'eventTopic'", "'htmlStyle'", "'boolStyle'", "'dateStyle'", "'format'", "'numberStyle'", "'progressbarStyle'", "'max'", "'indicatorStyle'", "'greenFrom'", "'redUntil'", "'textStyle'", "'blobImageStyle'", "'imageStyle'", "'then'", "';'", "'@'", "'('", "')'", "','", "']'", "'#'", "'['", "'instanceof'", "'if'", "'else'", "'switch'", "':'", "'case'", "'for'", "'while'", "'do'", "'new'", "'null'", "'typeof'", "'throw'", "'return'", "'try'", "'finally'", "'synchronized'", "'catch'", "'?'", "'&'", "'describedBy'", "'multiple'", "'alwaysSelected'", "'filtering'", "'embedded'", "'selectById'", "'ascending'", "'collapse'", "'image'", "'hidelabel'", "'dynamic'", "'resize'", "'rowheight'", "'details'", "'notifyOnSelect'", "'ns'", "'::'", "'?.'", "'|'", "'var'", "'true'"
     };
     public static final int T__144=144;
     public static final int T__143=143;
@@ -122,11 +136,8 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     public static final int T__102=102;
     public static final int T__94=94;
     public static final int T__101=101;
-    public static final int T__184=184;
-    public static final int T__183=183;
     public static final int T__90=90;
     public static final int T__180=180;
-    public static final int T__182=182;
     public static final int T__181=181;
     public static final int T__19=19;
     public static final int T__15=15;
@@ -753,97 +764,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     // $ANTLR end "ruleTableTable"
 
 
-    // $ANTLR start "entryRuleTableBean"
-    // InternalTableDSL.g:204:1: entryRuleTableBean : ruleTableBean EOF ;
-    public final void entryRuleTableBean() throws RecognitionException {
-        try {
-            // InternalTableDSL.g:205:1: ( ruleTableBean EOF )
-            // InternalTableDSL.g:206:1: ruleTableBean EOF
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanRule()); 
-            }
-            pushFollow(FOLLOW_1);
-            ruleTableBean();
-
-            state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanRule()); 
-            }
-            match(input,EOF,FOLLOW_2); if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleTableBean"
-
-
-    // $ANTLR start "ruleTableBean"
-    // InternalTableDSL.g:213:1: ruleTableBean : ( ( rule__TableBean__Group__0 ) ) ;
-    public final void ruleTableBean() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:217:2: ( ( ( rule__TableBean__Group__0 ) ) )
-            // InternalTableDSL.g:218:2: ( ( rule__TableBean__Group__0 ) )
-            {
-            // InternalTableDSL.g:218:2: ( ( rule__TableBean__Group__0 ) )
-            // InternalTableDSL.g:219:3: ( rule__TableBean__Group__0 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getGroup()); 
-            }
-            // InternalTableDSL.g:220:3: ( rule__TableBean__Group__0 )
-            // InternalTableDSL.g:220:4: rule__TableBean__Group__0
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableBean__Group__0();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getGroup()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleTableBean"
-
-
     // $ANTLR start "entryRuleTablePreorder"
-    // InternalTableDSL.g:229:1: entryRuleTablePreorder : ruleTablePreorder EOF ;
+    // InternalTableDSL.g:204:1: entryRuleTablePreorder : ruleTablePreorder EOF ;
     public final void entryRuleTablePreorder() throws RecognitionException {
         try {
-            // InternalTableDSL.g:230:1: ( ruleTablePreorder EOF )
-            // InternalTableDSL.g:231:1: ruleTablePreorder EOF
+            // InternalTableDSL.g:205:1: ( ruleTablePreorder EOF )
+            // InternalTableDSL.g:206:1: ruleTablePreorder EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTablePreorderRule()); 
@@ -873,23 +799,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTablePreorder"
-    // InternalTableDSL.g:238:1: ruleTablePreorder : ( ( rule__TablePreorder__Group__0 ) ) ;
+    // InternalTableDSL.g:213:1: ruleTablePreorder : ( ( rule__TablePreorder__Group__0 ) ) ;
     public final void ruleTablePreorder() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:242:2: ( ( ( rule__TablePreorder__Group__0 ) ) )
-            // InternalTableDSL.g:243:2: ( ( rule__TablePreorder__Group__0 ) )
+            // InternalTableDSL.g:217:2: ( ( ( rule__TablePreorder__Group__0 ) ) )
+            // InternalTableDSL.g:218:2: ( ( rule__TablePreorder__Group__0 ) )
             {
-            // InternalTableDSL.g:243:2: ( ( rule__TablePreorder__Group__0 ) )
-            // InternalTableDSL.g:244:3: ( rule__TablePreorder__Group__0 )
+            // InternalTableDSL.g:218:2: ( ( rule__TablePreorder__Group__0 ) )
+            // InternalTableDSL.g:219:3: ( rule__TablePreorder__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTablePreorderAccess().getGroup()); 
             }
-            // InternalTableDSL.g:245:3: ( rule__TablePreorder__Group__0 )
-            // InternalTableDSL.g:245:4: rule__TablePreorder__Group__0
+            // InternalTableDSL.g:220:3: ( rule__TablePreorder__Group__0 )
+            // InternalTableDSL.g:220:4: rule__TablePreorder__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TablePreorder__Group__0();
@@ -924,11 +850,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableValue"
-    // InternalTableDSL.g:254:1: entryRuleTableValue : ruleTableValue EOF ;
+    // InternalTableDSL.g:229:1: entryRuleTableValue : ruleTableValue EOF ;
     public final void entryRuleTableValue() throws RecognitionException {
         try {
-            // InternalTableDSL.g:255:1: ( ruleTableValue EOF )
-            // InternalTableDSL.g:256:1: ruleTableValue EOF
+            // InternalTableDSL.g:230:1: ( ruleTableValue EOF )
+            // InternalTableDSL.g:231:1: ruleTableValue EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueRule()); 
@@ -958,23 +884,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableValue"
-    // InternalTableDSL.g:263:1: ruleTableValue : ( ( rule__TableValue__Group__0 ) ) ;
+    // InternalTableDSL.g:238:1: ruleTableValue : ( ( rule__TableValue__Group__0 ) ) ;
     public final void ruleTableValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:267:2: ( ( ( rule__TableValue__Group__0 ) ) )
-            // InternalTableDSL.g:268:2: ( ( rule__TableValue__Group__0 ) )
+            // InternalTableDSL.g:242:2: ( ( ( rule__TableValue__Group__0 ) ) )
+            // InternalTableDSL.g:243:2: ( ( rule__TableValue__Group__0 ) )
             {
-            // InternalTableDSL.g:268:2: ( ( rule__TableValue__Group__0 ) )
-            // InternalTableDSL.g:269:3: ( rule__TableValue__Group__0 )
+            // InternalTableDSL.g:243:2: ( ( rule__TableValue__Group__0 ) )
+            // InternalTableDSL.g:244:3: ( rule__TableValue__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getGroup()); 
             }
-            // InternalTableDSL.g:270:3: ( rule__TableValue__Group__0 )
-            // InternalTableDSL.g:270:4: rule__TableValue__Group__0
+            // InternalTableDSL.g:245:3: ( rule__TableValue__Group__0 )
+            // InternalTableDSL.g:245:4: rule__TableValue__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableValue__Group__0();
@@ -1009,11 +935,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableFormatter"
-    // InternalTableDSL.g:279:1: entryRuleTableFormatter : ruleTableFormatter EOF ;
+    // InternalTableDSL.g:254:1: entryRuleTableFormatter : ruleTableFormatter EOF ;
     public final void entryRuleTableFormatter() throws RecognitionException {
         try {
-            // InternalTableDSL.g:280:1: ( ruleTableFormatter EOF )
-            // InternalTableDSL.g:281:1: ruleTableFormatter EOF
+            // InternalTableDSL.g:255:1: ( ruleTableFormatter EOF )
+            // InternalTableDSL.g:256:1: ruleTableFormatter EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableFormatterRule()); 
@@ -1043,23 +969,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableFormatter"
-    // InternalTableDSL.g:288:1: ruleTableFormatter : ( ( rule__TableFormatter__Group__0 ) ) ;
+    // InternalTableDSL.g:263:1: ruleTableFormatter : ( ( rule__TableFormatter__Group__0 ) ) ;
     public final void ruleTableFormatter() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:292:2: ( ( ( rule__TableFormatter__Group__0 ) ) )
-            // InternalTableDSL.g:293:2: ( ( rule__TableFormatter__Group__0 ) )
+            // InternalTableDSL.g:267:2: ( ( ( rule__TableFormatter__Group__0 ) ) )
+            // InternalTableDSL.g:268:2: ( ( rule__TableFormatter__Group__0 ) )
             {
-            // InternalTableDSL.g:293:2: ( ( rule__TableFormatter__Group__0 ) )
-            // InternalTableDSL.g:294:3: ( rule__TableFormatter__Group__0 )
+            // InternalTableDSL.g:268:2: ( ( rule__TableFormatter__Group__0 ) )
+            // InternalTableDSL.g:269:3: ( rule__TableFormatter__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableFormatterAccess().getGroup()); 
             }
-            // InternalTableDSL.g:295:3: ( rule__TableFormatter__Group__0 )
-            // InternalTableDSL.g:295:4: rule__TableFormatter__Group__0
+            // InternalTableDSL.g:270:3: ( rule__TableFormatter__Group__0 )
+            // InternalTableDSL.g:270:4: rule__TableFormatter__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableFormatter__Group__0();
@@ -1094,11 +1020,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableImage"
-    // InternalTableDSL.g:304:1: entryRuleTableImage : ruleTableImage EOF ;
+    // InternalTableDSL.g:279:1: entryRuleTableImage : ruleTableImage EOF ;
     public final void entryRuleTableImage() throws RecognitionException {
         try {
-            // InternalTableDSL.g:305:1: ( ruleTableImage EOF )
-            // InternalTableDSL.g:306:1: ruleTableImage EOF
+            // InternalTableDSL.g:280:1: ( ruleTableImage EOF )
+            // InternalTableDSL.g:281:1: ruleTableImage EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageRule()); 
@@ -1128,23 +1054,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableImage"
-    // InternalTableDSL.g:313:1: ruleTableImage : ( ( rule__TableImage__Group__0 ) ) ;
+    // InternalTableDSL.g:288:1: ruleTableImage : ( ( rule__TableImage__Group__0 ) ) ;
     public final void ruleTableImage() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:317:2: ( ( ( rule__TableImage__Group__0 ) ) )
-            // InternalTableDSL.g:318:2: ( ( rule__TableImage__Group__0 ) )
+            // InternalTableDSL.g:292:2: ( ( ( rule__TableImage__Group__0 ) ) )
+            // InternalTableDSL.g:293:2: ( ( rule__TableImage__Group__0 ) )
             {
-            // InternalTableDSL.g:318:2: ( ( rule__TableImage__Group__0 ) )
-            // InternalTableDSL.g:319:3: ( rule__TableImage__Group__0 )
+            // InternalTableDSL.g:293:2: ( ( rule__TableImage__Group__0 ) )
+            // InternalTableDSL.g:294:3: ( rule__TableImage__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageAccess().getGroup()); 
             }
-            // InternalTableDSL.g:320:3: ( rule__TableImage__Group__0 )
-            // InternalTableDSL.g:320:4: rule__TableImage__Group__0
+            // InternalTableDSL.g:295:3: ( rule__TableImage__Group__0 )
+            // InternalTableDSL.g:295:4: rule__TableImage__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableImage__Group__0();
@@ -1179,11 +1105,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableTooltipPattern"
-    // InternalTableDSL.g:329:1: entryRuleTableTooltipPattern : ruleTableTooltipPattern EOF ;
+    // InternalTableDSL.g:304:1: entryRuleTableTooltipPattern : ruleTableTooltipPattern EOF ;
     public final void entryRuleTableTooltipPattern() throws RecognitionException {
         try {
-            // InternalTableDSL.g:330:1: ( ruleTableTooltipPattern EOF )
-            // InternalTableDSL.g:331:1: ruleTableTooltipPattern EOF
+            // InternalTableDSL.g:305:1: ( ruleTableTooltipPattern EOF )
+            // InternalTableDSL.g:306:1: ruleTableTooltipPattern EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTooltipPatternRule()); 
@@ -1213,23 +1139,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableTooltipPattern"
-    // InternalTableDSL.g:338:1: ruleTableTooltipPattern : ( ( rule__TableTooltipPattern__Group__0 ) ) ;
+    // InternalTableDSL.g:313:1: ruleTableTooltipPattern : ( ( rule__TableTooltipPattern__Group__0 ) ) ;
     public final void ruleTableTooltipPattern() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:342:2: ( ( ( rule__TableTooltipPattern__Group__0 ) ) )
-            // InternalTableDSL.g:343:2: ( ( rule__TableTooltipPattern__Group__0 ) )
+            // InternalTableDSL.g:317:2: ( ( ( rule__TableTooltipPattern__Group__0 ) ) )
+            // InternalTableDSL.g:318:2: ( ( rule__TableTooltipPattern__Group__0 ) )
             {
-            // InternalTableDSL.g:343:2: ( ( rule__TableTooltipPattern__Group__0 ) )
-            // InternalTableDSL.g:344:3: ( rule__TableTooltipPattern__Group__0 )
+            // InternalTableDSL.g:318:2: ( ( rule__TableTooltipPattern__Group__0 ) )
+            // InternalTableDSL.g:319:3: ( rule__TableTooltipPattern__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTooltipPatternAccess().getGroup()); 
             }
-            // InternalTableDSL.g:345:3: ( rule__TableTooltipPattern__Group__0 )
-            // InternalTableDSL.g:345:4: rule__TableTooltipPattern__Group__0
+            // InternalTableDSL.g:320:3: ( rule__TableTooltipPattern__Group__0 )
+            // InternalTableDSL.g:320:4: rule__TableTooltipPattern__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableTooltipPattern__Group__0();
@@ -1264,11 +1190,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableValueElement"
-    // InternalTableDSL.g:354:1: entryRuleTableValueElement : ruleTableValueElement EOF ;
+    // InternalTableDSL.g:329:1: entryRuleTableValueElement : ruleTableValueElement EOF ;
     public final void entryRuleTableValueElement() throws RecognitionException {
         try {
-            // InternalTableDSL.g:355:1: ( ruleTableValueElement EOF )
-            // InternalTableDSL.g:356:1: ruleTableValueElement EOF
+            // InternalTableDSL.g:330:1: ( ruleTableValueElement EOF )
+            // InternalTableDSL.g:331:1: ruleTableValueElement EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueElementRule()); 
@@ -1298,23 +1224,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableValueElement"
-    // InternalTableDSL.g:363:1: ruleTableValueElement : ( ( rule__TableValueElement__Alternatives ) ) ;
+    // InternalTableDSL.g:338:1: ruleTableValueElement : ( ( rule__TableValueElement__Alternatives ) ) ;
     public final void ruleTableValueElement() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:367:2: ( ( ( rule__TableValueElement__Alternatives ) ) )
-            // InternalTableDSL.g:368:2: ( ( rule__TableValueElement__Alternatives ) )
+            // InternalTableDSL.g:342:2: ( ( ( rule__TableValueElement__Alternatives ) ) )
+            // InternalTableDSL.g:343:2: ( ( rule__TableValueElement__Alternatives ) )
             {
-            // InternalTableDSL.g:368:2: ( ( rule__TableValueElement__Alternatives ) )
-            // InternalTableDSL.g:369:3: ( rule__TableValueElement__Alternatives )
+            // InternalTableDSL.g:343:2: ( ( rule__TableValueElement__Alternatives ) )
+            // InternalTableDSL.g:344:3: ( rule__TableValueElement__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueElementAccess().getAlternatives()); 
             }
-            // InternalTableDSL.g:370:3: ( rule__TableValueElement__Alternatives )
-            // InternalTableDSL.g:370:4: rule__TableValueElement__Alternatives
+            // InternalTableDSL.g:345:3: ( rule__TableValueElement__Alternatives )
+            // InternalTableDSL.g:345:4: rule__TableValueElement__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__TableValueElement__Alternatives();
@@ -1349,11 +1275,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableTask"
-    // InternalTableDSL.g:379:1: entryRuleTableTask : ruleTableTask EOF ;
+    // InternalTableDSL.g:354:1: entryRuleTableTask : ruleTableTask EOF ;
     public final void entryRuleTableTask() throws RecognitionException {
         try {
-            // InternalTableDSL.g:380:1: ( ruleTableTask EOF )
-            // InternalTableDSL.g:381:1: ruleTableTask EOF
+            // InternalTableDSL.g:355:1: ( ruleTableTask EOF )
+            // InternalTableDSL.g:356:1: ruleTableTask EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTaskRule()); 
@@ -1383,23 +1309,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableTask"
-    // InternalTableDSL.g:388:1: ruleTableTask : ( ( rule__TableTask__Group__0 ) ) ;
+    // InternalTableDSL.g:363:1: ruleTableTask : ( ( rule__TableTask__Group__0 ) ) ;
     public final void ruleTableTask() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:392:2: ( ( ( rule__TableTask__Group__0 ) ) )
-            // InternalTableDSL.g:393:2: ( ( rule__TableTask__Group__0 ) )
+            // InternalTableDSL.g:367:2: ( ( ( rule__TableTask__Group__0 ) ) )
+            // InternalTableDSL.g:368:2: ( ( rule__TableTask__Group__0 ) )
             {
-            // InternalTableDSL.g:393:2: ( ( rule__TableTask__Group__0 ) )
-            // InternalTableDSL.g:394:3: ( rule__TableTask__Group__0 )
+            // InternalTableDSL.g:368:2: ( ( rule__TableTask__Group__0 ) )
+            // InternalTableDSL.g:369:3: ( rule__TableTask__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTaskAccess().getGroup()); 
             }
-            // InternalTableDSL.g:395:3: ( rule__TableTask__Group__0 )
-            // InternalTableDSL.g:395:4: rule__TableTask__Group__0
+            // InternalTableDSL.g:370:3: ( rule__TableTask__Group__0 )
+            // InternalTableDSL.g:370:4: rule__TableTask__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableTask__Group__0();
@@ -1434,11 +1360,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableAllColumns"
-    // InternalTableDSL.g:404:1: entryRuleTableAllColumns : ruleTableAllColumns EOF ;
+    // InternalTableDSL.g:379:1: entryRuleTableAllColumns : ruleTableAllColumns EOF ;
     public final void entryRuleTableAllColumns() throws RecognitionException {
         try {
-            // InternalTableDSL.g:405:1: ( ruleTableAllColumns EOF )
-            // InternalTableDSL.g:406:1: ruleTableAllColumns EOF
+            // InternalTableDSL.g:380:1: ( ruleTableAllColumns EOF )
+            // InternalTableDSL.g:381:1: ruleTableAllColumns EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAllColumnsRule()); 
@@ -1468,23 +1394,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableAllColumns"
-    // InternalTableDSL.g:413:1: ruleTableAllColumns : ( ( rule__TableAllColumns__Group__0 ) ) ;
+    // InternalTableDSL.g:388:1: ruleTableAllColumns : ( ( rule__TableAllColumns__Group__0 ) ) ;
     public final void ruleTableAllColumns() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:417:2: ( ( ( rule__TableAllColumns__Group__0 ) ) )
-            // InternalTableDSL.g:418:2: ( ( rule__TableAllColumns__Group__0 ) )
+            // InternalTableDSL.g:392:2: ( ( ( rule__TableAllColumns__Group__0 ) ) )
+            // InternalTableDSL.g:393:2: ( ( rule__TableAllColumns__Group__0 ) )
             {
-            // InternalTableDSL.g:418:2: ( ( rule__TableAllColumns__Group__0 ) )
-            // InternalTableDSL.g:419:3: ( rule__TableAllColumns__Group__0 )
+            // InternalTableDSL.g:393:2: ( ( rule__TableAllColumns__Group__0 ) )
+            // InternalTableDSL.g:394:3: ( rule__TableAllColumns__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAllColumnsAccess().getGroup()); 
             }
-            // InternalTableDSL.g:420:3: ( rule__TableAllColumns__Group__0 )
-            // InternalTableDSL.g:420:4: rule__TableAllColumns__Group__0
+            // InternalTableDSL.g:395:3: ( rule__TableAllColumns__Group__0 )
+            // InternalTableDSL.g:395:4: rule__TableAllColumns__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableAllColumns__Group__0();
@@ -1519,11 +1445,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableOrdinal"
-    // InternalTableDSL.g:429:1: entryRuleTableOrdinal : ruleTableOrdinal EOF ;
+    // InternalTableDSL.g:404:1: entryRuleTableOrdinal : ruleTableOrdinal EOF ;
     public final void entryRuleTableOrdinal() throws RecognitionException {
         try {
-            // InternalTableDSL.g:430:1: ( ruleTableOrdinal EOF )
-            // InternalTableDSL.g:431:1: ruleTableOrdinal EOF
+            // InternalTableDSL.g:405:1: ( ruleTableOrdinal EOF )
+            // InternalTableDSL.g:406:1: ruleTableOrdinal EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableOrdinalRule()); 
@@ -1553,23 +1479,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableOrdinal"
-    // InternalTableDSL.g:438:1: ruleTableOrdinal : ( ( rule__TableOrdinal__Group__0 ) ) ;
+    // InternalTableDSL.g:413:1: ruleTableOrdinal : ( ( rule__TableOrdinal__Group__0 ) ) ;
     public final void ruleTableOrdinal() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:442:2: ( ( ( rule__TableOrdinal__Group__0 ) ) )
-            // InternalTableDSL.g:443:2: ( ( rule__TableOrdinal__Group__0 ) )
+            // InternalTableDSL.g:417:2: ( ( ( rule__TableOrdinal__Group__0 ) ) )
+            // InternalTableDSL.g:418:2: ( ( rule__TableOrdinal__Group__0 ) )
             {
-            // InternalTableDSL.g:443:2: ( ( rule__TableOrdinal__Group__0 ) )
-            // InternalTableDSL.g:444:3: ( rule__TableOrdinal__Group__0 )
+            // InternalTableDSL.g:418:2: ( ( rule__TableOrdinal__Group__0 ) )
+            // InternalTableDSL.g:419:3: ( rule__TableOrdinal__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableOrdinalAccess().getGroup()); 
             }
-            // InternalTableDSL.g:445:3: ( rule__TableOrdinal__Group__0 )
-            // InternalTableDSL.g:445:4: rule__TableOrdinal__Group__0
+            // InternalTableDSL.g:420:3: ( rule__TableOrdinal__Group__0 )
+            // InternalTableDSL.g:420:4: rule__TableOrdinal__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableOrdinal__Group__0();
@@ -1604,11 +1530,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableColumn"
-    // InternalTableDSL.g:454:1: entryRuleTableColumn : ruleTableColumn EOF ;
+    // InternalTableDSL.g:429:1: entryRuleTableColumn : ruleTableColumn EOF ;
     public final void entryRuleTableColumn() throws RecognitionException {
         try {
-            // InternalTableDSL.g:455:1: ( ruleTableColumn EOF )
-            // InternalTableDSL.g:456:1: ruleTableColumn EOF
+            // InternalTableDSL.g:430:1: ( ruleTableColumn EOF )
+            // InternalTableDSL.g:431:1: ruleTableColumn EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableColumnRule()); 
@@ -1638,23 +1564,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableColumn"
-    // InternalTableDSL.g:463:1: ruleTableColumn : ( ( rule__TableColumn__Group__0 ) ) ;
+    // InternalTableDSL.g:438:1: ruleTableColumn : ( ( rule__TableColumn__Group__0 ) ) ;
     public final void ruleTableColumn() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:467:2: ( ( ( rule__TableColumn__Group__0 ) ) )
-            // InternalTableDSL.g:468:2: ( ( rule__TableColumn__Group__0 ) )
+            // InternalTableDSL.g:442:2: ( ( ( rule__TableColumn__Group__0 ) ) )
+            // InternalTableDSL.g:443:2: ( ( rule__TableColumn__Group__0 ) )
             {
-            // InternalTableDSL.g:468:2: ( ( rule__TableColumn__Group__0 ) )
-            // InternalTableDSL.g:469:3: ( rule__TableColumn__Group__0 )
+            // InternalTableDSL.g:443:2: ( ( rule__TableColumn__Group__0 ) )
+            // InternalTableDSL.g:444:3: ( rule__TableColumn__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableColumnAccess().getGroup()); 
             }
-            // InternalTableDSL.g:470:3: ( rule__TableColumn__Group__0 )
-            // InternalTableDSL.g:470:4: rule__TableColumn__Group__0
+            // InternalTableDSL.g:445:3: ( rule__TableColumn__Group__0 )
+            // InternalTableDSL.g:445:4: rule__TableColumn__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableColumn__Group__0();
@@ -1689,11 +1615,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableMeasure"
-    // InternalTableDSL.g:479:1: entryRuleTableMeasure : ruleTableMeasure EOF ;
+    // InternalTableDSL.g:454:1: entryRuleTableMeasure : ruleTableMeasure EOF ;
     public final void entryRuleTableMeasure() throws RecognitionException {
         try {
-            // InternalTableDSL.g:480:1: ( ruleTableMeasure EOF )
-            // InternalTableDSL.g:481:1: ruleTableMeasure EOF
+            // InternalTableDSL.g:455:1: ( ruleTableMeasure EOF )
+            // InternalTableDSL.g:456:1: ruleTableMeasure EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableMeasureRule()); 
@@ -1723,23 +1649,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableMeasure"
-    // InternalTableDSL.g:488:1: ruleTableMeasure : ( ( rule__TableMeasure__Group__0 ) ) ;
+    // InternalTableDSL.g:463:1: ruleTableMeasure : ( ( rule__TableMeasure__Group__0 ) ) ;
     public final void ruleTableMeasure() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:492:2: ( ( ( rule__TableMeasure__Group__0 ) ) )
-            // InternalTableDSL.g:493:2: ( ( rule__TableMeasure__Group__0 ) )
+            // InternalTableDSL.g:467:2: ( ( ( rule__TableMeasure__Group__0 ) ) )
+            // InternalTableDSL.g:468:2: ( ( rule__TableMeasure__Group__0 ) )
             {
-            // InternalTableDSL.g:493:2: ( ( rule__TableMeasure__Group__0 ) )
-            // InternalTableDSL.g:494:3: ( rule__TableMeasure__Group__0 )
+            // InternalTableDSL.g:468:2: ( ( rule__TableMeasure__Group__0 ) )
+            // InternalTableDSL.g:469:3: ( rule__TableMeasure__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableMeasureAccess().getGroup()); 
             }
-            // InternalTableDSL.g:495:3: ( rule__TableMeasure__Group__0 )
-            // InternalTableDSL.g:495:4: rule__TableMeasure__Group__0
+            // InternalTableDSL.g:470:3: ( rule__TableMeasure__Group__0 )
+            // InternalTableDSL.g:470:4: rule__TableMeasure__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableMeasure__Group__0();
@@ -1774,11 +1700,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableDerived"
-    // InternalTableDSL.g:504:1: entryRuleTableDerived : ruleTableDerived EOF ;
+    // InternalTableDSL.g:479:1: entryRuleTableDerived : ruleTableDerived EOF ;
     public final void entryRuleTableDerived() throws RecognitionException {
         try {
-            // InternalTableDSL.g:505:1: ( ruleTableDerived EOF )
-            // InternalTableDSL.g:506:1: ruleTableDerived EOF
+            // InternalTableDSL.g:480:1: ( ruleTableDerived EOF )
+            // InternalTableDSL.g:481:1: ruleTableDerived EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDerivedRule()); 
@@ -1808,23 +1734,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableDerived"
-    // InternalTableDSL.g:513:1: ruleTableDerived : ( ( rule__TableDerived__Group__0 ) ) ;
+    // InternalTableDSL.g:488:1: ruleTableDerived : ( ( rule__TableDerived__Group__0 ) ) ;
     public final void ruleTableDerived() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:517:2: ( ( ( rule__TableDerived__Group__0 ) ) )
-            // InternalTableDSL.g:518:2: ( ( rule__TableDerived__Group__0 ) )
+            // InternalTableDSL.g:492:2: ( ( ( rule__TableDerived__Group__0 ) ) )
+            // InternalTableDSL.g:493:2: ( ( rule__TableDerived__Group__0 ) )
             {
-            // InternalTableDSL.g:518:2: ( ( rule__TableDerived__Group__0 ) )
-            // InternalTableDSL.g:519:3: ( rule__TableDerived__Group__0 )
+            // InternalTableDSL.g:493:2: ( ( rule__TableDerived__Group__0 ) )
+            // InternalTableDSL.g:494:3: ( rule__TableDerived__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDerivedAccess().getGroup()); 
             }
-            // InternalTableDSL.g:520:3: ( rule__TableDerived__Group__0 )
-            // InternalTableDSL.g:520:4: rule__TableDerived__Group__0
+            // InternalTableDSL.g:495:3: ( rule__TableDerived__Group__0 )
+            // InternalTableDSL.g:495:4: rule__TableDerived__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableDerived__Group__0();
@@ -1859,11 +1785,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableHierarchy"
-    // InternalTableDSL.g:529:1: entryRuleTableHierarchy : ruleTableHierarchy EOF ;
+    // InternalTableDSL.g:504:1: entryRuleTableHierarchy : ruleTableHierarchy EOF ;
     public final void entryRuleTableHierarchy() throws RecognitionException {
         try {
-            // InternalTableDSL.g:530:1: ( ruleTableHierarchy EOF )
-            // InternalTableDSL.g:531:1: ruleTableHierarchy EOF
+            // InternalTableDSL.g:505:1: ( ruleTableHierarchy EOF )
+            // InternalTableDSL.g:506:1: ruleTableHierarchy EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableHierarchyRule()); 
@@ -1893,23 +1819,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableHierarchy"
-    // InternalTableDSL.g:538:1: ruleTableHierarchy : ( ( rule__TableHierarchy__Group__0 ) ) ;
+    // InternalTableDSL.g:513:1: ruleTableHierarchy : ( ( rule__TableHierarchy__Group__0 ) ) ;
     public final void ruleTableHierarchy() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:542:2: ( ( ( rule__TableHierarchy__Group__0 ) ) )
-            // InternalTableDSL.g:543:2: ( ( rule__TableHierarchy__Group__0 ) )
+            // InternalTableDSL.g:517:2: ( ( ( rule__TableHierarchy__Group__0 ) ) )
+            // InternalTableDSL.g:518:2: ( ( rule__TableHierarchy__Group__0 ) )
             {
-            // InternalTableDSL.g:543:2: ( ( rule__TableHierarchy__Group__0 ) )
-            // InternalTableDSL.g:544:3: ( rule__TableHierarchy__Group__0 )
+            // InternalTableDSL.g:518:2: ( ( rule__TableHierarchy__Group__0 ) )
+            // InternalTableDSL.g:519:3: ( rule__TableHierarchy__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableHierarchyAccess().getGroup()); 
             }
-            // InternalTableDSL.g:545:3: ( rule__TableHierarchy__Group__0 )
-            // InternalTableDSL.g:545:4: rule__TableHierarchy__Group__0
+            // InternalTableDSL.g:520:3: ( rule__TableHierarchy__Group__0 )
+            // InternalTableDSL.g:520:4: rule__TableHierarchy__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableHierarchy__Group__0();
@@ -1944,11 +1870,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableAttribute"
-    // InternalTableDSL.g:554:1: entryRuleTableAttribute : ruleTableAttribute EOF ;
+    // InternalTableDSL.g:529:1: entryRuleTableAttribute : ruleTableAttribute EOF ;
     public final void entryRuleTableAttribute() throws RecognitionException {
         try {
-            // InternalTableDSL.g:555:1: ( ruleTableAttribute EOF )
-            // InternalTableDSL.g:556:1: ruleTableAttribute EOF
+            // InternalTableDSL.g:530:1: ( ruleTableAttribute EOF )
+            // InternalTableDSL.g:531:1: ruleTableAttribute EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAttributeRule()); 
@@ -1978,23 +1904,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableAttribute"
-    // InternalTableDSL.g:563:1: ruleTableAttribute : ( ( rule__TableAttribute__Group__0 ) ) ;
+    // InternalTableDSL.g:538:1: ruleTableAttribute : ( ( rule__TableAttribute__Group__0 ) ) ;
     public final void ruleTableAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:567:2: ( ( ( rule__TableAttribute__Group__0 ) ) )
-            // InternalTableDSL.g:568:2: ( ( rule__TableAttribute__Group__0 ) )
+            // InternalTableDSL.g:542:2: ( ( ( rule__TableAttribute__Group__0 ) ) )
+            // InternalTableDSL.g:543:2: ( ( rule__TableAttribute__Group__0 ) )
             {
-            // InternalTableDSL.g:568:2: ( ( rule__TableAttribute__Group__0 ) )
-            // InternalTableDSL.g:569:3: ( rule__TableAttribute__Group__0 )
+            // InternalTableDSL.g:543:2: ( ( rule__TableAttribute__Group__0 ) )
+            // InternalTableDSL.g:544:3: ( rule__TableAttribute__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAttributeAccess().getGroup()); 
             }
-            // InternalTableDSL.g:570:3: ( rule__TableAttribute__Group__0 )
-            // InternalTableDSL.g:570:4: rule__TableAttribute__Group__0
+            // InternalTableDSL.g:545:3: ( rule__TableAttribute__Group__0 )
+            // InternalTableDSL.g:545:4: rule__TableAttribute__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableAttribute__Group__0();
@@ -2029,11 +1955,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableAggregation"
-    // InternalTableDSL.g:579:1: entryRuleTableAggregation : ruleTableAggregation EOF ;
+    // InternalTableDSL.g:554:1: entryRuleTableAggregation : ruleTableAggregation EOF ;
     public final void entryRuleTableAggregation() throws RecognitionException {
         try {
-            // InternalTableDSL.g:580:1: ( ruleTableAggregation EOF )
-            // InternalTableDSL.g:581:1: ruleTableAggregation EOF
+            // InternalTableDSL.g:555:1: ( ruleTableAggregation EOF )
+            // InternalTableDSL.g:556:1: ruleTableAggregation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAggregationRule()); 
@@ -2063,23 +1989,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableAggregation"
-    // InternalTableDSL.g:588:1: ruleTableAggregation : ( ( rule__TableAggregation__Group__0 ) ) ;
+    // InternalTableDSL.g:563:1: ruleTableAggregation : ( ( rule__TableAggregation__Group__0 ) ) ;
     public final void ruleTableAggregation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:592:2: ( ( ( rule__TableAggregation__Group__0 ) ) )
-            // InternalTableDSL.g:593:2: ( ( rule__TableAggregation__Group__0 ) )
+            // InternalTableDSL.g:567:2: ( ( ( rule__TableAggregation__Group__0 ) ) )
+            // InternalTableDSL.g:568:2: ( ( rule__TableAggregation__Group__0 ) )
             {
-            // InternalTableDSL.g:593:2: ( ( rule__TableAggregation__Group__0 ) )
-            // InternalTableDSL.g:594:3: ( rule__TableAggregation__Group__0 )
+            // InternalTableDSL.g:568:2: ( ( rule__TableAggregation__Group__0 ) )
+            // InternalTableDSL.g:569:3: ( rule__TableAggregation__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAggregationAccess().getGroup()); 
             }
-            // InternalTableDSL.g:595:3: ( rule__TableAggregation__Group__0 )
-            // InternalTableDSL.g:595:4: rule__TableAggregation__Group__0
+            // InternalTableDSL.g:570:3: ( rule__TableAggregation__Group__0 )
+            // InternalTableDSL.g:570:4: rule__TableAggregation__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableAggregation__Group__0();
@@ -2114,11 +2040,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableInterval"
-    // InternalTableDSL.g:604:1: entryRuleTableInterval : ruleTableInterval EOF ;
+    // InternalTableDSL.g:579:1: entryRuleTableInterval : ruleTableInterval EOF ;
     public final void entryRuleTableInterval() throws RecognitionException {
         try {
-            // InternalTableDSL.g:605:1: ( ruleTableInterval EOF )
-            // InternalTableDSL.g:606:1: ruleTableInterval EOF
+            // InternalTableDSL.g:580:1: ( ruleTableInterval EOF )
+            // InternalTableDSL.g:581:1: ruleTableInterval EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntervalRule()); 
@@ -2148,23 +2074,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableInterval"
-    // InternalTableDSL.g:613:1: ruleTableInterval : ( ( rule__TableInterval__Alternatives ) ) ;
+    // InternalTableDSL.g:588:1: ruleTableInterval : ( ( rule__TableInterval__Alternatives ) ) ;
     public final void ruleTableInterval() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:617:2: ( ( ( rule__TableInterval__Alternatives ) ) )
-            // InternalTableDSL.g:618:2: ( ( rule__TableInterval__Alternatives ) )
+            // InternalTableDSL.g:592:2: ( ( ( rule__TableInterval__Alternatives ) ) )
+            // InternalTableDSL.g:593:2: ( ( rule__TableInterval__Alternatives ) )
             {
-            // InternalTableDSL.g:618:2: ( ( rule__TableInterval__Alternatives ) )
-            // InternalTableDSL.g:619:3: ( rule__TableInterval__Alternatives )
+            // InternalTableDSL.g:593:2: ( ( rule__TableInterval__Alternatives ) )
+            // InternalTableDSL.g:594:3: ( rule__TableInterval__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntervalAccess().getAlternatives()); 
             }
-            // InternalTableDSL.g:620:3: ( rule__TableInterval__Alternatives )
-            // InternalTableDSL.g:620:4: rule__TableInterval__Alternatives
+            // InternalTableDSL.g:595:3: ( rule__TableInterval__Alternatives )
+            // InternalTableDSL.g:595:4: rule__TableInterval__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__TableInterval__Alternatives();
@@ -2199,11 +2125,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableNumberInterval"
-    // InternalTableDSL.g:629:1: entryRuleTableNumberInterval : ruleTableNumberInterval EOF ;
+    // InternalTableDSL.g:604:1: entryRuleTableNumberInterval : ruleTableNumberInterval EOF ;
     public final void entryRuleTableNumberInterval() throws RecognitionException {
         try {
-            // InternalTableDSL.g:630:1: ( ruleTableNumberInterval EOF )
-            // InternalTableDSL.g:631:1: ruleTableNumberInterval EOF
+            // InternalTableDSL.g:605:1: ( ruleTableNumberInterval EOF )
+            // InternalTableDSL.g:606:1: ruleTableNumberInterval EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberIntervalRule()); 
@@ -2233,23 +2159,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableNumberInterval"
-    // InternalTableDSL.g:638:1: ruleTableNumberInterval : ( ( rule__TableNumberInterval__Group__0 ) ) ;
+    // InternalTableDSL.g:613:1: ruleTableNumberInterval : ( ( rule__TableNumberInterval__Group__0 ) ) ;
     public final void ruleTableNumberInterval() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:642:2: ( ( ( rule__TableNumberInterval__Group__0 ) ) )
-            // InternalTableDSL.g:643:2: ( ( rule__TableNumberInterval__Group__0 ) )
+            // InternalTableDSL.g:617:2: ( ( ( rule__TableNumberInterval__Group__0 ) ) )
+            // InternalTableDSL.g:618:2: ( ( rule__TableNumberInterval__Group__0 ) )
             {
-            // InternalTableDSL.g:643:2: ( ( rule__TableNumberInterval__Group__0 ) )
-            // InternalTableDSL.g:644:3: ( rule__TableNumberInterval__Group__0 )
+            // InternalTableDSL.g:618:2: ( ( rule__TableNumberInterval__Group__0 ) )
+            // InternalTableDSL.g:619:3: ( rule__TableNumberInterval__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberIntervalAccess().getGroup()); 
             }
-            // InternalTableDSL.g:645:3: ( rule__TableNumberInterval__Group__0 )
-            // InternalTableDSL.g:645:4: rule__TableNumberInterval__Group__0
+            // InternalTableDSL.g:620:3: ( rule__TableNumberInterval__Group__0 )
+            // InternalTableDSL.g:620:4: rule__TableNumberInterval__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableNumberInterval__Group__0();
@@ -2284,11 +2210,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableIntInterval"
-    // InternalTableDSL.g:654:1: entryRuleTableIntInterval : ruleTableIntInterval EOF ;
+    // InternalTableDSL.g:629:1: entryRuleTableIntInterval : ruleTableIntInterval EOF ;
     public final void entryRuleTableIntInterval() throws RecognitionException {
         try {
-            // InternalTableDSL.g:655:1: ( ruleTableIntInterval EOF )
-            // InternalTableDSL.g:656:1: ruleTableIntInterval EOF
+            // InternalTableDSL.g:630:1: ( ruleTableIntInterval EOF )
+            // InternalTableDSL.g:631:1: ruleTableIntInterval EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntIntervalRule()); 
@@ -2318,23 +2244,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableIntInterval"
-    // InternalTableDSL.g:663:1: ruleTableIntInterval : ( ( rule__TableIntInterval__Group__0 ) ) ;
+    // InternalTableDSL.g:638:1: ruleTableIntInterval : ( ( rule__TableIntInterval__Group__0 ) ) ;
     public final void ruleTableIntInterval() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:667:2: ( ( ( rule__TableIntInterval__Group__0 ) ) )
-            // InternalTableDSL.g:668:2: ( ( rule__TableIntInterval__Group__0 ) )
+            // InternalTableDSL.g:642:2: ( ( ( rule__TableIntInterval__Group__0 ) ) )
+            // InternalTableDSL.g:643:2: ( ( rule__TableIntInterval__Group__0 ) )
             {
-            // InternalTableDSL.g:668:2: ( ( rule__TableIntInterval__Group__0 ) )
-            // InternalTableDSL.g:669:3: ( rule__TableIntInterval__Group__0 )
+            // InternalTableDSL.g:643:2: ( ( rule__TableIntInterval__Group__0 ) )
+            // InternalTableDSL.g:644:3: ( rule__TableIntInterval__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntIntervalAccess().getGroup()); 
             }
-            // InternalTableDSL.g:670:3: ( rule__TableIntInterval__Group__0 )
-            // InternalTableDSL.g:670:4: rule__TableIntInterval__Group__0
+            // InternalTableDSL.g:645:3: ( rule__TableIntInterval__Group__0 )
+            // InternalTableDSL.g:645:4: rule__TableIntInterval__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableIntInterval__Group__0();
@@ -2369,11 +2295,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableDateDayInterval"
-    // InternalTableDSL.g:679:1: entryRuleTableDateDayInterval : ruleTableDateDayInterval EOF ;
+    // InternalTableDSL.g:654:1: entryRuleTableDateDayInterval : ruleTableDateDayInterval EOF ;
     public final void entryRuleTableDateDayInterval() throws RecognitionException {
         try {
-            // InternalTableDSL.g:680:1: ( ruleTableDateDayInterval EOF )
-            // InternalTableDSL.g:681:1: ruleTableDateDayInterval EOF
+            // InternalTableDSL.g:655:1: ( ruleTableDateDayInterval EOF )
+            // InternalTableDSL.g:656:1: ruleTableDateDayInterval EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayIntervalRule()); 
@@ -2403,23 +2329,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableDateDayInterval"
-    // InternalTableDSL.g:688:1: ruleTableDateDayInterval : ( ( rule__TableDateDayInterval__Group__0 ) ) ;
+    // InternalTableDSL.g:663:1: ruleTableDateDayInterval : ( ( rule__TableDateDayInterval__Group__0 ) ) ;
     public final void ruleTableDateDayInterval() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:692:2: ( ( ( rule__TableDateDayInterval__Group__0 ) ) )
-            // InternalTableDSL.g:693:2: ( ( rule__TableDateDayInterval__Group__0 ) )
+            // InternalTableDSL.g:667:2: ( ( ( rule__TableDateDayInterval__Group__0 ) ) )
+            // InternalTableDSL.g:668:2: ( ( rule__TableDateDayInterval__Group__0 ) )
             {
-            // InternalTableDSL.g:693:2: ( ( rule__TableDateDayInterval__Group__0 ) )
-            // InternalTableDSL.g:694:3: ( rule__TableDateDayInterval__Group__0 )
+            // InternalTableDSL.g:668:2: ( ( rule__TableDateDayInterval__Group__0 ) )
+            // InternalTableDSL.g:669:3: ( rule__TableDateDayInterval__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayIntervalAccess().getGroup()); 
             }
-            // InternalTableDSL.g:695:3: ( rule__TableDateDayInterval__Group__0 )
-            // InternalTableDSL.g:695:4: rule__TableDateDayInterval__Group__0
+            // InternalTableDSL.g:670:3: ( rule__TableDateDayInterval__Group__0 )
+            // InternalTableDSL.g:670:4: rule__TableDateDayInterval__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableDateDayInterval__Group__0();
@@ -2454,11 +2380,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableLookup"
-    // InternalTableDSL.g:704:1: entryRuleTableLookup : ruleTableLookup EOF ;
+    // InternalTableDSL.g:679:1: entryRuleTableLookup : ruleTableLookup EOF ;
     public final void entryRuleTableLookup() throws RecognitionException {
         try {
-            // InternalTableDSL.g:705:1: ( ruleTableLookup EOF )
-            // InternalTableDSL.g:706:1: ruleTableLookup EOF
+            // InternalTableDSL.g:680:1: ( ruleTableLookup EOF )
+            // InternalTableDSL.g:681:1: ruleTableLookup EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableLookupRule()); 
@@ -2488,23 +2414,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableLookup"
-    // InternalTableDSL.g:713:1: ruleTableLookup : ( ( rule__TableLookup__Alternatives ) ) ;
+    // InternalTableDSL.g:688:1: ruleTableLookup : ( ( rule__TableLookup__Alternatives ) ) ;
     public final void ruleTableLookup() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:717:2: ( ( ( rule__TableLookup__Alternatives ) ) )
-            // InternalTableDSL.g:718:2: ( ( rule__TableLookup__Alternatives ) )
+            // InternalTableDSL.g:692:2: ( ( ( rule__TableLookup__Alternatives ) ) )
+            // InternalTableDSL.g:693:2: ( ( rule__TableLookup__Alternatives ) )
             {
-            // InternalTableDSL.g:718:2: ( ( rule__TableLookup__Alternatives ) )
-            // InternalTableDSL.g:719:3: ( rule__TableLookup__Alternatives )
+            // InternalTableDSL.g:693:2: ( ( rule__TableLookup__Alternatives ) )
+            // InternalTableDSL.g:694:3: ( rule__TableLookup__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableLookupAccess().getAlternatives()); 
             }
-            // InternalTableDSL.g:720:3: ( rule__TableLookup__Alternatives )
-            // InternalTableDSL.g:720:4: rule__TableLookup__Alternatives
+            // InternalTableDSL.g:695:3: ( rule__TableLookup__Alternatives )
+            // InternalTableDSL.g:695:4: rule__TableLookup__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__TableLookup__Alternatives();
@@ -2539,11 +2465,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableIntLookup"
-    // InternalTableDSL.g:729:1: entryRuleTableIntLookup : ruleTableIntLookup EOF ;
+    // InternalTableDSL.g:704:1: entryRuleTableIntLookup : ruleTableIntLookup EOF ;
     public final void entryRuleTableIntLookup() throws RecognitionException {
         try {
-            // InternalTableDSL.g:730:1: ( ruleTableIntLookup EOF )
-            // InternalTableDSL.g:731:1: ruleTableIntLookup EOF
+            // InternalTableDSL.g:705:1: ( ruleTableIntLookup EOF )
+            // InternalTableDSL.g:706:1: ruleTableIntLookup EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntLookupRule()); 
@@ -2573,23 +2499,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableIntLookup"
-    // InternalTableDSL.g:738:1: ruleTableIntLookup : ( ( rule__TableIntLookup__Group__0 ) ) ;
+    // InternalTableDSL.g:713:1: ruleTableIntLookup : ( ( rule__TableIntLookup__Group__0 ) ) ;
     public final void ruleTableIntLookup() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:742:2: ( ( ( rule__TableIntLookup__Group__0 ) ) )
-            // InternalTableDSL.g:743:2: ( ( rule__TableIntLookup__Group__0 ) )
+            // InternalTableDSL.g:717:2: ( ( ( rule__TableIntLookup__Group__0 ) ) )
+            // InternalTableDSL.g:718:2: ( ( rule__TableIntLookup__Group__0 ) )
             {
-            // InternalTableDSL.g:743:2: ( ( rule__TableIntLookup__Group__0 ) )
-            // InternalTableDSL.g:744:3: ( rule__TableIntLookup__Group__0 )
+            // InternalTableDSL.g:718:2: ( ( rule__TableIntLookup__Group__0 ) )
+            // InternalTableDSL.g:719:3: ( rule__TableIntLookup__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntLookupAccess().getGroup()); 
             }
-            // InternalTableDSL.g:745:3: ( rule__TableIntLookup__Group__0 )
-            // InternalTableDSL.g:745:4: rule__TableIntLookup__Group__0
+            // InternalTableDSL.g:720:3: ( rule__TableIntLookup__Group__0 )
+            // InternalTableDSL.g:720:4: rule__TableIntLookup__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableIntLookup__Group__0();
@@ -2624,11 +2550,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableNumberLookup"
-    // InternalTableDSL.g:754:1: entryRuleTableNumberLookup : ruleTableNumberLookup EOF ;
+    // InternalTableDSL.g:729:1: entryRuleTableNumberLookup : ruleTableNumberLookup EOF ;
     public final void entryRuleTableNumberLookup() throws RecognitionException {
         try {
-            // InternalTableDSL.g:755:1: ( ruleTableNumberLookup EOF )
-            // InternalTableDSL.g:756:1: ruleTableNumberLookup EOF
+            // InternalTableDSL.g:730:1: ( ruleTableNumberLookup EOF )
+            // InternalTableDSL.g:731:1: ruleTableNumberLookup EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberLookupRule()); 
@@ -2658,23 +2584,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableNumberLookup"
-    // InternalTableDSL.g:763:1: ruleTableNumberLookup : ( ( rule__TableNumberLookup__Group__0 ) ) ;
+    // InternalTableDSL.g:738:1: ruleTableNumberLookup : ( ( rule__TableNumberLookup__Group__0 ) ) ;
     public final void ruleTableNumberLookup() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:767:2: ( ( ( rule__TableNumberLookup__Group__0 ) ) )
-            // InternalTableDSL.g:768:2: ( ( rule__TableNumberLookup__Group__0 ) )
+            // InternalTableDSL.g:742:2: ( ( ( rule__TableNumberLookup__Group__0 ) ) )
+            // InternalTableDSL.g:743:2: ( ( rule__TableNumberLookup__Group__0 ) )
             {
-            // InternalTableDSL.g:768:2: ( ( rule__TableNumberLookup__Group__0 ) )
-            // InternalTableDSL.g:769:3: ( rule__TableNumberLookup__Group__0 )
+            // InternalTableDSL.g:743:2: ( ( rule__TableNumberLookup__Group__0 ) )
+            // InternalTableDSL.g:744:3: ( rule__TableNumberLookup__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberLookupAccess().getGroup()); 
             }
-            // InternalTableDSL.g:770:3: ( rule__TableNumberLookup__Group__0 )
-            // InternalTableDSL.g:770:4: rule__TableNumberLookup__Group__0
+            // InternalTableDSL.g:745:3: ( rule__TableNumberLookup__Group__0 )
+            // InternalTableDSL.g:745:4: rule__TableNumberLookup__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableNumberLookup__Group__0();
@@ -2709,11 +2635,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableStringLookup"
-    // InternalTableDSL.g:779:1: entryRuleTableStringLookup : ruleTableStringLookup EOF ;
+    // InternalTableDSL.g:754:1: entryRuleTableStringLookup : ruleTableStringLookup EOF ;
     public final void entryRuleTableStringLookup() throws RecognitionException {
         try {
-            // InternalTableDSL.g:780:1: ( ruleTableStringLookup EOF )
-            // InternalTableDSL.g:781:1: ruleTableStringLookup EOF
+            // InternalTableDSL.g:755:1: ( ruleTableStringLookup EOF )
+            // InternalTableDSL.g:756:1: ruleTableStringLookup EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableStringLookupRule()); 
@@ -2743,23 +2669,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableStringLookup"
-    // InternalTableDSL.g:788:1: ruleTableStringLookup : ( ( rule__TableStringLookup__Group__0 ) ) ;
+    // InternalTableDSL.g:763:1: ruleTableStringLookup : ( ( rule__TableStringLookup__Group__0 ) ) ;
     public final void ruleTableStringLookup() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:792:2: ( ( ( rule__TableStringLookup__Group__0 ) ) )
-            // InternalTableDSL.g:793:2: ( ( rule__TableStringLookup__Group__0 ) )
+            // InternalTableDSL.g:767:2: ( ( ( rule__TableStringLookup__Group__0 ) ) )
+            // InternalTableDSL.g:768:2: ( ( rule__TableStringLookup__Group__0 ) )
             {
-            // InternalTableDSL.g:793:2: ( ( rule__TableStringLookup__Group__0 ) )
-            // InternalTableDSL.g:794:3: ( rule__TableStringLookup__Group__0 )
+            // InternalTableDSL.g:768:2: ( ( rule__TableStringLookup__Group__0 ) )
+            // InternalTableDSL.g:769:3: ( rule__TableStringLookup__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableStringLookupAccess().getGroup()); 
             }
-            // InternalTableDSL.g:795:3: ( rule__TableStringLookup__Group__0 )
-            // InternalTableDSL.g:795:4: rule__TableStringLookup__Group__0
+            // InternalTableDSL.g:770:3: ( rule__TableStringLookup__Group__0 )
+            // InternalTableDSL.g:770:4: rule__TableStringLookup__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableStringLookup__Group__0();
@@ -2794,11 +2720,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableDateDayLookup"
-    // InternalTableDSL.g:804:1: entryRuleTableDateDayLookup : ruleTableDateDayLookup EOF ;
+    // InternalTableDSL.g:779:1: entryRuleTableDateDayLookup : ruleTableDateDayLookup EOF ;
     public final void entryRuleTableDateDayLookup() throws RecognitionException {
         try {
-            // InternalTableDSL.g:805:1: ( ruleTableDateDayLookup EOF )
-            // InternalTableDSL.g:806:1: ruleTableDateDayLookup EOF
+            // InternalTableDSL.g:780:1: ( ruleTableDateDayLookup EOF )
+            // InternalTableDSL.g:781:1: ruleTableDateDayLookup EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayLookupRule()); 
@@ -2828,23 +2754,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableDateDayLookup"
-    // InternalTableDSL.g:813:1: ruleTableDateDayLookup : ( ( rule__TableDateDayLookup__Group__0 ) ) ;
+    // InternalTableDSL.g:788:1: ruleTableDateDayLookup : ( ( rule__TableDateDayLookup__Group__0 ) ) ;
     public final void ruleTableDateDayLookup() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:817:2: ( ( ( rule__TableDateDayLookup__Group__0 ) ) )
-            // InternalTableDSL.g:818:2: ( ( rule__TableDateDayLookup__Group__0 ) )
+            // InternalTableDSL.g:792:2: ( ( ( rule__TableDateDayLookup__Group__0 ) ) )
+            // InternalTableDSL.g:793:2: ( ( rule__TableDateDayLookup__Group__0 ) )
             {
-            // InternalTableDSL.g:818:2: ( ( rule__TableDateDayLookup__Group__0 ) )
-            // InternalTableDSL.g:819:3: ( rule__TableDateDayLookup__Group__0 )
+            // InternalTableDSL.g:793:2: ( ( rule__TableDateDayLookup__Group__0 ) )
+            // InternalTableDSL.g:794:3: ( rule__TableDateDayLookup__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayLookupAccess().getGroup()); 
             }
-            // InternalTableDSL.g:820:3: ( rule__TableDateDayLookup__Group__0 )
-            // InternalTableDSL.g:820:4: rule__TableDateDayLookup__Group__0
+            // InternalTableDSL.g:795:3: ( rule__TableDateDayLookup__Group__0 )
+            // InternalTableDSL.g:795:4: rule__TableDateDayLookup__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableDateDayLookup__Group__0();
@@ -2879,11 +2805,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableDatamart"
-    // InternalTableDSL.g:829:1: entryRuleTableDatamart : ruleTableDatamart EOF ;
+    // InternalTableDSL.g:804:1: entryRuleTableDatamart : ruleTableDatamart EOF ;
     public final void entryRuleTableDatamart() throws RecognitionException {
         try {
-            // InternalTableDSL.g:830:1: ( ruleTableDatamart EOF )
-            // InternalTableDSL.g:831:1: ruleTableDatamart EOF
+            // InternalTableDSL.g:805:1: ( ruleTableDatamart EOF )
+            // InternalTableDSL.g:806:1: ruleTableDatamart EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDatamartRule()); 
@@ -2913,23 +2839,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableDatamart"
-    // InternalTableDSL.g:838:1: ruleTableDatamart : ( ( rule__TableDatamart__Group__0 ) ) ;
+    // InternalTableDSL.g:813:1: ruleTableDatamart : ( ( rule__TableDatamart__Group__0 ) ) ;
     public final void ruleTableDatamart() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:842:2: ( ( ( rule__TableDatamart__Group__0 ) ) )
-            // InternalTableDSL.g:843:2: ( ( rule__TableDatamart__Group__0 ) )
+            // InternalTableDSL.g:817:2: ( ( ( rule__TableDatamart__Group__0 ) ) )
+            // InternalTableDSL.g:818:2: ( ( rule__TableDatamart__Group__0 ) )
             {
-            // InternalTableDSL.g:843:2: ( ( rule__TableDatamart__Group__0 ) )
-            // InternalTableDSL.g:844:3: ( rule__TableDatamart__Group__0 )
+            // InternalTableDSL.g:818:2: ( ( rule__TableDatamart__Group__0 ) )
+            // InternalTableDSL.g:819:3: ( rule__TableDatamart__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDatamartAccess().getGroup()); 
             }
-            // InternalTableDSL.g:845:3: ( rule__TableDatamart__Group__0 )
-            // InternalTableDSL.g:845:4: rule__TableDatamart__Group__0
+            // InternalTableDSL.g:820:3: ( rule__TableDatamart__Group__0 )
+            // InternalTableDSL.g:820:4: rule__TableDatamart__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableDatamart__Group__0();
@@ -2964,11 +2890,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableElement"
-    // InternalTableDSL.g:854:1: entryRuleTableElement : ruleTableElement EOF ;
+    // InternalTableDSL.g:829:1: entryRuleTableElement : ruleTableElement EOF ;
     public final void entryRuleTableElement() throws RecognitionException {
         try {
-            // InternalTableDSL.g:855:1: ( ruleTableElement EOF )
-            // InternalTableDSL.g:856:1: ruleTableElement EOF
+            // InternalTableDSL.g:830:1: ( ruleTableElement EOF )
+            // InternalTableDSL.g:831:1: ruleTableElement EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableElementRule()); 
@@ -2998,17 +2924,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableElement"
-    // InternalTableDSL.g:863:1: ruleTableElement : ( ruleTableAxis ) ;
+    // InternalTableDSL.g:838:1: ruleTableElement : ( ruleTableAxis ) ;
     public final void ruleTableElement() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:867:2: ( ( ruleTableAxis ) )
-            // InternalTableDSL.g:868:2: ( ruleTableAxis )
+            // InternalTableDSL.g:842:2: ( ( ruleTableAxis ) )
+            // InternalTableDSL.g:843:2: ( ruleTableAxis )
             {
-            // InternalTableDSL.g:868:2: ( ruleTableAxis )
-            // InternalTableDSL.g:869:3: ruleTableAxis
+            // InternalTableDSL.g:843:2: ( ruleTableAxis )
+            // InternalTableDSL.g:844:3: ruleTableAxis
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableElementAccess().getTableAxisParserRuleCall()); 
@@ -3043,11 +2969,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableEvent"
-    // InternalTableDSL.g:879:1: entryRuleTableEvent : ruleTableEvent EOF ;
+    // InternalTableDSL.g:854:1: entryRuleTableEvent : ruleTableEvent EOF ;
     public final void entryRuleTableEvent() throws RecognitionException {
         try {
-            // InternalTableDSL.g:880:1: ( ruleTableEvent EOF )
-            // InternalTableDSL.g:881:1: ruleTableEvent EOF
+            // InternalTableDSL.g:855:1: ( ruleTableEvent EOF )
+            // InternalTableDSL.g:856:1: ruleTableEvent EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableEventRule()); 
@@ -3077,23 +3003,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableEvent"
-    // InternalTableDSL.g:888:1: ruleTableEvent : ( ( rule__TableEvent__SourceAssignment ) ) ;
+    // InternalTableDSL.g:863:1: ruleTableEvent : ( ( rule__TableEvent__SourceAssignment ) ) ;
     public final void ruleTableEvent() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:892:2: ( ( ( rule__TableEvent__SourceAssignment ) ) )
-            // InternalTableDSL.g:893:2: ( ( rule__TableEvent__SourceAssignment ) )
+            // InternalTableDSL.g:867:2: ( ( ( rule__TableEvent__SourceAssignment ) ) )
+            // InternalTableDSL.g:868:2: ( ( rule__TableEvent__SourceAssignment ) )
             {
-            // InternalTableDSL.g:893:2: ( ( rule__TableEvent__SourceAssignment ) )
-            // InternalTableDSL.g:894:3: ( rule__TableEvent__SourceAssignment )
+            // InternalTableDSL.g:868:2: ( ( rule__TableEvent__SourceAssignment ) )
+            // InternalTableDSL.g:869:3: ( rule__TableEvent__SourceAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableEventAccess().getSourceAssignment()); 
             }
-            // InternalTableDSL.g:895:3: ( rule__TableEvent__SourceAssignment )
-            // InternalTableDSL.g:895:4: rule__TableEvent__SourceAssignment
+            // InternalTableDSL.g:870:3: ( rule__TableEvent__SourceAssignment )
+            // InternalTableDSL.g:870:4: rule__TableEvent__SourceAssignment
             {
             pushFollow(FOLLOW_2);
             rule__TableEvent__SourceAssignment();
@@ -3128,11 +3054,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableAxis"
-    // InternalTableDSL.g:904:1: entryRuleTableAxis : ruleTableAxis EOF ;
+    // InternalTableDSL.g:879:1: entryRuleTableAxis : ruleTableAxis EOF ;
     public final void entryRuleTableAxis() throws RecognitionException {
         try {
-            // InternalTableDSL.g:905:1: ( ruleTableAxis EOF )
-            // InternalTableDSL.g:906:1: ruleTableAxis EOF
+            // InternalTableDSL.g:880:1: ( ruleTableAxis EOF )
+            // InternalTableDSL.g:881:1: ruleTableAxis EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisRule()); 
@@ -3162,23 +3088,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableAxis"
-    // InternalTableDSL.g:913:1: ruleTableAxis : ( ( rule__TableAxis__Group__0 ) ) ;
+    // InternalTableDSL.g:888:1: ruleTableAxis : ( ( rule__TableAxis__Group__0 ) ) ;
     public final void ruleTableAxis() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:917:2: ( ( ( rule__TableAxis__Group__0 ) ) )
-            // InternalTableDSL.g:918:2: ( ( rule__TableAxis__Group__0 ) )
+            // InternalTableDSL.g:892:2: ( ( ( rule__TableAxis__Group__0 ) ) )
+            // InternalTableDSL.g:893:2: ( ( rule__TableAxis__Group__0 ) )
             {
-            // InternalTableDSL.g:918:2: ( ( rule__TableAxis__Group__0 ) )
-            // InternalTableDSL.g:919:3: ( rule__TableAxis__Group__0 )
+            // InternalTableDSL.g:893:2: ( ( rule__TableAxis__Group__0 ) )
+            // InternalTableDSL.g:894:3: ( rule__TableAxis__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getGroup()); 
             }
-            // InternalTableDSL.g:920:3: ( rule__TableAxis__Group__0 )
-            // InternalTableDSL.g:920:4: rule__TableAxis__Group__0
+            // InternalTableDSL.g:895:3: ( rule__TableAxis__Group__0 )
+            // InternalTableDSL.g:895:4: rule__TableAxis__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableAxis__Group__0();
@@ -3213,11 +3139,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableRangeElement"
-    // InternalTableDSL.g:929:1: entryRuleTableRangeElement : ruleTableRangeElement EOF ;
+    // InternalTableDSL.g:904:1: entryRuleTableRangeElement : ruleTableRangeElement EOF ;
     public final void entryRuleTableRangeElement() throws RecognitionException {
         try {
-            // InternalTableDSL.g:930:1: ( ruleTableRangeElement EOF )
-            // InternalTableDSL.g:931:1: ruleTableRangeElement EOF
+            // InternalTableDSL.g:905:1: ( ruleTableRangeElement EOF )
+            // InternalTableDSL.g:906:1: ruleTableRangeElement EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableRangeElementRule()); 
@@ -3247,23 +3173,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableRangeElement"
-    // InternalTableDSL.g:938:1: ruleTableRangeElement : ( ( rule__TableRangeElement__Alternatives ) ) ;
+    // InternalTableDSL.g:913:1: ruleTableRangeElement : ( ( rule__TableRangeElement__Alternatives ) ) ;
     public final void ruleTableRangeElement() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:942:2: ( ( ( rule__TableRangeElement__Alternatives ) ) )
-            // InternalTableDSL.g:943:2: ( ( rule__TableRangeElement__Alternatives ) )
+            // InternalTableDSL.g:917:2: ( ( ( rule__TableRangeElement__Alternatives ) ) )
+            // InternalTableDSL.g:918:2: ( ( rule__TableRangeElement__Alternatives ) )
             {
-            // InternalTableDSL.g:943:2: ( ( rule__TableRangeElement__Alternatives ) )
-            // InternalTableDSL.g:944:3: ( rule__TableRangeElement__Alternatives )
+            // InternalTableDSL.g:918:2: ( ( rule__TableRangeElement__Alternatives ) )
+            // InternalTableDSL.g:919:3: ( rule__TableRangeElement__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableRangeElementAccess().getAlternatives()); 
             }
-            // InternalTableDSL.g:945:3: ( rule__TableRangeElement__Alternatives )
-            // InternalTableDSL.g:945:4: rule__TableRangeElement__Alternatives
+            // InternalTableDSL.g:920:3: ( rule__TableRangeElement__Alternatives )
+            // InternalTableDSL.g:920:4: rule__TableRangeElement__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__TableRangeElement__Alternatives();
@@ -3298,11 +3224,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableTextColor"
-    // InternalTableDSL.g:954:1: entryRuleTableTextColor : ruleTableTextColor EOF ;
+    // InternalTableDSL.g:929:1: entryRuleTableTextColor : ruleTableTextColor EOF ;
     public final void entryRuleTableTextColor() throws RecognitionException {
         try {
-            // InternalTableDSL.g:955:1: ( ruleTableTextColor EOF )
-            // InternalTableDSL.g:956:1: ruleTableTextColor EOF
+            // InternalTableDSL.g:930:1: ( ruleTableTextColor EOF )
+            // InternalTableDSL.g:931:1: ruleTableTextColor EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTextColorRule()); 
@@ -3332,23 +3258,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableTextColor"
-    // InternalTableDSL.g:963:1: ruleTableTextColor : ( ( rule__TableTextColor__Group__0 ) ) ;
+    // InternalTableDSL.g:938:1: ruleTableTextColor : ( ( rule__TableTextColor__Group__0 ) ) ;
     public final void ruleTableTextColor() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:967:2: ( ( ( rule__TableTextColor__Group__0 ) ) )
-            // InternalTableDSL.g:968:2: ( ( rule__TableTextColor__Group__0 ) )
+            // InternalTableDSL.g:942:2: ( ( ( rule__TableTextColor__Group__0 ) ) )
+            // InternalTableDSL.g:943:2: ( ( rule__TableTextColor__Group__0 ) )
             {
-            // InternalTableDSL.g:968:2: ( ( rule__TableTextColor__Group__0 ) )
-            // InternalTableDSL.g:969:3: ( rule__TableTextColor__Group__0 )
+            // InternalTableDSL.g:943:2: ( ( rule__TableTextColor__Group__0 ) )
+            // InternalTableDSL.g:944:3: ( rule__TableTextColor__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTextColorAccess().getGroup()); 
             }
-            // InternalTableDSL.g:970:3: ( rule__TableTextColor__Group__0 )
-            // InternalTableDSL.g:970:4: rule__TableTextColor__Group__0
+            // InternalTableDSL.g:945:3: ( rule__TableTextColor__Group__0 )
+            // InternalTableDSL.g:945:4: rule__TableTextColor__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableTextColor__Group__0();
@@ -3383,11 +3309,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableCellColor"
-    // InternalTableDSL.g:979:1: entryRuleTableCellColor : ruleTableCellColor EOF ;
+    // InternalTableDSL.g:954:1: entryRuleTableCellColor : ruleTableCellColor EOF ;
     public final void entryRuleTableCellColor() throws RecognitionException {
         try {
-            // InternalTableDSL.g:980:1: ( ruleTableCellColor EOF )
-            // InternalTableDSL.g:981:1: ruleTableCellColor EOF
+            // InternalTableDSL.g:955:1: ( ruleTableCellColor EOF )
+            // InternalTableDSL.g:956:1: ruleTableCellColor EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableCellColorRule()); 
@@ -3417,23 +3343,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableCellColor"
-    // InternalTableDSL.g:988:1: ruleTableCellColor : ( ( rule__TableCellColor__Group__0 ) ) ;
+    // InternalTableDSL.g:963:1: ruleTableCellColor : ( ( rule__TableCellColor__Group__0 ) ) ;
     public final void ruleTableCellColor() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:992:2: ( ( ( rule__TableCellColor__Group__0 ) ) )
-            // InternalTableDSL.g:993:2: ( ( rule__TableCellColor__Group__0 ) )
+            // InternalTableDSL.g:967:2: ( ( ( rule__TableCellColor__Group__0 ) ) )
+            // InternalTableDSL.g:968:2: ( ( rule__TableCellColor__Group__0 ) )
             {
-            // InternalTableDSL.g:993:2: ( ( rule__TableCellColor__Group__0 ) )
-            // InternalTableDSL.g:994:3: ( rule__TableCellColor__Group__0 )
+            // InternalTableDSL.g:968:2: ( ( rule__TableCellColor__Group__0 ) )
+            // InternalTableDSL.g:969:3: ( rule__TableCellColor__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableCellColorAccess().getGroup()); 
             }
-            // InternalTableDSL.g:995:3: ( rule__TableCellColor__Group__0 )
-            // InternalTableDSL.g:995:4: rule__TableCellColor__Group__0
+            // InternalTableDSL.g:970:3: ( rule__TableCellColor__Group__0 )
+            // InternalTableDSL.g:970:4: rule__TableCellColor__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableCellColor__Group__0();
@@ -3468,11 +3394,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableIcon"
-    // InternalTableDSL.g:1004:1: entryRuleTableIcon : ruleTableIcon EOF ;
+    // InternalTableDSL.g:979:1: entryRuleTableIcon : ruleTableIcon EOF ;
     public final void entryRuleTableIcon() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1005:1: ( ruleTableIcon EOF )
-            // InternalTableDSL.g:1006:1: ruleTableIcon EOF
+            // InternalTableDSL.g:980:1: ( ruleTableIcon EOF )
+            // InternalTableDSL.g:981:1: ruleTableIcon EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIconRule()); 
@@ -3502,23 +3428,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableIcon"
-    // InternalTableDSL.g:1013:1: ruleTableIcon : ( ( rule__TableIcon__Group__0 ) ) ;
+    // InternalTableDSL.g:988:1: ruleTableIcon : ( ( rule__TableIcon__Group__0 ) ) ;
     public final void ruleTableIcon() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1017:2: ( ( ( rule__TableIcon__Group__0 ) ) )
-            // InternalTableDSL.g:1018:2: ( ( rule__TableIcon__Group__0 ) )
+            // InternalTableDSL.g:992:2: ( ( ( rule__TableIcon__Group__0 ) ) )
+            // InternalTableDSL.g:993:2: ( ( rule__TableIcon__Group__0 ) )
             {
-            // InternalTableDSL.g:1018:2: ( ( rule__TableIcon__Group__0 ) )
-            // InternalTableDSL.g:1019:3: ( rule__TableIcon__Group__0 )
+            // InternalTableDSL.g:993:2: ( ( rule__TableIcon__Group__0 ) )
+            // InternalTableDSL.g:994:3: ( rule__TableIcon__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIconAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1020:3: ( rule__TableIcon__Group__0 )
-            // InternalTableDSL.g:1020:4: rule__TableIcon__Group__0
+            // InternalTableDSL.g:995:3: ( rule__TableIcon__Group__0 )
+            // InternalTableDSL.g:995:4: rule__TableIcon__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableIcon__Group__0();
@@ -3553,11 +3479,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableTrend"
-    // InternalTableDSL.g:1029:1: entryRuleTableTrend : ruleTableTrend EOF ;
+    // InternalTableDSL.g:1004:1: entryRuleTableTrend : ruleTableTrend EOF ;
     public final void entryRuleTableTrend() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1030:1: ( ruleTableTrend EOF )
-            // InternalTableDSL.g:1031:1: ruleTableTrend EOF
+            // InternalTableDSL.g:1005:1: ( ruleTableTrend EOF )
+            // InternalTableDSL.g:1006:1: ruleTableTrend EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTrendRule()); 
@@ -3587,23 +3513,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableTrend"
-    // InternalTableDSL.g:1038:1: ruleTableTrend : ( ( rule__TableTrend__Group__0 ) ) ;
+    // InternalTableDSL.g:1013:1: ruleTableTrend : ( ( rule__TableTrend__Group__0 ) ) ;
     public final void ruleTableTrend() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1042:2: ( ( ( rule__TableTrend__Group__0 ) ) )
-            // InternalTableDSL.g:1043:2: ( ( rule__TableTrend__Group__0 ) )
+            // InternalTableDSL.g:1017:2: ( ( ( rule__TableTrend__Group__0 ) ) )
+            // InternalTableDSL.g:1018:2: ( ( rule__TableTrend__Group__0 ) )
             {
-            // InternalTableDSL.g:1043:2: ( ( rule__TableTrend__Group__0 ) )
-            // InternalTableDSL.g:1044:3: ( rule__TableTrend__Group__0 )
+            // InternalTableDSL.g:1018:2: ( ( rule__TableTrend__Group__0 ) )
+            // InternalTableDSL.g:1019:3: ( rule__TableTrend__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTrendAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1045:3: ( rule__TableTrend__Group__0 )
-            // InternalTableDSL.g:1045:4: rule__TableTrend__Group__0
+            // InternalTableDSL.g:1020:3: ( rule__TableTrend__Group__0 )
+            // InternalTableDSL.g:1020:4: rule__TableTrend__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableTrend__Group__0();
@@ -3638,11 +3564,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableTooltip"
-    // InternalTableDSL.g:1054:1: entryRuleTableTooltip : ruleTableTooltip EOF ;
+    // InternalTableDSL.g:1029:1: entryRuleTableTooltip : ruleTableTooltip EOF ;
     public final void entryRuleTableTooltip() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1055:1: ( ruleTableTooltip EOF )
-            // InternalTableDSL.g:1056:1: ruleTableTooltip EOF
+            // InternalTableDSL.g:1030:1: ( ruleTableTooltip EOF )
+            // InternalTableDSL.g:1031:1: ruleTableTooltip EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTooltipRule()); 
@@ -3672,23 +3598,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableTooltip"
-    // InternalTableDSL.g:1063:1: ruleTableTooltip : ( ( rule__TableTooltip__Group__0 ) ) ;
+    // InternalTableDSL.g:1038:1: ruleTableTooltip : ( ( rule__TableTooltip__Group__0 ) ) ;
     public final void ruleTableTooltip() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1067:2: ( ( ( rule__TableTooltip__Group__0 ) ) )
-            // InternalTableDSL.g:1068:2: ( ( rule__TableTooltip__Group__0 ) )
+            // InternalTableDSL.g:1042:2: ( ( ( rule__TableTooltip__Group__0 ) ) )
+            // InternalTableDSL.g:1043:2: ( ( rule__TableTooltip__Group__0 ) )
             {
-            // InternalTableDSL.g:1068:2: ( ( rule__TableTooltip__Group__0 ) )
-            // InternalTableDSL.g:1069:3: ( rule__TableTooltip__Group__0 )
+            // InternalTableDSL.g:1043:2: ( ( rule__TableTooltip__Group__0 ) )
+            // InternalTableDSL.g:1044:3: ( rule__TableTooltip__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTooltipAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1070:3: ( rule__TableTooltip__Group__0 )
-            // InternalTableDSL.g:1070:4: rule__TableTooltip__Group__0
+            // InternalTableDSL.g:1045:3: ( rule__TableTooltip__Group__0 )
+            // InternalTableDSL.g:1045:4: rule__TableTooltip__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableTooltip__Group__0();
@@ -3723,11 +3649,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableGrid"
-    // InternalTableDSL.g:1079:1: entryRuleTableGrid : ruleTableGrid EOF ;
+    // InternalTableDSL.g:1054:1: entryRuleTableGrid : ruleTableGrid EOF ;
     public final void entryRuleTableGrid() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1080:1: ( ruleTableGrid EOF )
-            // InternalTableDSL.g:1081:1: ruleTableGrid EOF
+            // InternalTableDSL.g:1055:1: ( ruleTableGrid EOF )
+            // InternalTableDSL.g:1056:1: ruleTableGrid EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableGridRule()); 
@@ -3757,23 +3683,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableGrid"
-    // InternalTableDSL.g:1088:1: ruleTableGrid : ( ( rule__TableGrid__Group__0 ) ) ;
+    // InternalTableDSL.g:1063:1: ruleTableGrid : ( ( rule__TableGrid__Group__0 ) ) ;
     public final void ruleTableGrid() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1092:2: ( ( ( rule__TableGrid__Group__0 ) ) )
-            // InternalTableDSL.g:1093:2: ( ( rule__TableGrid__Group__0 ) )
+            // InternalTableDSL.g:1067:2: ( ( ( rule__TableGrid__Group__0 ) ) )
+            // InternalTableDSL.g:1068:2: ( ( rule__TableGrid__Group__0 ) )
             {
-            // InternalTableDSL.g:1093:2: ( ( rule__TableGrid__Group__0 ) )
-            // InternalTableDSL.g:1094:3: ( rule__TableGrid__Group__0 )
+            // InternalTableDSL.g:1068:2: ( ( rule__TableGrid__Group__0 ) )
+            // InternalTableDSL.g:1069:3: ( rule__TableGrid__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableGridAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1095:3: ( rule__TableGrid__Group__0 )
-            // InternalTableDSL.g:1095:4: rule__TableGrid__Group__0
+            // InternalTableDSL.g:1070:3: ( rule__TableGrid__Group__0 )
+            // InternalTableDSL.g:1070:4: rule__TableGrid__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableGrid__Group__0();
@@ -3808,11 +3734,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleProperty"
-    // InternalTableDSL.g:1104:1: entryRuleProperty : ruleProperty EOF ;
+    // InternalTableDSL.g:1079:1: entryRuleProperty : ruleProperty EOF ;
     public final void entryRuleProperty() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1105:1: ( ruleProperty EOF )
-            // InternalTableDSL.g:1106:1: ruleProperty EOF
+            // InternalTableDSL.g:1080:1: ( ruleProperty EOF )
+            // InternalTableDSL.g:1081:1: ruleProperty EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyRule()); 
@@ -3842,23 +3768,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleProperty"
-    // InternalTableDSL.g:1113:1: ruleProperty : ( ( rule__Property__Group__0 ) ) ;
+    // InternalTableDSL.g:1088:1: ruleProperty : ( ( rule__Property__Group__0 ) ) ;
     public final void ruleProperty() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1117:2: ( ( ( rule__Property__Group__0 ) ) )
-            // InternalTableDSL.g:1118:2: ( ( rule__Property__Group__0 ) )
+            // InternalTableDSL.g:1092:2: ( ( ( rule__Property__Group__0 ) ) )
+            // InternalTableDSL.g:1093:2: ( ( rule__Property__Group__0 ) )
             {
-            // InternalTableDSL.g:1118:2: ( ( rule__Property__Group__0 ) )
-            // InternalTableDSL.g:1119:3: ( rule__Property__Group__0 )
+            // InternalTableDSL.g:1093:2: ( ( rule__Property__Group__0 ) )
+            // InternalTableDSL.g:1094:3: ( rule__Property__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1120:3: ( rule__Property__Group__0 )
-            // InternalTableDSL.g:1120:4: rule__Property__Group__0
+            // InternalTableDSL.g:1095:3: ( rule__Property__Group__0 )
+            // InternalTableDSL.g:1095:4: rule__Property__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__Property__Group__0();
@@ -3893,11 +3819,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleTableDtoDatasource"
-    // InternalTableDSL.g:1129:1: entryRuleTableDtoDatasource : ruleTableDtoDatasource EOF ;
+    // InternalTableDSL.g:1104:1: entryRuleTableDtoDatasource : ruleTableDtoDatasource EOF ;
     public final void entryRuleTableDtoDatasource() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1130:1: ( ruleTableDtoDatasource EOF )
-            // InternalTableDSL.g:1131:1: ruleTableDtoDatasource EOF
+            // InternalTableDSL.g:1105:1: ( ruleTableDtoDatasource EOF )
+            // InternalTableDSL.g:1106:1: ruleTableDtoDatasource EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDtoDatasourceRule()); 
@@ -3927,23 +3853,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleTableDtoDatasource"
-    // InternalTableDSL.g:1138:1: ruleTableDtoDatasource : ( ( rule__TableDtoDatasource__Group__0 ) ) ;
+    // InternalTableDSL.g:1113:1: ruleTableDtoDatasource : ( ( rule__TableDtoDatasource__Group__0 ) ) ;
     public final void ruleTableDtoDatasource() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1142:2: ( ( ( rule__TableDtoDatasource__Group__0 ) ) )
-            // InternalTableDSL.g:1143:2: ( ( rule__TableDtoDatasource__Group__0 ) )
+            // InternalTableDSL.g:1117:2: ( ( ( rule__TableDtoDatasource__Group__0 ) ) )
+            // InternalTableDSL.g:1118:2: ( ( rule__TableDtoDatasource__Group__0 ) )
             {
-            // InternalTableDSL.g:1143:2: ( ( rule__TableDtoDatasource__Group__0 ) )
-            // InternalTableDSL.g:1144:3: ( rule__TableDtoDatasource__Group__0 )
+            // InternalTableDSL.g:1118:2: ( ( rule__TableDtoDatasource__Group__0 ) )
+            // InternalTableDSL.g:1119:3: ( rule__TableDtoDatasource__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDtoDatasourceAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1145:3: ( rule__TableDtoDatasource__Group__0 )
-            // InternalTableDSL.g:1145:4: rule__TableDtoDatasource__Group__0
+            // InternalTableDSL.g:1120:3: ( rule__TableDtoDatasource__Group__0 )
+            // InternalTableDSL.g:1120:4: rule__TableDtoDatasource__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TableDtoDatasource__Group__0();
@@ -3978,11 +3904,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleNestedField"
-    // InternalTableDSL.g:1154:1: entryRuleNestedField : ruleNestedField EOF ;
+    // InternalTableDSL.g:1129:1: entryRuleNestedField : ruleNestedField EOF ;
     public final void entryRuleNestedField() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1155:1: ( ruleNestedField EOF )
-            // InternalTableDSL.g:1156:1: ruleNestedField EOF
+            // InternalTableDSL.g:1130:1: ( ruleNestedField EOF )
+            // InternalTableDSL.g:1131:1: ruleNestedField EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedFieldRule()); 
@@ -4012,23 +3938,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleNestedField"
-    // InternalTableDSL.g:1163:1: ruleNestedField : ( ( rule__NestedField__Group__0 ) ) ;
+    // InternalTableDSL.g:1138:1: ruleNestedField : ( ( rule__NestedField__Group__0 ) ) ;
     public final void ruleNestedField() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1167:2: ( ( ( rule__NestedField__Group__0 ) ) )
-            // InternalTableDSL.g:1168:2: ( ( rule__NestedField__Group__0 ) )
+            // InternalTableDSL.g:1142:2: ( ( ( rule__NestedField__Group__0 ) ) )
+            // InternalTableDSL.g:1143:2: ( ( rule__NestedField__Group__0 ) )
             {
-            // InternalTableDSL.g:1168:2: ( ( rule__NestedField__Group__0 ) )
-            // InternalTableDSL.g:1169:3: ( rule__NestedField__Group__0 )
+            // InternalTableDSL.g:1143:2: ( ( rule__NestedField__Group__0 ) )
+            // InternalTableDSL.g:1144:3: ( rule__NestedField__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedFieldAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1170:3: ( rule__NestedField__Group__0 )
-            // InternalTableDSL.g:1170:4: rule__NestedField__Group__0
+            // InternalTableDSL.g:1145:3: ( rule__NestedField__Group__0 )
+            // InternalTableDSL.g:1145:4: rule__NestedField__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__NestedField__Group__0();
@@ -4063,11 +3989,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleNestedPath"
-    // InternalTableDSL.g:1179:1: entryRuleNestedPath : ruleNestedPath EOF ;
+    // InternalTableDSL.g:1154:1: entryRuleNestedPath : ruleNestedPath EOF ;
     public final void entryRuleNestedPath() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1180:1: ( ruleNestedPath EOF )
-            // InternalTableDSL.g:1181:1: ruleNestedPath EOF
+            // InternalTableDSL.g:1155:1: ( ruleNestedPath EOF )
+            // InternalTableDSL.g:1156:1: ruleNestedPath EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedPathRule()); 
@@ -4097,23 +4023,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleNestedPath"
-    // InternalTableDSL.g:1188:1: ruleNestedPath : ( ( rule__NestedPath__Group__0 ) ) ;
+    // InternalTableDSL.g:1163:1: ruleNestedPath : ( ( rule__NestedPath__Group__0 ) ) ;
     public final void ruleNestedPath() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1192:2: ( ( ( rule__NestedPath__Group__0 ) ) )
-            // InternalTableDSL.g:1193:2: ( ( rule__NestedPath__Group__0 ) )
+            // InternalTableDSL.g:1167:2: ( ( ( rule__NestedPath__Group__0 ) ) )
+            // InternalTableDSL.g:1168:2: ( ( rule__NestedPath__Group__0 ) )
             {
-            // InternalTableDSL.g:1193:2: ( ( rule__NestedPath__Group__0 ) )
-            // InternalTableDSL.g:1194:3: ( rule__NestedPath__Group__0 )
+            // InternalTableDSL.g:1168:2: ( ( rule__NestedPath__Group__0 ) )
+            // InternalTableDSL.g:1169:3: ( rule__NestedPath__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedPathAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1195:3: ( rule__NestedPath__Group__0 )
-            // InternalTableDSL.g:1195:4: rule__NestedPath__Group__0
+            // InternalTableDSL.g:1170:3: ( rule__NestedPath__Group__0 )
+            // InternalTableDSL.g:1170:4: rule__NestedPath__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__NestedPath__Group__0();
@@ -4148,11 +4074,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRulePropertyStyle"
-    // InternalTableDSL.g:1204:1: entryRulePropertyStyle : rulePropertyStyle EOF ;
+    // InternalTableDSL.g:1179:1: entryRulePropertyStyle : rulePropertyStyle EOF ;
     public final void entryRulePropertyStyle() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1205:1: ( rulePropertyStyle EOF )
-            // InternalTableDSL.g:1206:1: rulePropertyStyle EOF
+            // InternalTableDSL.g:1180:1: ( rulePropertyStyle EOF )
+            // InternalTableDSL.g:1181:1: rulePropertyStyle EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyStyleRule()); 
@@ -4182,23 +4108,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rulePropertyStyle"
-    // InternalTableDSL.g:1213:1: rulePropertyStyle : ( ( rule__PropertyStyle__Alternatives ) ) ;
+    // InternalTableDSL.g:1188:1: rulePropertyStyle : ( ( rule__PropertyStyle__Alternatives ) ) ;
     public final void rulePropertyStyle() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1217:2: ( ( ( rule__PropertyStyle__Alternatives ) ) )
-            // InternalTableDSL.g:1218:2: ( ( rule__PropertyStyle__Alternatives ) )
+            // InternalTableDSL.g:1192:2: ( ( ( rule__PropertyStyle__Alternatives ) ) )
+            // InternalTableDSL.g:1193:2: ( ( rule__PropertyStyle__Alternatives ) )
             {
-            // InternalTableDSL.g:1218:2: ( ( rule__PropertyStyle__Alternatives ) )
-            // InternalTableDSL.g:1219:3: ( rule__PropertyStyle__Alternatives )
+            // InternalTableDSL.g:1193:2: ( ( rule__PropertyStyle__Alternatives ) )
+            // InternalTableDSL.g:1194:3: ( rule__PropertyStyle__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyStyleAccess().getAlternatives()); 
             }
-            // InternalTableDSL.g:1220:3: ( rule__PropertyStyle__Alternatives )
-            // InternalTableDSL.g:1220:4: rule__PropertyStyle__Alternatives
+            // InternalTableDSL.g:1195:3: ( rule__PropertyStyle__Alternatives )
+            // InternalTableDSL.g:1195:4: rule__PropertyStyle__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__PropertyStyle__Alternatives();
@@ -4233,11 +4159,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRulePropertyButtonStyle"
-    // InternalTableDSL.g:1229:1: entryRulePropertyButtonStyle : rulePropertyButtonStyle EOF ;
+    // InternalTableDSL.g:1204:1: entryRulePropertyButtonStyle : rulePropertyButtonStyle EOF ;
     public final void entryRulePropertyButtonStyle() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1230:1: ( rulePropertyButtonStyle EOF )
-            // InternalTableDSL.g:1231:1: rulePropertyButtonStyle EOF
+            // InternalTableDSL.g:1205:1: ( rulePropertyButtonStyle EOF )
+            // InternalTableDSL.g:1206:1: rulePropertyButtonStyle EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyButtonStyleRule()); 
@@ -4267,23 +4193,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rulePropertyButtonStyle"
-    // InternalTableDSL.g:1238:1: rulePropertyButtonStyle : ( ( rule__PropertyButtonStyle__Group__0 ) ) ;
+    // InternalTableDSL.g:1213:1: rulePropertyButtonStyle : ( ( rule__PropertyButtonStyle__Group__0 ) ) ;
     public final void rulePropertyButtonStyle() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1242:2: ( ( ( rule__PropertyButtonStyle__Group__0 ) ) )
-            // InternalTableDSL.g:1243:2: ( ( rule__PropertyButtonStyle__Group__0 ) )
+            // InternalTableDSL.g:1217:2: ( ( ( rule__PropertyButtonStyle__Group__0 ) ) )
+            // InternalTableDSL.g:1218:2: ( ( rule__PropertyButtonStyle__Group__0 ) )
             {
-            // InternalTableDSL.g:1243:2: ( ( rule__PropertyButtonStyle__Group__0 ) )
-            // InternalTableDSL.g:1244:3: ( rule__PropertyButtonStyle__Group__0 )
+            // InternalTableDSL.g:1218:2: ( ( rule__PropertyButtonStyle__Group__0 ) )
+            // InternalTableDSL.g:1219:3: ( rule__PropertyButtonStyle__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyButtonStyleAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1245:3: ( rule__PropertyButtonStyle__Group__0 )
-            // InternalTableDSL.g:1245:4: rule__PropertyButtonStyle__Group__0
+            // InternalTableDSL.g:1220:3: ( rule__PropertyButtonStyle__Group__0 )
+            // InternalTableDSL.g:1220:4: rule__PropertyButtonStyle__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__PropertyButtonStyle__Group__0();
@@ -4318,11 +4244,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRulePropertyHtmlStyle"
-    // InternalTableDSL.g:1254:1: entryRulePropertyHtmlStyle : rulePropertyHtmlStyle EOF ;
+    // InternalTableDSL.g:1229:1: entryRulePropertyHtmlStyle : rulePropertyHtmlStyle EOF ;
     public final void entryRulePropertyHtmlStyle() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1255:1: ( rulePropertyHtmlStyle EOF )
-            // InternalTableDSL.g:1256:1: rulePropertyHtmlStyle EOF
+            // InternalTableDSL.g:1230:1: ( rulePropertyHtmlStyle EOF )
+            // InternalTableDSL.g:1231:1: rulePropertyHtmlStyle EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyHtmlStyleRule()); 
@@ -4352,23 +4278,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rulePropertyHtmlStyle"
-    // InternalTableDSL.g:1263:1: rulePropertyHtmlStyle : ( ( rule__PropertyHtmlStyle__Group__0 ) ) ;
+    // InternalTableDSL.g:1238:1: rulePropertyHtmlStyle : ( ( rule__PropertyHtmlStyle__Group__0 ) ) ;
     public final void rulePropertyHtmlStyle() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1267:2: ( ( ( rule__PropertyHtmlStyle__Group__0 ) ) )
-            // InternalTableDSL.g:1268:2: ( ( rule__PropertyHtmlStyle__Group__0 ) )
+            // InternalTableDSL.g:1242:2: ( ( ( rule__PropertyHtmlStyle__Group__0 ) ) )
+            // InternalTableDSL.g:1243:2: ( ( rule__PropertyHtmlStyle__Group__0 ) )
             {
-            // InternalTableDSL.g:1268:2: ( ( rule__PropertyHtmlStyle__Group__0 ) )
-            // InternalTableDSL.g:1269:3: ( rule__PropertyHtmlStyle__Group__0 )
+            // InternalTableDSL.g:1243:2: ( ( rule__PropertyHtmlStyle__Group__0 ) )
+            // InternalTableDSL.g:1244:3: ( rule__PropertyHtmlStyle__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyHtmlStyleAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1270:3: ( rule__PropertyHtmlStyle__Group__0 )
-            // InternalTableDSL.g:1270:4: rule__PropertyHtmlStyle__Group__0
+            // InternalTableDSL.g:1245:3: ( rule__PropertyHtmlStyle__Group__0 )
+            // InternalTableDSL.g:1245:4: rule__PropertyHtmlStyle__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__PropertyHtmlStyle__Group__0();
@@ -4403,11 +4329,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRulePropertyBooleanStyle"
-    // InternalTableDSL.g:1279:1: entryRulePropertyBooleanStyle : rulePropertyBooleanStyle EOF ;
+    // InternalTableDSL.g:1254:1: entryRulePropertyBooleanStyle : rulePropertyBooleanStyle EOF ;
     public final void entryRulePropertyBooleanStyle() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1280:1: ( rulePropertyBooleanStyle EOF )
-            // InternalTableDSL.g:1281:1: rulePropertyBooleanStyle EOF
+            // InternalTableDSL.g:1255:1: ( rulePropertyBooleanStyle EOF )
+            // InternalTableDSL.g:1256:1: rulePropertyBooleanStyle EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyBooleanStyleRule()); 
@@ -4437,23 +4363,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rulePropertyBooleanStyle"
-    // InternalTableDSL.g:1288:1: rulePropertyBooleanStyle : ( ( rule__PropertyBooleanStyle__Group__0 ) ) ;
+    // InternalTableDSL.g:1263:1: rulePropertyBooleanStyle : ( ( rule__PropertyBooleanStyle__Group__0 ) ) ;
     public final void rulePropertyBooleanStyle() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1292:2: ( ( ( rule__PropertyBooleanStyle__Group__0 ) ) )
-            // InternalTableDSL.g:1293:2: ( ( rule__PropertyBooleanStyle__Group__0 ) )
+            // InternalTableDSL.g:1267:2: ( ( ( rule__PropertyBooleanStyle__Group__0 ) ) )
+            // InternalTableDSL.g:1268:2: ( ( rule__PropertyBooleanStyle__Group__0 ) )
             {
-            // InternalTableDSL.g:1293:2: ( ( rule__PropertyBooleanStyle__Group__0 ) )
-            // InternalTableDSL.g:1294:3: ( rule__PropertyBooleanStyle__Group__0 )
+            // InternalTableDSL.g:1268:2: ( ( rule__PropertyBooleanStyle__Group__0 ) )
+            // InternalTableDSL.g:1269:3: ( rule__PropertyBooleanStyle__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyBooleanStyleAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1295:3: ( rule__PropertyBooleanStyle__Group__0 )
-            // InternalTableDSL.g:1295:4: rule__PropertyBooleanStyle__Group__0
+            // InternalTableDSL.g:1270:3: ( rule__PropertyBooleanStyle__Group__0 )
+            // InternalTableDSL.g:1270:4: rule__PropertyBooleanStyle__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__PropertyBooleanStyle__Group__0();
@@ -4488,11 +4414,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRulePropertyDateStyle"
-    // InternalTableDSL.g:1304:1: entryRulePropertyDateStyle : rulePropertyDateStyle EOF ;
+    // InternalTableDSL.g:1279:1: entryRulePropertyDateStyle : rulePropertyDateStyle EOF ;
     public final void entryRulePropertyDateStyle() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1305:1: ( rulePropertyDateStyle EOF )
-            // InternalTableDSL.g:1306:1: rulePropertyDateStyle EOF
+            // InternalTableDSL.g:1280:1: ( rulePropertyDateStyle EOF )
+            // InternalTableDSL.g:1281:1: rulePropertyDateStyle EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyDateStyleRule()); 
@@ -4522,23 +4448,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rulePropertyDateStyle"
-    // InternalTableDSL.g:1313:1: rulePropertyDateStyle : ( ( rule__PropertyDateStyle__Group__0 ) ) ;
+    // InternalTableDSL.g:1288:1: rulePropertyDateStyle : ( ( rule__PropertyDateStyle__Group__0 ) ) ;
     public final void rulePropertyDateStyle() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1317:2: ( ( ( rule__PropertyDateStyle__Group__0 ) ) )
-            // InternalTableDSL.g:1318:2: ( ( rule__PropertyDateStyle__Group__0 ) )
+            // InternalTableDSL.g:1292:2: ( ( ( rule__PropertyDateStyle__Group__0 ) ) )
+            // InternalTableDSL.g:1293:2: ( ( rule__PropertyDateStyle__Group__0 ) )
             {
-            // InternalTableDSL.g:1318:2: ( ( rule__PropertyDateStyle__Group__0 ) )
-            // InternalTableDSL.g:1319:3: ( rule__PropertyDateStyle__Group__0 )
+            // InternalTableDSL.g:1293:2: ( ( rule__PropertyDateStyle__Group__0 ) )
+            // InternalTableDSL.g:1294:3: ( rule__PropertyDateStyle__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyDateStyleAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1320:3: ( rule__PropertyDateStyle__Group__0 )
-            // InternalTableDSL.g:1320:4: rule__PropertyDateStyle__Group__0
+            // InternalTableDSL.g:1295:3: ( rule__PropertyDateStyle__Group__0 )
+            // InternalTableDSL.g:1295:4: rule__PropertyDateStyle__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__PropertyDateStyle__Group__0();
@@ -4573,11 +4499,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRulePropertyNumberStyle"
-    // InternalTableDSL.g:1329:1: entryRulePropertyNumberStyle : rulePropertyNumberStyle EOF ;
+    // InternalTableDSL.g:1304:1: entryRulePropertyNumberStyle : rulePropertyNumberStyle EOF ;
     public final void entryRulePropertyNumberStyle() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1330:1: ( rulePropertyNumberStyle EOF )
-            // InternalTableDSL.g:1331:1: rulePropertyNumberStyle EOF
+            // InternalTableDSL.g:1305:1: ( rulePropertyNumberStyle EOF )
+            // InternalTableDSL.g:1306:1: rulePropertyNumberStyle EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyNumberStyleRule()); 
@@ -4607,23 +4533,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rulePropertyNumberStyle"
-    // InternalTableDSL.g:1338:1: rulePropertyNumberStyle : ( ( rule__PropertyNumberStyle__Group__0 ) ) ;
+    // InternalTableDSL.g:1313:1: rulePropertyNumberStyle : ( ( rule__PropertyNumberStyle__Group__0 ) ) ;
     public final void rulePropertyNumberStyle() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1342:2: ( ( ( rule__PropertyNumberStyle__Group__0 ) ) )
-            // InternalTableDSL.g:1343:2: ( ( rule__PropertyNumberStyle__Group__0 ) )
+            // InternalTableDSL.g:1317:2: ( ( ( rule__PropertyNumberStyle__Group__0 ) ) )
+            // InternalTableDSL.g:1318:2: ( ( rule__PropertyNumberStyle__Group__0 ) )
             {
-            // InternalTableDSL.g:1343:2: ( ( rule__PropertyNumberStyle__Group__0 ) )
-            // InternalTableDSL.g:1344:3: ( rule__PropertyNumberStyle__Group__0 )
+            // InternalTableDSL.g:1318:2: ( ( rule__PropertyNumberStyle__Group__0 ) )
+            // InternalTableDSL.g:1319:3: ( rule__PropertyNumberStyle__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyNumberStyleAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1345:3: ( rule__PropertyNumberStyle__Group__0 )
-            // InternalTableDSL.g:1345:4: rule__PropertyNumberStyle__Group__0
+            // InternalTableDSL.g:1320:3: ( rule__PropertyNumberStyle__Group__0 )
+            // InternalTableDSL.g:1320:4: rule__PropertyNumberStyle__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__PropertyNumberStyle__Group__0();
@@ -4658,11 +4584,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRulePropertyProgressbarStyle"
-    // InternalTableDSL.g:1354:1: entryRulePropertyProgressbarStyle : rulePropertyProgressbarStyle EOF ;
+    // InternalTableDSL.g:1329:1: entryRulePropertyProgressbarStyle : rulePropertyProgressbarStyle EOF ;
     public final void entryRulePropertyProgressbarStyle() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1355:1: ( rulePropertyProgressbarStyle EOF )
-            // InternalTableDSL.g:1356:1: rulePropertyProgressbarStyle EOF
+            // InternalTableDSL.g:1330:1: ( rulePropertyProgressbarStyle EOF )
+            // InternalTableDSL.g:1331:1: rulePropertyProgressbarStyle EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyProgressbarStyleRule()); 
@@ -4692,23 +4618,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rulePropertyProgressbarStyle"
-    // InternalTableDSL.g:1363:1: rulePropertyProgressbarStyle : ( ( rule__PropertyProgressbarStyle__Group__0 ) ) ;
+    // InternalTableDSL.g:1338:1: rulePropertyProgressbarStyle : ( ( rule__PropertyProgressbarStyle__Group__0 ) ) ;
     public final void rulePropertyProgressbarStyle() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1367:2: ( ( ( rule__PropertyProgressbarStyle__Group__0 ) ) )
-            // InternalTableDSL.g:1368:2: ( ( rule__PropertyProgressbarStyle__Group__0 ) )
+            // InternalTableDSL.g:1342:2: ( ( ( rule__PropertyProgressbarStyle__Group__0 ) ) )
+            // InternalTableDSL.g:1343:2: ( ( rule__PropertyProgressbarStyle__Group__0 ) )
             {
-            // InternalTableDSL.g:1368:2: ( ( rule__PropertyProgressbarStyle__Group__0 ) )
-            // InternalTableDSL.g:1369:3: ( rule__PropertyProgressbarStyle__Group__0 )
+            // InternalTableDSL.g:1343:2: ( ( rule__PropertyProgressbarStyle__Group__0 ) )
+            // InternalTableDSL.g:1344:3: ( rule__PropertyProgressbarStyle__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyProgressbarStyleAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1370:3: ( rule__PropertyProgressbarStyle__Group__0 )
-            // InternalTableDSL.g:1370:4: rule__PropertyProgressbarStyle__Group__0
+            // InternalTableDSL.g:1345:3: ( rule__PropertyProgressbarStyle__Group__0 )
+            // InternalTableDSL.g:1345:4: rule__PropertyProgressbarStyle__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__PropertyProgressbarStyle__Group__0();
@@ -4743,11 +4669,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRuleGridPropIndicatorStyle"
-    // InternalTableDSL.g:1379:1: entryRuleGridPropIndicatorStyle : ruleGridPropIndicatorStyle EOF ;
+    // InternalTableDSL.g:1354:1: entryRuleGridPropIndicatorStyle : ruleGridPropIndicatorStyle EOF ;
     public final void entryRuleGridPropIndicatorStyle() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1380:1: ( ruleGridPropIndicatorStyle EOF )
-            // InternalTableDSL.g:1381:1: ruleGridPropIndicatorStyle EOF
+            // InternalTableDSL.g:1355:1: ( ruleGridPropIndicatorStyle EOF )
+            // InternalTableDSL.g:1356:1: ruleGridPropIndicatorStyle EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGridPropIndicatorStyleRule()); 
@@ -4777,23 +4703,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "ruleGridPropIndicatorStyle"
-    // InternalTableDSL.g:1388:1: ruleGridPropIndicatorStyle : ( ( rule__GridPropIndicatorStyle__Group__0 ) ) ;
+    // InternalTableDSL.g:1363:1: ruleGridPropIndicatorStyle : ( ( rule__GridPropIndicatorStyle__Group__0 ) ) ;
     public final void ruleGridPropIndicatorStyle() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1392:2: ( ( ( rule__GridPropIndicatorStyle__Group__0 ) ) )
-            // InternalTableDSL.g:1393:2: ( ( rule__GridPropIndicatorStyle__Group__0 ) )
+            // InternalTableDSL.g:1367:2: ( ( ( rule__GridPropIndicatorStyle__Group__0 ) ) )
+            // InternalTableDSL.g:1368:2: ( ( rule__GridPropIndicatorStyle__Group__0 ) )
             {
-            // InternalTableDSL.g:1393:2: ( ( rule__GridPropIndicatorStyle__Group__0 ) )
-            // InternalTableDSL.g:1394:3: ( rule__GridPropIndicatorStyle__Group__0 )
+            // InternalTableDSL.g:1368:2: ( ( rule__GridPropIndicatorStyle__Group__0 ) )
+            // InternalTableDSL.g:1369:3: ( rule__GridPropIndicatorStyle__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGridPropIndicatorStyleAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1395:3: ( rule__GridPropIndicatorStyle__Group__0 )
-            // InternalTableDSL.g:1395:4: rule__GridPropIndicatorStyle__Group__0
+            // InternalTableDSL.g:1370:3: ( rule__GridPropIndicatorStyle__Group__0 )
+            // InternalTableDSL.g:1370:4: rule__GridPropIndicatorStyle__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__GridPropIndicatorStyle__Group__0();
@@ -4828,11 +4754,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "entryRulePropertyTextStyle"
-    // InternalTableDSL.g:1404:1: entryRulePropertyTextStyle : rulePropertyTextStyle EOF ;
+    // InternalTableDSL.g:1379:1: entryRulePropertyTextStyle : rulePropertyTextStyle EOF ;
     public final void entryRulePropertyTextStyle() throws RecognitionException {
         try {
-            // InternalTableDSL.g:1405:1: ( rulePropertyTextStyle EOF )
-            // InternalTableDSL.g:1406:1: rulePropertyTextStyle EOF
+            // InternalTableDSL.g:1380:1: ( rulePropertyTextStyle EOF )
+            // InternalTableDSL.g:1381:1: rulePropertyTextStyle EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyTextStyleRule()); 
@@ -4862,23 +4788,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rulePropertyTextStyle"
-    // InternalTableDSL.g:1413:1: rulePropertyTextStyle : ( ( rule__PropertyTextStyle__Group__0 ) ) ;
+    // InternalTableDSL.g:1388:1: rulePropertyTextStyle : ( ( rule__PropertyTextStyle__Group__0 ) ) ;
     public final void rulePropertyTextStyle() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:1417:2: ( ( ( rule__PropertyTextStyle__Group__0 ) ) )
-            // InternalTableDSL.g:1418:2: ( ( rule__PropertyTextStyle__Group__0 ) )
+            // InternalTableDSL.g:1392:2: ( ( ( rule__PropertyTextStyle__Group__0 ) ) )
+            // InternalTableDSL.g:1393:2: ( ( rule__PropertyTextStyle__Group__0 ) )
             {
-            // InternalTableDSL.g:1418:2: ( ( rule__PropertyTextStyle__Group__0 ) )
-            // InternalTableDSL.g:1419:3: ( rule__PropertyTextStyle__Group__0 )
+            // InternalTableDSL.g:1393:2: ( ( rule__PropertyTextStyle__Group__0 ) )
+            // InternalTableDSL.g:1394:3: ( rule__PropertyTextStyle__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyTextStyleAccess().getGroup()); 
             }
-            // InternalTableDSL.g:1420:3: ( rule__PropertyTextStyle__Group__0 )
-            // InternalTableDSL.g:1420:4: rule__PropertyTextStyle__Group__0
+            // InternalTableDSL.g:1395:3: ( rule__PropertyTextStyle__Group__0 )
+            // InternalTableDSL.g:1395:4: rule__PropertyTextStyle__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__PropertyTextStyle__Group__0();
@@ -4912,6 +4838,91 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     // $ANTLR end "rulePropertyTextStyle"
 
 
+    // $ANTLR start "entryRulePropertyBlobImageStyle"
+    // InternalTableDSL.g:1404:1: entryRulePropertyBlobImageStyle : rulePropertyBlobImageStyle EOF ;
+    public final void entryRulePropertyBlobImageStyle() throws RecognitionException {
+        try {
+            // InternalTableDSL.g:1405:1: ( rulePropertyBlobImageStyle EOF )
+            // InternalTableDSL.g:1406:1: rulePropertyBlobImageStyle EOF
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getPropertyBlobImageStyleRule()); 
+            }
+            pushFollow(FOLLOW_1);
+            rulePropertyBlobImageStyle();
+
+            state._fsp--;
+            if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getPropertyBlobImageStyleRule()); 
+            }
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRulePropertyBlobImageStyle"
+
+
+    // $ANTLR start "rulePropertyBlobImageStyle"
+    // InternalTableDSL.g:1413:1: rulePropertyBlobImageStyle : ( ( rule__PropertyBlobImageStyle__Group__0 ) ) ;
+    public final void rulePropertyBlobImageStyle() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+        	
+        try {
+            // InternalTableDSL.g:1417:2: ( ( ( rule__PropertyBlobImageStyle__Group__0 ) ) )
+            // InternalTableDSL.g:1418:2: ( ( rule__PropertyBlobImageStyle__Group__0 ) )
+            {
+            // InternalTableDSL.g:1418:2: ( ( rule__PropertyBlobImageStyle__Group__0 ) )
+            // InternalTableDSL.g:1419:3: ( rule__PropertyBlobImageStyle__Group__0 )
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getPropertyBlobImageStyleAccess().getGroup()); 
+            }
+            // InternalTableDSL.g:1420:3: ( rule__PropertyBlobImageStyle__Group__0 )
+            // InternalTableDSL.g:1420:4: rule__PropertyBlobImageStyle__Group__0
+            {
+            pushFollow(FOLLOW_2);
+            rule__PropertyBlobImageStyle__Group__0();
+
+            state._fsp--;
+            if (state.failed) return ;
+
+            }
+
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getPropertyBlobImageStyleAccess().getGroup()); 
+            }
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rulePropertyBlobImageStyle"
+
+
     // $ANTLR start "entryRulePropertyImageStyle"
     // InternalTableDSL.g:1429:1: entryRulePropertyImageStyle : rulePropertyImageStyle EOF ;
     public final void entryRulePropertyImageStyle() throws RecognitionException {
@@ -12819,21 +12830,21 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableOption__Alternatives"
-    // InternalTableDSL.g:3764:1: rule__TableOption__Alternatives : ( ( ruleTableSelection ) | ( ruleTableTable ) | ( ruleTableGrid ) | ( ruleTableBean ) );
+    // InternalTableDSL.g:3764:1: rule__TableOption__Alternatives : ( ( ruleTableSelection ) | ( ruleTableTable ) | ( ruleTableGrid ) );
     public final void rule__TableOption__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:3768:1: ( ( ruleTableSelection ) | ( ruleTableTable ) | ( ruleTableGrid ) | ( ruleTableBean ) )
-            int alt3=4;
+            // InternalTableDSL.g:3768:1: ( ( ruleTableSelection ) | ( ruleTableTable ) | ( ruleTableGrid ) )
+            int alt3=3;
             switch ( input.LA(1) ) {
             case 79:
                 {
                 alt3=1;
                 }
                 break;
-            case 77:
+            case 83:
                 {
                 alt3=2;
                 }
@@ -12843,11 +12854,6 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                 alt3=3;
                 }
                 break;
-            case 83:
-                {
-                alt3=4;
-                }
-                break;
             default:
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
@@ -12926,29 +12932,6 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
                     }
                     break;
-                case 4 :
-                    // InternalTableDSL.g:3787:2: ( ruleTableBean )
-                    {
-                    // InternalTableDSL.g:3787:2: ( ruleTableBean )
-                    // InternalTableDSL.g:3788:3: ruleTableBean
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableOptionAccess().getTableBeanParserRuleCall_3()); 
-                    }
-                    pushFollow(FOLLOW_2);
-                    ruleTableBean();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableOptionAccess().getTableBeanParserRuleCall_3()); 
-                    }
-
-                    }
-
-
-                    }
-                    break;
 
             }
         }
@@ -12967,13 +12950,13 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableSelection__Alternatives_2"
-    // InternalTableDSL.g:3797:1: rule__TableSelection__Alternatives_2 : ( ( ( rule__TableSelection__MultiSelectionAssignment_2_0 ) ) | ( 'single' ) );
+    // InternalTableDSL.g:3791:1: rule__TableSelection__Alternatives_2 : ( ( ( rule__TableSelection__MultiSelectionAssignment_2_0 ) ) | ( 'single' ) );
     public final void rule__TableSelection__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:3801:1: ( ( ( rule__TableSelection__MultiSelectionAssignment_2_0 ) ) | ( 'single' ) )
+            // InternalTableDSL.g:3795:1: ( ( ( rule__TableSelection__MultiSelectionAssignment_2_0 ) ) | ( 'single' ) )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -12992,16 +12975,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             }
             switch (alt4) {
                 case 1 :
-                    // InternalTableDSL.g:3802:2: ( ( rule__TableSelection__MultiSelectionAssignment_2_0 ) )
+                    // InternalTableDSL.g:3796:2: ( ( rule__TableSelection__MultiSelectionAssignment_2_0 ) )
                     {
-                    // InternalTableDSL.g:3802:2: ( ( rule__TableSelection__MultiSelectionAssignment_2_0 ) )
-                    // InternalTableDSL.g:3803:3: ( rule__TableSelection__MultiSelectionAssignment_2_0 )
+                    // InternalTableDSL.g:3796:2: ( ( rule__TableSelection__MultiSelectionAssignment_2_0 ) )
+                    // InternalTableDSL.g:3797:3: ( rule__TableSelection__MultiSelectionAssignment_2_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableSelectionAccess().getMultiSelectionAssignment_2_0()); 
                     }
-                    // InternalTableDSL.g:3804:3: ( rule__TableSelection__MultiSelectionAssignment_2_0 )
-                    // InternalTableDSL.g:3804:4: rule__TableSelection__MultiSelectionAssignment_2_0
+                    // InternalTableDSL.g:3798:3: ( rule__TableSelection__MultiSelectionAssignment_2_0 )
+                    // InternalTableDSL.g:3798:4: rule__TableSelection__MultiSelectionAssignment_2_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableSelection__MultiSelectionAssignment_2_0();
@@ -13021,10 +13004,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:3808:2: ( 'single' )
+                    // InternalTableDSL.g:3802:2: ( 'single' )
                     {
-                    // InternalTableDSL.g:3808:2: ( 'single' )
-                    // InternalTableDSL.g:3809:3: 'single'
+                    // InternalTableDSL.g:3802:2: ( 'single' )
+                    // InternalTableDSL.g:3803:3: 'single'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableSelectionAccess().getSingleKeyword_2_1()); 
@@ -13057,13 +13040,13 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValueElement__Alternatives"
-    // InternalTableDSL.g:3818:1: rule__TableValueElement__Alternatives : ( ( ruleTableMeasure ) | ( ruleTableDerived ) | ( ruleTableHierarchy ) | ( ruleTableAttribute ) | ( ruleTableAggregation ) | ( ruleTableOrdinal ) | ( ruleTableColumn ) | ( ruleTableTask ) | ( ruleTableAllColumns ) );
+    // InternalTableDSL.g:3812:1: rule__TableValueElement__Alternatives : ( ( ruleTableMeasure ) | ( ruleTableDerived ) | ( ruleTableHierarchy ) | ( ruleTableAttribute ) | ( ruleTableAggregation ) | ( ruleTableOrdinal ) | ( ruleTableColumn ) | ( ruleTableTask ) | ( ruleTableAllColumns ) );
     public final void rule__TableValueElement__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:3822:1: ( ( ruleTableMeasure ) | ( ruleTableDerived ) | ( ruleTableHierarchy ) | ( ruleTableAttribute ) | ( ruleTableAggregation ) | ( ruleTableOrdinal ) | ( ruleTableColumn ) | ( ruleTableTask ) | ( ruleTableAllColumns ) )
+            // InternalTableDSL.g:3816:1: ( ( ruleTableMeasure ) | ( ruleTableDerived ) | ( ruleTableHierarchy ) | ( ruleTableAttribute ) | ( ruleTableAggregation ) | ( ruleTableOrdinal ) | ( ruleTableColumn ) | ( ruleTableTask ) | ( ruleTableAllColumns ) )
             int alt5=9;
             switch ( input.LA(1) ) {
             case 96:
@@ -13121,10 +13104,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
             switch (alt5) {
                 case 1 :
-                    // InternalTableDSL.g:3823:2: ( ruleTableMeasure )
+                    // InternalTableDSL.g:3817:2: ( ruleTableMeasure )
                     {
-                    // InternalTableDSL.g:3823:2: ( ruleTableMeasure )
-                    // InternalTableDSL.g:3824:3: ruleTableMeasure
+                    // InternalTableDSL.g:3817:2: ( ruleTableMeasure )
+                    // InternalTableDSL.g:3818:3: ruleTableMeasure
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueElementAccess().getTableMeasureParserRuleCall_0()); 
@@ -13144,10 +13127,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:3829:2: ( ruleTableDerived )
+                    // InternalTableDSL.g:3823:2: ( ruleTableDerived )
                     {
-                    // InternalTableDSL.g:3829:2: ( ruleTableDerived )
-                    // InternalTableDSL.g:3830:3: ruleTableDerived
+                    // InternalTableDSL.g:3823:2: ( ruleTableDerived )
+                    // InternalTableDSL.g:3824:3: ruleTableDerived
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueElementAccess().getTableDerivedParserRuleCall_1()); 
@@ -13167,10 +13150,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:3835:2: ( ruleTableHierarchy )
+                    // InternalTableDSL.g:3829:2: ( ruleTableHierarchy )
                     {
-                    // InternalTableDSL.g:3835:2: ( ruleTableHierarchy )
-                    // InternalTableDSL.g:3836:3: ruleTableHierarchy
+                    // InternalTableDSL.g:3829:2: ( ruleTableHierarchy )
+                    // InternalTableDSL.g:3830:3: ruleTableHierarchy
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueElementAccess().getTableHierarchyParserRuleCall_2()); 
@@ -13190,10 +13173,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:3841:2: ( ruleTableAttribute )
+                    // InternalTableDSL.g:3835:2: ( ruleTableAttribute )
                     {
-                    // InternalTableDSL.g:3841:2: ( ruleTableAttribute )
-                    // InternalTableDSL.g:3842:3: ruleTableAttribute
+                    // InternalTableDSL.g:3835:2: ( ruleTableAttribute )
+                    // InternalTableDSL.g:3836:3: ruleTableAttribute
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueElementAccess().getTableAttributeParserRuleCall_3()); 
@@ -13213,10 +13196,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:3847:2: ( ruleTableAggregation )
+                    // InternalTableDSL.g:3841:2: ( ruleTableAggregation )
                     {
-                    // InternalTableDSL.g:3847:2: ( ruleTableAggregation )
-                    // InternalTableDSL.g:3848:3: ruleTableAggregation
+                    // InternalTableDSL.g:3841:2: ( ruleTableAggregation )
+                    // InternalTableDSL.g:3842:3: ruleTableAggregation
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueElementAccess().getTableAggregationParserRuleCall_4()); 
@@ -13236,10 +13219,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 6 :
-                    // InternalTableDSL.g:3853:2: ( ruleTableOrdinal )
+                    // InternalTableDSL.g:3847:2: ( ruleTableOrdinal )
                     {
-                    // InternalTableDSL.g:3853:2: ( ruleTableOrdinal )
-                    // InternalTableDSL.g:3854:3: ruleTableOrdinal
+                    // InternalTableDSL.g:3847:2: ( ruleTableOrdinal )
+                    // InternalTableDSL.g:3848:3: ruleTableOrdinal
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueElementAccess().getTableOrdinalParserRuleCall_5()); 
@@ -13259,10 +13242,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 7 :
-                    // InternalTableDSL.g:3859:2: ( ruleTableColumn )
+                    // InternalTableDSL.g:3853:2: ( ruleTableColumn )
                     {
-                    // InternalTableDSL.g:3859:2: ( ruleTableColumn )
-                    // InternalTableDSL.g:3860:3: ruleTableColumn
+                    // InternalTableDSL.g:3853:2: ( ruleTableColumn )
+                    // InternalTableDSL.g:3854:3: ruleTableColumn
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueElementAccess().getTableColumnParserRuleCall_6()); 
@@ -13282,10 +13265,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 8 :
-                    // InternalTableDSL.g:3865:2: ( ruleTableTask )
+                    // InternalTableDSL.g:3859:2: ( ruleTableTask )
                     {
-                    // InternalTableDSL.g:3865:2: ( ruleTableTask )
-                    // InternalTableDSL.g:3866:3: ruleTableTask
+                    // InternalTableDSL.g:3859:2: ( ruleTableTask )
+                    // InternalTableDSL.g:3860:3: ruleTableTask
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueElementAccess().getTableTaskParserRuleCall_7()); 
@@ -13305,10 +13288,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 9 :
-                    // InternalTableDSL.g:3871:2: ( ruleTableAllColumns )
+                    // InternalTableDSL.g:3865:2: ( ruleTableAllColumns )
                     {
-                    // InternalTableDSL.g:3871:2: ( ruleTableAllColumns )
-                    // InternalTableDSL.g:3872:3: ruleTableAllColumns
+                    // InternalTableDSL.g:3865:2: ( ruleTableAllColumns )
+                    // InternalTableDSL.g:3866:3: ruleTableAllColumns
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueElementAccess().getTableAllColumnsParserRuleCall_8()); 
@@ -13345,13 +13328,13 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableInterval__Alternatives"
-    // InternalTableDSL.g:3881:1: rule__TableInterval__Alternatives : ( ( ruleTableNumberInterval ) | ( ruleTableIntInterval ) | ( ruleTableDateDayInterval ) );
+    // InternalTableDSL.g:3875:1: rule__TableInterval__Alternatives : ( ( ruleTableNumberInterval ) | ( ruleTableIntInterval ) | ( ruleTableDateDayInterval ) );
     public final void rule__TableInterval__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:3885:1: ( ( ruleTableNumberInterval ) | ( ruleTableIntInterval ) | ( ruleTableDateDayInterval ) )
+            // InternalTableDSL.g:3879:1: ( ( ruleTableNumberInterval ) | ( ruleTableIntInterval ) | ( ruleTableDateDayInterval ) )
             int alt6=3;
             switch ( input.LA(1) ) {
             case 101:
@@ -13379,10 +13362,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
             switch (alt6) {
                 case 1 :
-                    // InternalTableDSL.g:3886:2: ( ruleTableNumberInterval )
+                    // InternalTableDSL.g:3880:2: ( ruleTableNumberInterval )
                     {
-                    // InternalTableDSL.g:3886:2: ( ruleTableNumberInterval )
-                    // InternalTableDSL.g:3887:3: ruleTableNumberInterval
+                    // InternalTableDSL.g:3880:2: ( ruleTableNumberInterval )
+                    // InternalTableDSL.g:3881:3: ruleTableNumberInterval
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableIntervalAccess().getTableNumberIntervalParserRuleCall_0()); 
@@ -13402,10 +13385,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:3892:2: ( ruleTableIntInterval )
+                    // InternalTableDSL.g:3886:2: ( ruleTableIntInterval )
                     {
-                    // InternalTableDSL.g:3892:2: ( ruleTableIntInterval )
-                    // InternalTableDSL.g:3893:3: ruleTableIntInterval
+                    // InternalTableDSL.g:3886:2: ( ruleTableIntInterval )
+                    // InternalTableDSL.g:3887:3: ruleTableIntInterval
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableIntervalAccess().getTableIntIntervalParserRuleCall_1()); 
@@ -13425,10 +13408,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:3898:2: ( ruleTableDateDayInterval )
+                    // InternalTableDSL.g:3892:2: ( ruleTableDateDayInterval )
                     {
-                    // InternalTableDSL.g:3898:2: ( ruleTableDateDayInterval )
-                    // InternalTableDSL.g:3899:3: ruleTableDateDayInterval
+                    // InternalTableDSL.g:3892:2: ( ruleTableDateDayInterval )
+                    // InternalTableDSL.g:3893:3: ruleTableDateDayInterval
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableIntervalAccess().getTableDateDayIntervalParserRuleCall_2()); 
@@ -13465,13 +13448,13 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableLookup__Alternatives"
-    // InternalTableDSL.g:3908:1: rule__TableLookup__Alternatives : ( ( ruleTableNumberLookup ) | ( ruleTableIntLookup ) | ( ruleTableStringLookup ) | ( ruleTableDateDayLookup ) );
+    // InternalTableDSL.g:3902:1: rule__TableLookup__Alternatives : ( ( ruleTableNumberLookup ) | ( ruleTableIntLookup ) | ( ruleTableStringLookup ) | ( ruleTableDateDayLookup ) );
     public final void rule__TableLookup__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:3912:1: ( ( ruleTableNumberLookup ) | ( ruleTableIntLookup ) | ( ruleTableStringLookup ) | ( ruleTableDateDayLookup ) )
+            // InternalTableDSL.g:3906:1: ( ( ruleTableNumberLookup ) | ( ruleTableIntLookup ) | ( ruleTableStringLookup ) | ( ruleTableDateDayLookup ) )
             int alt7=4;
             switch ( input.LA(1) ) {
             case 105:
@@ -13504,10 +13487,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
             switch (alt7) {
                 case 1 :
-                    // InternalTableDSL.g:3913:2: ( ruleTableNumberLookup )
+                    // InternalTableDSL.g:3907:2: ( ruleTableNumberLookup )
                     {
-                    // InternalTableDSL.g:3913:2: ( ruleTableNumberLookup )
-                    // InternalTableDSL.g:3914:3: ruleTableNumberLookup
+                    // InternalTableDSL.g:3907:2: ( ruleTableNumberLookup )
+                    // InternalTableDSL.g:3908:3: ruleTableNumberLookup
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableLookupAccess().getTableNumberLookupParserRuleCall_0()); 
@@ -13527,10 +13510,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:3919:2: ( ruleTableIntLookup )
+                    // InternalTableDSL.g:3913:2: ( ruleTableIntLookup )
                     {
-                    // InternalTableDSL.g:3919:2: ( ruleTableIntLookup )
-                    // InternalTableDSL.g:3920:3: ruleTableIntLookup
+                    // InternalTableDSL.g:3913:2: ( ruleTableIntLookup )
+                    // InternalTableDSL.g:3914:3: ruleTableIntLookup
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableLookupAccess().getTableIntLookupParserRuleCall_1()); 
@@ -13550,10 +13533,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:3925:2: ( ruleTableStringLookup )
+                    // InternalTableDSL.g:3919:2: ( ruleTableStringLookup )
                     {
-                    // InternalTableDSL.g:3925:2: ( ruleTableStringLookup )
-                    // InternalTableDSL.g:3926:3: ruleTableStringLookup
+                    // InternalTableDSL.g:3919:2: ( ruleTableStringLookup )
+                    // InternalTableDSL.g:3920:3: ruleTableStringLookup
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableLookupAccess().getTableStringLookupParserRuleCall_2()); 
@@ -13573,10 +13556,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:3931:2: ( ruleTableDateDayLookup )
+                    // InternalTableDSL.g:3925:2: ( ruleTableDateDayLookup )
                     {
-                    // InternalTableDSL.g:3931:2: ( ruleTableDateDayLookup )
-                    // InternalTableDSL.g:3932:3: ruleTableDateDayLookup
+                    // InternalTableDSL.g:3925:2: ( ruleTableDateDayLookup )
+                    // InternalTableDSL.g:3926:3: ruleTableDateDayLookup
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableLookupAccess().getTableDateDayLookupParserRuleCall_3()); 
@@ -13613,13 +13596,13 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableRangeElement__Alternatives"
-    // InternalTableDSL.g:3941:1: rule__TableRangeElement__Alternatives : ( ( ruleTableTextColor ) | ( ruleTableCellColor ) | ( ruleTableIcon ) | ( ruleTableTrend ) | ( ruleTableTooltip ) );
+    // InternalTableDSL.g:3935:1: rule__TableRangeElement__Alternatives : ( ( ruleTableTextColor ) | ( ruleTableCellColor ) | ( ruleTableIcon ) | ( ruleTableTrend ) | ( ruleTableTooltip ) );
     public final void rule__TableRangeElement__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:3945:1: ( ( ruleTableTextColor ) | ( ruleTableCellColor ) | ( ruleTableIcon ) | ( ruleTableTrend ) | ( ruleTableTooltip ) )
+            // InternalTableDSL.g:3939:1: ( ( ruleTableTextColor ) | ( ruleTableCellColor ) | ( ruleTableIcon ) | ( ruleTableTrend ) | ( ruleTableTooltip ) )
             int alt8=5;
             switch ( input.LA(1) ) {
             case 109:
@@ -13657,10 +13640,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
             switch (alt8) {
                 case 1 :
-                    // InternalTableDSL.g:3946:2: ( ruleTableTextColor )
+                    // InternalTableDSL.g:3940:2: ( ruleTableTextColor )
                     {
-                    // InternalTableDSL.g:3946:2: ( ruleTableTextColor )
-                    // InternalTableDSL.g:3947:3: ruleTableTextColor
+                    // InternalTableDSL.g:3940:2: ( ruleTableTextColor )
+                    // InternalTableDSL.g:3941:3: ruleTableTextColor
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableRangeElementAccess().getTableTextColorParserRuleCall_0()); 
@@ -13680,10 +13663,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:3952:2: ( ruleTableCellColor )
+                    // InternalTableDSL.g:3946:2: ( ruleTableCellColor )
                     {
-                    // InternalTableDSL.g:3952:2: ( ruleTableCellColor )
-                    // InternalTableDSL.g:3953:3: ruleTableCellColor
+                    // InternalTableDSL.g:3946:2: ( ruleTableCellColor )
+                    // InternalTableDSL.g:3947:3: ruleTableCellColor
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableRangeElementAccess().getTableCellColorParserRuleCall_1()); 
@@ -13703,10 +13686,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:3958:2: ( ruleTableIcon )
+                    // InternalTableDSL.g:3952:2: ( ruleTableIcon )
                     {
-                    // InternalTableDSL.g:3958:2: ( ruleTableIcon )
-                    // InternalTableDSL.g:3959:3: ruleTableIcon
+                    // InternalTableDSL.g:3952:2: ( ruleTableIcon )
+                    // InternalTableDSL.g:3953:3: ruleTableIcon
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableRangeElementAccess().getTableIconParserRuleCall_2()); 
@@ -13726,10 +13709,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:3964:2: ( ruleTableTrend )
+                    // InternalTableDSL.g:3958:2: ( ruleTableTrend )
                     {
-                    // InternalTableDSL.g:3964:2: ( ruleTableTrend )
-                    // InternalTableDSL.g:3965:3: ruleTableTrend
+                    // InternalTableDSL.g:3958:2: ( ruleTableTrend )
+                    // InternalTableDSL.g:3959:3: ruleTableTrend
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableRangeElementAccess().getTableTrendParserRuleCall_3()); 
@@ -13749,10 +13732,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:3970:2: ( ruleTableTooltip )
+                    // InternalTableDSL.g:3964:2: ( ruleTableTooltip )
                     {
-                    // InternalTableDSL.g:3970:2: ( ruleTableTooltip )
-                    // InternalTableDSL.g:3971:3: ruleTableTooltip
+                    // InternalTableDSL.g:3964:2: ( ruleTableTooltip )
+                    // InternalTableDSL.g:3965:3: ruleTableTooltip
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableRangeElementAccess().getTableTooltipParserRuleCall_4()); 
@@ -13789,46 +13772,46 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyStyle__Alternatives"
-    // InternalTableDSL.g:3980:1: rule__PropertyStyle__Alternatives : ( ( rulePropertyButtonStyle ) | ( rulePropertyHtmlStyle ) | ( rulePropertyProgressbarStyle ) | ( rulePropertyTextStyle ) | ( rulePropertyBooleanStyle ) | ( rulePropertyDateStyle ) | ( rulePropertyNumberStyle ) | ( rulePropertyImageStyle ) | ( ruleGridPropIndicatorStyle ) );
+    // InternalTableDSL.g:3974:1: rule__PropertyStyle__Alternatives : ( ( rulePropertyButtonStyle ) | ( rulePropertyHtmlStyle ) | ( rulePropertyProgressbarStyle ) | ( rulePropertyTextStyle ) | ( rulePropertyBooleanStyle ) | ( rulePropertyDateStyle ) | ( rulePropertyNumberStyle ) | ( rulePropertyImageStyle ) | ( rulePropertyBlobImageStyle ) | ( ruleGridPropIndicatorStyle ) );
     public final void rule__PropertyStyle__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:3984:1: ( ( rulePropertyButtonStyle ) | ( rulePropertyHtmlStyle ) | ( rulePropertyProgressbarStyle ) | ( rulePropertyTextStyle ) | ( rulePropertyBooleanStyle ) | ( rulePropertyDateStyle ) | ( rulePropertyNumberStyle ) | ( rulePropertyImageStyle ) | ( ruleGridPropIndicatorStyle ) )
-            int alt9=9;
+            // InternalTableDSL.g:3978:1: ( ( rulePropertyButtonStyle ) | ( rulePropertyHtmlStyle ) | ( rulePropertyProgressbarStyle ) | ( rulePropertyTextStyle ) | ( rulePropertyBooleanStyle ) | ( rulePropertyDateStyle ) | ( rulePropertyNumberStyle ) | ( rulePropertyImageStyle ) | ( rulePropertyBlobImageStyle ) | ( ruleGridPropIndicatorStyle ) )
+            int alt9=10;
             switch ( input.LA(1) ) {
-            case 118:
+            case 117:
                 {
                 alt9=1;
                 }
                 break;
-            case 120:
+            case 119:
                 {
                 alt9=2;
                 }
                 break;
-            case 125:
+            case 124:
                 {
                 alt9=3;
                 }
                 break;
-            case 130:
+            case 129:
                 {
                 alt9=4;
                 }
                 break;
-            case 121:
+            case 120:
                 {
                 alt9=5;
                 }
                 break;
-            case 122:
+            case 121:
                 {
                 alt9=6;
                 }
                 break;
-            case 124:
+            case 123:
                 {
                 alt9=7;
                 }
@@ -13838,11 +13821,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                 alt9=8;
                 }
                 break;
-            case 127:
+            case 130:
                 {
                 alt9=9;
                 }
                 break;
+            case 126:
+                {
+                alt9=10;
+                }
+                break;
             default:
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
@@ -13853,10 +13841,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
             switch (alt9) {
                 case 1 :
-                    // InternalTableDSL.g:3985:2: ( rulePropertyButtonStyle )
+                    // InternalTableDSL.g:3979:2: ( rulePropertyButtonStyle )
                     {
-                    // InternalTableDSL.g:3985:2: ( rulePropertyButtonStyle )
-                    // InternalTableDSL.g:3986:3: rulePropertyButtonStyle
+                    // InternalTableDSL.g:3979:2: ( rulePropertyButtonStyle )
+                    // InternalTableDSL.g:3980:3: rulePropertyButtonStyle
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPropertyStyleAccess().getPropertyButtonStyleParserRuleCall_0()); 
@@ -13876,10 +13864,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:3991:2: ( rulePropertyHtmlStyle )
+                    // InternalTableDSL.g:3985:2: ( rulePropertyHtmlStyle )
                     {
-                    // InternalTableDSL.g:3991:2: ( rulePropertyHtmlStyle )
-                    // InternalTableDSL.g:3992:3: rulePropertyHtmlStyle
+                    // InternalTableDSL.g:3985:2: ( rulePropertyHtmlStyle )
+                    // InternalTableDSL.g:3986:3: rulePropertyHtmlStyle
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPropertyStyleAccess().getPropertyHtmlStyleParserRuleCall_1()); 
@@ -13899,10 +13887,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:3997:2: ( rulePropertyProgressbarStyle )
+                    // InternalTableDSL.g:3991:2: ( rulePropertyProgressbarStyle )
                     {
-                    // InternalTableDSL.g:3997:2: ( rulePropertyProgressbarStyle )
-                    // InternalTableDSL.g:3998:3: rulePropertyProgressbarStyle
+                    // InternalTableDSL.g:3991:2: ( rulePropertyProgressbarStyle )
+                    // InternalTableDSL.g:3992:3: rulePropertyProgressbarStyle
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPropertyStyleAccess().getPropertyProgressbarStyleParserRuleCall_2()); 
@@ -13922,10 +13910,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:4003:2: ( rulePropertyTextStyle )
+                    // InternalTableDSL.g:3997:2: ( rulePropertyTextStyle )
                     {
-                    // InternalTableDSL.g:4003:2: ( rulePropertyTextStyle )
-                    // InternalTableDSL.g:4004:3: rulePropertyTextStyle
+                    // InternalTableDSL.g:3997:2: ( rulePropertyTextStyle )
+                    // InternalTableDSL.g:3998:3: rulePropertyTextStyle
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPropertyStyleAccess().getPropertyTextStyleParserRuleCall_3()); 
@@ -13945,10 +13933,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:4009:2: ( rulePropertyBooleanStyle )
+                    // InternalTableDSL.g:4003:2: ( rulePropertyBooleanStyle )
                     {
-                    // InternalTableDSL.g:4009:2: ( rulePropertyBooleanStyle )
-                    // InternalTableDSL.g:4010:3: rulePropertyBooleanStyle
+                    // InternalTableDSL.g:4003:2: ( rulePropertyBooleanStyle )
+                    // InternalTableDSL.g:4004:3: rulePropertyBooleanStyle
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPropertyStyleAccess().getPropertyBooleanStyleParserRuleCall_4()); 
@@ -13968,10 +13956,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 6 :
-                    // InternalTableDSL.g:4015:2: ( rulePropertyDateStyle )
+                    // InternalTableDSL.g:4009:2: ( rulePropertyDateStyle )
                     {
-                    // InternalTableDSL.g:4015:2: ( rulePropertyDateStyle )
-                    // InternalTableDSL.g:4016:3: rulePropertyDateStyle
+                    // InternalTableDSL.g:4009:2: ( rulePropertyDateStyle )
+                    // InternalTableDSL.g:4010:3: rulePropertyDateStyle
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPropertyStyleAccess().getPropertyDateStyleParserRuleCall_5()); 
@@ -13991,10 +13979,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 7 :
-                    // InternalTableDSL.g:4021:2: ( rulePropertyNumberStyle )
+                    // InternalTableDSL.g:4015:2: ( rulePropertyNumberStyle )
                     {
-                    // InternalTableDSL.g:4021:2: ( rulePropertyNumberStyle )
-                    // InternalTableDSL.g:4022:3: rulePropertyNumberStyle
+                    // InternalTableDSL.g:4015:2: ( rulePropertyNumberStyle )
+                    // InternalTableDSL.g:4016:3: rulePropertyNumberStyle
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPropertyStyleAccess().getPropertyNumberStyleParserRuleCall_6()); 
@@ -14014,10 +14002,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 8 :
-                    // InternalTableDSL.g:4027:2: ( rulePropertyImageStyle )
+                    // InternalTableDSL.g:4021:2: ( rulePropertyImageStyle )
                     {
-                    // InternalTableDSL.g:4027:2: ( rulePropertyImageStyle )
-                    // InternalTableDSL.g:4028:3: rulePropertyImageStyle
+                    // InternalTableDSL.g:4021:2: ( rulePropertyImageStyle )
+                    // InternalTableDSL.g:4022:3: rulePropertyImageStyle
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPropertyStyleAccess().getPropertyImageStyleParserRuleCall_7()); 
@@ -14037,13 +14025,36 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 9 :
+                    // InternalTableDSL.g:4027:2: ( rulePropertyBlobImageStyle )
+                    {
+                    // InternalTableDSL.g:4027:2: ( rulePropertyBlobImageStyle )
+                    // InternalTableDSL.g:4028:3: rulePropertyBlobImageStyle
+                    {
+                    if ( state.backtracking==0 ) {
+                       before(grammarAccess.getPropertyStyleAccess().getPropertyBlobImageStyleParserRuleCall_8()); 
+                    }
+                    pushFollow(FOLLOW_2);
+                    rulePropertyBlobImageStyle();
+
+                    state._fsp--;
+                    if (state.failed) return ;
+                    if ( state.backtracking==0 ) {
+                       after(grammarAccess.getPropertyStyleAccess().getPropertyBlobImageStyleParserRuleCall_8()); 
+                    }
+
+                    }
+
+
+                    }
+                    break;
+                case 10 :
                     // InternalTableDSL.g:4033:2: ( ruleGridPropIndicatorStyle )
                     {
                     // InternalTableDSL.g:4033:2: ( ruleGridPropIndicatorStyle )
                     // InternalTableDSL.g:4034:3: ruleGridPropIndicatorStyle
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getPropertyStyleAccess().getGridPropIndicatorStyleParserRuleCall_8()); 
+                       before(grammarAccess.getPropertyStyleAccess().getGridPropIndicatorStyleParserRuleCall_9()); 
                     }
                     pushFollow(FOLLOW_2);
                     ruleGridPropIndicatorStyle();
@@ -14051,7 +14062,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     state._fsp--;
                     if (state.failed) return ;
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getPropertyStyleAccess().getGridPropIndicatorStyleParserRuleCall_8()); 
+                       after(grammarAccess.getPropertyStyleAccess().getGridPropIndicatorStyleParserRuleCall_9()); 
                     }
 
                     }
@@ -14754,7 +14765,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             if ( (LA17_0==134) ) {
                 alt17=1;
             }
-            else if ( ((LA17_0>=RULE_STRING && LA17_0<=RULE_DECIMAL)||(LA17_0>=19 && LA17_0<=20)||LA17_0==32||LA17_0==43||(LA17_0>=48 && LA17_0<=53)||LA17_0==75||LA17_0==135||(LA17_0>=139 && LA17_0<=140)||LA17_0==142||LA17_0==144||(LA17_0>=147 && LA17_0<=155)||LA17_0==157||LA17_0==184) ) {
+            else if ( ((LA17_0>=RULE_STRING && LA17_0<=RULE_DECIMAL)||(LA17_0>=19 && LA17_0<=20)||LA17_0==32||LA17_0==43||(LA17_0>=48 && LA17_0<=53)||LA17_0==75||LA17_0==135||(LA17_0>=139 && LA17_0<=140)||LA17_0==142||LA17_0==144||(LA17_0>=147 && LA17_0<=155)||LA17_0==157||LA17_0==181) ) {
                 alt17=2;
             }
             else {
@@ -14845,7 +14856,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                 if ( (LA18_1==15) ) {
                     alt18=1;
                 }
-                else if ( (LA18_1==EOF||(LA18_1>=RULE_STRING && LA18_1<=RULE_DECIMAL)||(LA18_1>=16 && LA18_1<=17)||(LA18_1>=19 && LA18_1<=53)||LA18_1==68||(LA18_1>=75 && LA18_1<=76)||LA18_1==78||LA18_1==133||(LA18_1>=135 && LA18_1<=158)||(LA18_1>=180 && LA18_1<=181)||(LA18_1>=183 && LA18_1<=184)) ) {
+                else if ( (LA18_1==EOF||(LA18_1>=RULE_STRING && LA18_1<=RULE_DECIMAL)||(LA18_1>=16 && LA18_1<=17)||(LA18_1>=19 && LA18_1<=53)||LA18_1==68||(LA18_1>=75 && LA18_1<=76)||LA18_1==78||LA18_1==133||(LA18_1>=135 && LA18_1<=158)||(LA18_1>=177 && LA18_1<=178)||(LA18_1>=180 && LA18_1<=181)) ) {
                     alt18=2;
                 }
                 else {
@@ -14864,7 +14875,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                 if ( (LA18_2==15) ) {
                     alt18=1;
                 }
-                else if ( (LA18_2==EOF||(LA18_2>=RULE_STRING && LA18_2<=RULE_DECIMAL)||(LA18_2>=16 && LA18_2<=17)||(LA18_2>=19 && LA18_2<=53)||LA18_2==68||(LA18_2>=75 && LA18_2<=76)||LA18_2==78||LA18_2==133||(LA18_2>=135 && LA18_2<=158)||(LA18_2>=180 && LA18_2<=181)||(LA18_2>=183 && LA18_2<=184)) ) {
+                else if ( (LA18_2==EOF||(LA18_2>=RULE_STRING && LA18_2<=RULE_DECIMAL)||(LA18_2>=16 && LA18_2<=17)||(LA18_2>=19 && LA18_2<=53)||LA18_2==68||(LA18_2>=75 && LA18_2<=76)||LA18_2==78||LA18_2==133||(LA18_2>=135 && LA18_2<=158)||(LA18_2>=177 && LA18_2<=178)||(LA18_2>=180 && LA18_2<=181)) ) {
                     alt18=2;
                 }
                 else {
@@ -14880,7 +14891,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                 {
                 int LA18_3 = input.LA(2);
 
-                if ( (LA18_3==EOF||(LA18_3>=RULE_STRING && LA18_3<=RULE_DECIMAL)||(LA18_3>=16 && LA18_3<=17)||(LA18_3>=19 && LA18_3<=53)||LA18_3==68||(LA18_3>=75 && LA18_3<=76)||LA18_3==78||LA18_3==133||(LA18_3>=135 && LA18_3<=158)||(LA18_3>=180 && LA18_3<=181)||(LA18_3>=183 && LA18_3<=184)) ) {
+                if ( (LA18_3==EOF||(LA18_3>=RULE_STRING && LA18_3<=RULE_DECIMAL)||(LA18_3>=16 && LA18_3<=17)||(LA18_3>=19 && LA18_3<=53)||LA18_3==68||(LA18_3>=75 && LA18_3<=76)||LA18_3==78||LA18_3==133||(LA18_3>=135 && LA18_3<=158)||(LA18_3>=177 && LA18_3<=178)||(LA18_3>=180 && LA18_3<=181)) ) {
                     alt18=2;
                 }
                 else if ( (LA18_3==15) ) {
@@ -14902,7 +14913,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                 if ( (LA18_4==15) ) {
                     alt18=1;
                 }
-                else if ( (LA18_4==EOF||(LA18_4>=RULE_STRING && LA18_4<=RULE_DECIMAL)||(LA18_4>=16 && LA18_4<=17)||(LA18_4>=19 && LA18_4<=53)||LA18_4==68||(LA18_4>=75 && LA18_4<=76)||LA18_4==78||LA18_4==133||(LA18_4>=135 && LA18_4<=158)||(LA18_4>=180 && LA18_4<=181)||(LA18_4>=183 && LA18_4<=184)) ) {
+                else if ( (LA18_4==EOF||(LA18_4>=RULE_STRING && LA18_4<=RULE_DECIMAL)||(LA18_4>=16 && LA18_4<=17)||(LA18_4>=19 && LA18_4<=53)||LA18_4==68||(LA18_4>=75 && LA18_4<=76)||LA18_4==78||LA18_4==133||(LA18_4>=135 && LA18_4<=158)||(LA18_4>=177 && LA18_4<=178)||(LA18_4>=180 && LA18_4<=181)) ) {
                     alt18=2;
                 }
                 else {
@@ -14918,7 +14929,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                 {
                 int LA18_5 = input.LA(2);
 
-                if ( (LA18_5==EOF||(LA18_5>=RULE_STRING && LA18_5<=RULE_DECIMAL)||(LA18_5>=16 && LA18_5<=17)||(LA18_5>=19 && LA18_5<=53)||LA18_5==68||(LA18_5>=75 && LA18_5<=76)||LA18_5==78||LA18_5==133||(LA18_5>=135 && LA18_5<=158)||(LA18_5>=180 && LA18_5<=181)||(LA18_5>=183 && LA18_5<=184)) ) {
+                if ( (LA18_5==EOF||(LA18_5>=RULE_STRING && LA18_5<=RULE_DECIMAL)||(LA18_5>=16 && LA18_5<=17)||(LA18_5>=19 && LA18_5<=53)||LA18_5==68||(LA18_5>=75 && LA18_5<=76)||LA18_5==78||LA18_5==133||(LA18_5>=135 && LA18_5<=158)||(LA18_5>=177 && LA18_5<=178)||(LA18_5>=180 && LA18_5<=181)) ) {
                     alt18=2;
                 }
                 else if ( (LA18_5==15) ) {
@@ -14959,7 +14970,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             case 154:
             case 155:
             case 157:
-            case 184:
+            case 181:
                 {
                 alt18=2;
                 }
@@ -15523,12 +15534,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                 {
                 int LA22_2 = input.LA(2);
 
-                if ( (LA22_2==15) ) {
-                    alt22=2;
-                }
-                else if ( (LA22_2==EOF||(LA22_2>=RULE_STRING && LA22_2<=RULE_DECIMAL)||(LA22_2>=19 && LA22_2<=20)||LA22_2==32||LA22_2==43||(LA22_2>=48 && LA22_2<=53)||LA22_2==75||LA22_2==135||(LA22_2>=139 && LA22_2<=140)||LA22_2==142||LA22_2==144||(LA22_2>=147 && LA22_2<=155)||LA22_2==157||LA22_2==184) ) {
+                if ( (LA22_2==EOF||(LA22_2>=RULE_STRING && LA22_2<=RULE_DECIMAL)||(LA22_2>=19 && LA22_2<=20)||LA22_2==32||LA22_2==43||(LA22_2>=48 && LA22_2<=53)||LA22_2==75||LA22_2==135||(LA22_2>=139 && LA22_2<=140)||LA22_2==142||LA22_2==144||(LA22_2>=147 && LA22_2<=155)||LA22_2==157||LA22_2==181) ) {
                     alt22=4;
                 }
+                else if ( (LA22_2==15) ) {
+                    alt22=2;
+                }
                 else {
                     if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
@@ -15901,7 +15912,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                 if ( (LA24_1==31) ) {
                     alt24=1;
                 }
-                else if ( (LA24_1==EOF||(LA24_1>=RULE_STRING && LA24_1<=RULE_DECIMAL)||(LA24_1>=19 && LA24_1<=20)||LA24_1==32||LA24_1==43||(LA24_1>=48 && LA24_1<=53)||LA24_1==75||LA24_1==135||(LA24_1>=139 && LA24_1<=140)||LA24_1==142||LA24_1==144||(LA24_1>=147 && LA24_1<=155)||LA24_1==157||LA24_1==184) ) {
+                else if ( (LA24_1==EOF||(LA24_1>=RULE_STRING && LA24_1<=RULE_DECIMAL)||(LA24_1>=19 && LA24_1<=20)||LA24_1==32||LA24_1==43||(LA24_1>=48 && LA24_1<=53)||LA24_1==75||LA24_1==135||(LA24_1>=139 && LA24_1<=140)||LA24_1==142||LA24_1==144||(LA24_1>=147 && LA24_1<=155)||LA24_1==157||LA24_1==181) ) {
                     alt24=2;
                 }
                 else {
@@ -16334,7 +16345,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             if ( ((LA28_0>=19 && LA28_0<=20)||LA28_0==43) ) {
                 alt28=1;
             }
-            else if ( ((LA28_0>=RULE_STRING && LA28_0<=RULE_DECIMAL)||LA28_0==32||(LA28_0>=48 && LA28_0<=53)||LA28_0==75||LA28_0==135||(LA28_0>=139 && LA28_0<=140)||LA28_0==142||LA28_0==144||(LA28_0>=147 && LA28_0<=155)||LA28_0==157||LA28_0==184) ) {
+            else if ( ((LA28_0>=RULE_STRING && LA28_0<=RULE_DECIMAL)||LA28_0==32||(LA28_0>=48 && LA28_0<=53)||LA28_0==75||LA28_0==135||(LA28_0>=139 && LA28_0<=140)||LA28_0==142||LA28_0==144||(LA28_0>=147 && LA28_0<=155)||LA28_0==157||LA28_0==181) ) {
                 alt28=2;
             }
             else {
@@ -16702,7 +16713,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             if ( (LA32_0==46) ) {
                 alt32=1;
             }
-            else if ( (LA32_0==180) ) {
+            else if ( (LA32_0==177) ) {
                 alt32=2;
             }
             else {
@@ -16793,12 +16804,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                 alt33=1;
                 }
                 break;
-            case 181:
+            case 178:
                 {
                 alt33=2;
                 }
                 break;
-            case 180:
+            case 177:
                 {
                 alt33=3;
                 }
@@ -17398,7 +17409,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                 }
                 break;
             case 53:
-            case 184:
+            case 181:
                 {
                 alt36=3;
                 }
@@ -17914,10 +17925,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             int alt40=2;
             int LA40_0 = input.LA(1);
 
-            if ( (LA40_0==47||LA40_0==183) ) {
+            if ( (LA40_0==47||LA40_0==180) ) {
                 alt40=1;
             }
-            else if ( ((LA40_0>=RULE_STRING && LA40_0<=RULE_DECIMAL)||(LA40_0>=19 && LA40_0<=20)||LA40_0==32||LA40_0==43||(LA40_0>=48 && LA40_0<=53)||LA40_0==75||LA40_0==135||(LA40_0>=139 && LA40_0<=140)||LA40_0==142||LA40_0==144||(LA40_0>=147 && LA40_0<=155)||LA40_0==157||LA40_0==184) ) {
+            else if ( ((LA40_0>=RULE_STRING && LA40_0<=RULE_DECIMAL)||(LA40_0>=19 && LA40_0<=20)||LA40_0==32||LA40_0==43||(LA40_0>=48 && LA40_0<=53)||LA40_0==75||LA40_0==135||(LA40_0>=139 && LA40_0<=140)||LA40_0==142||LA40_0==144||(LA40_0>=147 && LA40_0<=155)||LA40_0==157||LA40_0==181) ) {
                 alt40=2;
             }
             else {
@@ -18002,7 +18013,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             int alt41=2;
             int LA41_0 = input.LA(1);
 
-            if ( (LA41_0==183) ) {
+            if ( (LA41_0==180) ) {
                 alt41=1;
             }
             else if ( (LA41_0==47) ) {
@@ -18625,7 +18636,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             if ( (LA47_0==53) ) {
                 alt47=1;
             }
-            else if ( (LA47_0==184) ) {
+            else if ( (LA47_0==181) ) {
                 alt47=2;
             }
             else {
@@ -22158,196 +22169,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     // $ANTLR end "rule__TableSelection__Group_3_1__1__Impl"
 
 
-    // $ANTLR start "rule__TableSelection__Group_3_2__0"
-    // InternalTableDSL.g:6056:1: rule__TableSelection__Group_3_2__0 : rule__TableSelection__Group_3_2__0__Impl rule__TableSelection__Group_3_2__1 ;
-    public final void rule__TableSelection__Group_3_2__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6060:1: ( rule__TableSelection__Group_3_2__0__Impl rule__TableSelection__Group_3_2__1 )
-            // InternalTableDSL.g:6061:2: rule__TableSelection__Group_3_2__0__Impl rule__TableSelection__Group_3_2__1
-            {
-            pushFollow(FOLLOW_20);
-            rule__TableSelection__Group_3_2__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_2);
-            rule__TableSelection__Group_3_2__1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableSelection__Group_3_2__0"
-
-
-    // $ANTLR start "rule__TableSelection__Group_3_2__0__Impl"
-    // InternalTableDSL.g:6068:1: rule__TableSelection__Group_3_2__0__Impl : ( ( rule__TableSelection__PollingAssignment_3_2_0 ) ) ;
-    public final void rule__TableSelection__Group_3_2__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6072:1: ( ( ( rule__TableSelection__PollingAssignment_3_2_0 ) ) )
-            // InternalTableDSL.g:6073:1: ( ( rule__TableSelection__PollingAssignment_3_2_0 ) )
-            {
-            // InternalTableDSL.g:6073:1: ( ( rule__TableSelection__PollingAssignment_3_2_0 ) )
-            // InternalTableDSL.g:6074:2: ( rule__TableSelection__PollingAssignment_3_2_0 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableSelectionAccess().getPollingAssignment_3_2_0()); 
-            }
-            // InternalTableDSL.g:6075:2: ( rule__TableSelection__PollingAssignment_3_2_0 )
-            // InternalTableDSL.g:6075:3: rule__TableSelection__PollingAssignment_3_2_0
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableSelection__PollingAssignment_3_2_0();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableSelectionAccess().getPollingAssignment_3_2_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableSelection__Group_3_2__0__Impl"
-
-
-    // $ANTLR start "rule__TableSelection__Group_3_2__1"
-    // InternalTableDSL.g:6083:1: rule__TableSelection__Group_3_2__1 : rule__TableSelection__Group_3_2__1__Impl ;
-    public final void rule__TableSelection__Group_3_2__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6087:1: ( rule__TableSelection__Group_3_2__1__Impl )
-            // InternalTableDSL.g:6088:2: rule__TableSelection__Group_3_2__1__Impl
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableSelection__Group_3_2__1__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableSelection__Group_3_2__1"
-
-
-    // $ANTLR start "rule__TableSelection__Group_3_2__1__Impl"
-    // InternalTableDSL.g:6094:1: rule__TableSelection__Group_3_2__1__Impl : ( ( rule__TableSelection__PollingTimeAssignment_3_2_1 ) ) ;
-    public final void rule__TableSelection__Group_3_2__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__TableSelection__Group_3_4__0"
+    // InternalTableDSL.g:6056:1: rule__TableSelection__Group_3_4__0 : rule__TableSelection__Group_3_4__0__Impl rule__TableSelection__Group_3_4__1 ;
+    public final void rule__TableSelection__Group_3_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6098:1: ( ( ( rule__TableSelection__PollingTimeAssignment_3_2_1 ) ) )
-            // InternalTableDSL.g:6099:1: ( ( rule__TableSelection__PollingTimeAssignment_3_2_1 ) )
-            {
-            // InternalTableDSL.g:6099:1: ( ( rule__TableSelection__PollingTimeAssignment_3_2_1 ) )
-            // InternalTableDSL.g:6100:2: ( rule__TableSelection__PollingTimeAssignment_3_2_1 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableSelectionAccess().getPollingTimeAssignment_3_2_1()); 
-            }
-            // InternalTableDSL.g:6101:2: ( rule__TableSelection__PollingTimeAssignment_3_2_1 )
-            // InternalTableDSL.g:6101:3: rule__TableSelection__PollingTimeAssignment_3_2_1
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableSelection__PollingTimeAssignment_3_2_1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableSelectionAccess().getPollingTimeAssignment_3_2_1()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableSelection__Group_3_2__1__Impl"
-
-
-    // $ANTLR start "rule__TableSelection__Group_3_5__0"
-    // InternalTableDSL.g:6110:1: rule__TableSelection__Group_3_5__0 : rule__TableSelection__Group_3_5__0__Impl rule__TableSelection__Group_3_5__1 ;
-    public final void rule__TableSelection__Group_3_5__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6114:1: ( rule__TableSelection__Group_3_5__0__Impl rule__TableSelection__Group_3_5__1 )
-            // InternalTableDSL.g:6115:2: rule__TableSelection__Group_3_5__0__Impl rule__TableSelection__Group_3_5__1
+            // InternalTableDSL.g:6060:1: ( rule__TableSelection__Group_3_4__0__Impl rule__TableSelection__Group_3_4__1 )
+            // InternalTableDSL.g:6061:2: rule__TableSelection__Group_3_4__0__Impl rule__TableSelection__Group_3_4__1
             {
             pushFollow(FOLLOW_7);
-            rule__TableSelection__Group_3_5__0__Impl();
+            rule__TableSelection__Group_3_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__TableSelection__Group_3_5__1();
+            rule__TableSelection__Group_3_4__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -22366,28 +22204,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableSelection__Group_3_5__0"
+    // $ANTLR end "rule__TableSelection__Group_3_4__0"
 
 
-    // $ANTLR start "rule__TableSelection__Group_3_5__0__Impl"
-    // InternalTableDSL.g:6122:1: rule__TableSelection__Group_3_5__0__Impl : ( 'toolbar' ) ;
-    public final void rule__TableSelection__Group_3_5__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__TableSelection__Group_3_4__0__Impl"
+    // InternalTableDSL.g:6068:1: rule__TableSelection__Group_3_4__0__Impl : ( 'toolbar' ) ;
+    public final void rule__TableSelection__Group_3_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6126:1: ( ( 'toolbar' ) )
-            // InternalTableDSL.g:6127:1: ( 'toolbar' )
+            // InternalTableDSL.g:6072:1: ( ( 'toolbar' ) )
+            // InternalTableDSL.g:6073:1: ( 'toolbar' )
             {
-            // InternalTableDSL.g:6127:1: ( 'toolbar' )
-            // InternalTableDSL.g:6128:2: 'toolbar'
+            // InternalTableDSL.g:6073:1: ( 'toolbar' )
+            // InternalTableDSL.g:6074:2: 'toolbar'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableSelectionAccess().getToolbarKeyword_3_5_0()); 
+               before(grammarAccess.getTableSelectionAccess().getToolbarKeyword_3_4_0()); 
             }
             match(input,81,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableSelectionAccess().getToolbarKeyword_3_5_0()); 
+               after(grammarAccess.getTableSelectionAccess().getToolbarKeyword_3_4_0()); 
             }
 
             }
@@ -22407,21 +22245,21 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableSelection__Group_3_5__0__Impl"
+    // $ANTLR end "rule__TableSelection__Group_3_4__0__Impl"
 
 
-    // $ANTLR start "rule__TableSelection__Group_3_5__1"
-    // InternalTableDSL.g:6137:1: rule__TableSelection__Group_3_5__1 : rule__TableSelection__Group_3_5__1__Impl ;
-    public final void rule__TableSelection__Group_3_5__1() throws RecognitionException {
+    // $ANTLR start "rule__TableSelection__Group_3_4__1"
+    // InternalTableDSL.g:6083:1: rule__TableSelection__Group_3_4__1 : rule__TableSelection__Group_3_4__1__Impl ;
+    public final void rule__TableSelection__Group_3_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6141:1: ( rule__TableSelection__Group_3_5__1__Impl )
-            // InternalTableDSL.g:6142:2: rule__TableSelection__Group_3_5__1__Impl
+            // InternalTableDSL.g:6087:1: ( rule__TableSelection__Group_3_4__1__Impl )
+            // InternalTableDSL.g:6088:2: rule__TableSelection__Group_3_4__1__Impl
             {
             pushFollow(FOLLOW_2);
-            rule__TableSelection__Group_3_5__1__Impl();
+            rule__TableSelection__Group_3_4__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -22440,30 +22278,30 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableSelection__Group_3_5__1"
+    // $ANTLR end "rule__TableSelection__Group_3_4__1"
 
 
-    // $ANTLR start "rule__TableSelection__Group_3_5__1__Impl"
-    // InternalTableDSL.g:6148:1: rule__TableSelection__Group_3_5__1__Impl : ( ( rule__TableSelection__ToolbarAssignment_3_5_1 ) ) ;
-    public final void rule__TableSelection__Group_3_5__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__TableSelection__Group_3_4__1__Impl"
+    // InternalTableDSL.g:6094:1: rule__TableSelection__Group_3_4__1__Impl : ( ( rule__TableSelection__ToolbarAssignment_3_4_1 ) ) ;
+    public final void rule__TableSelection__Group_3_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6152:1: ( ( ( rule__TableSelection__ToolbarAssignment_3_5_1 ) ) )
-            // InternalTableDSL.g:6153:1: ( ( rule__TableSelection__ToolbarAssignment_3_5_1 ) )
+            // InternalTableDSL.g:6098:1: ( ( ( rule__TableSelection__ToolbarAssignment_3_4_1 ) ) )
+            // InternalTableDSL.g:6099:1: ( ( rule__TableSelection__ToolbarAssignment_3_4_1 ) )
             {
-            // InternalTableDSL.g:6153:1: ( ( rule__TableSelection__ToolbarAssignment_3_5_1 ) )
-            // InternalTableDSL.g:6154:2: ( rule__TableSelection__ToolbarAssignment_3_5_1 )
+            // InternalTableDSL.g:6099:1: ( ( rule__TableSelection__ToolbarAssignment_3_4_1 ) )
+            // InternalTableDSL.g:6100:2: ( rule__TableSelection__ToolbarAssignment_3_4_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableSelectionAccess().getToolbarAssignment_3_5_1()); 
+               before(grammarAccess.getTableSelectionAccess().getToolbarAssignment_3_4_1()); 
             }
-            // InternalTableDSL.g:6155:2: ( rule__TableSelection__ToolbarAssignment_3_5_1 )
-            // InternalTableDSL.g:6155:3: rule__TableSelection__ToolbarAssignment_3_5_1
+            // InternalTableDSL.g:6101:2: ( rule__TableSelection__ToolbarAssignment_3_4_1 )
+            // InternalTableDSL.g:6101:3: rule__TableSelection__ToolbarAssignment_3_4_1
             {
             pushFollow(FOLLOW_2);
-            rule__TableSelection__ToolbarAssignment_3_5_1();
+            rule__TableSelection__ToolbarAssignment_3_4_1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -22471,7 +22309,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableSelectionAccess().getToolbarAssignment_3_5_1()); 
+               after(grammarAccess.getTableSelectionAccess().getToolbarAssignment_3_4_1()); 
             }
 
             }
@@ -22491,20 +22329,20 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableSelection__Group_3_5__1__Impl"
+    // $ANTLR end "rule__TableSelection__Group_3_4__1__Impl"
 
 
     // $ANTLR start "rule__TableSelection__Group_4__0"
-    // InternalTableDSL.g:6164:1: rule__TableSelection__Group_4__0 : rule__TableSelection__Group_4__0__Impl rule__TableSelection__Group_4__1 ;
+    // InternalTableDSL.g:6110:1: rule__TableSelection__Group_4__0 : rule__TableSelection__Group_4__0__Impl rule__TableSelection__Group_4__1 ;
     public final void rule__TableSelection__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6168:1: ( rule__TableSelection__Group_4__0__Impl rule__TableSelection__Group_4__1 )
-            // InternalTableDSL.g:6169:2: rule__TableSelection__Group_4__0__Impl rule__TableSelection__Group_4__1
+            // InternalTableDSL.g:6114:1: ( rule__TableSelection__Group_4__0__Impl rule__TableSelection__Group_4__1 )
+            // InternalTableDSL.g:6115:2: rule__TableSelection__Group_4__0__Impl rule__TableSelection__Group_4__1
             {
-            pushFollow(FOLLOW_21);
+            pushFollow(FOLLOW_20);
             rule__TableSelection__Group_4__0__Impl();
 
             state._fsp--;
@@ -22533,17 +22371,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableSelection__Group_4__0__Impl"
-    // InternalTableDSL.g:6176:1: rule__TableSelection__Group_4__0__Impl : ( 'using' ) ;
+    // InternalTableDSL.g:6122:1: rule__TableSelection__Group_4__0__Impl : ( 'using' ) ;
     public final void rule__TableSelection__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6180:1: ( ( 'using' ) )
-            // InternalTableDSL.g:6181:1: ( 'using' )
+            // InternalTableDSL.g:6126:1: ( ( 'using' ) )
+            // InternalTableDSL.g:6127:1: ( 'using' )
             {
-            // InternalTableDSL.g:6181:1: ( 'using' )
-            // InternalTableDSL.g:6182:2: 'using'
+            // InternalTableDSL.g:6127:1: ( 'using' )
+            // InternalTableDSL.g:6128:2: 'using'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableSelectionAccess().getUsingKeyword_4_0()); 
@@ -22574,14 +22412,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableSelection__Group_4__1"
-    // InternalTableDSL.g:6191:1: rule__TableSelection__Group_4__1 : rule__TableSelection__Group_4__1__Impl ;
+    // InternalTableDSL.g:6137:1: rule__TableSelection__Group_4__1 : rule__TableSelection__Group_4__1__Impl ;
     public final void rule__TableSelection__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6195:1: ( rule__TableSelection__Group_4__1__Impl )
-            // InternalTableDSL.g:6196:2: rule__TableSelection__Group_4__1__Impl
+            // InternalTableDSL.g:6141:1: ( rule__TableSelection__Group_4__1__Impl )
+            // InternalTableDSL.g:6142:2: rule__TableSelection__Group_4__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableSelection__Group_4__1__Impl();
@@ -22607,23 +22445,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableSelection__Group_4__1__Impl"
-    // InternalTableDSL.g:6202:1: rule__TableSelection__Group_4__1__Impl : ( ( rule__TableSelection__SourceAssignment_4_1 ) ) ;
+    // InternalTableDSL.g:6148:1: rule__TableSelection__Group_4__1__Impl : ( ( rule__TableSelection__SourceAssignment_4_1 ) ) ;
     public final void rule__TableSelection__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6206:1: ( ( ( rule__TableSelection__SourceAssignment_4_1 ) ) )
-            // InternalTableDSL.g:6207:1: ( ( rule__TableSelection__SourceAssignment_4_1 ) )
+            // InternalTableDSL.g:6152:1: ( ( ( rule__TableSelection__SourceAssignment_4_1 ) ) )
+            // InternalTableDSL.g:6153:1: ( ( rule__TableSelection__SourceAssignment_4_1 ) )
             {
-            // InternalTableDSL.g:6207:1: ( ( rule__TableSelection__SourceAssignment_4_1 ) )
-            // InternalTableDSL.g:6208:2: ( rule__TableSelection__SourceAssignment_4_1 )
+            // InternalTableDSL.g:6153:1: ( ( rule__TableSelection__SourceAssignment_4_1 ) )
+            // InternalTableDSL.g:6154:2: ( rule__TableSelection__SourceAssignment_4_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableSelectionAccess().getSourceAssignment_4_1()); 
             }
-            // InternalTableDSL.g:6209:2: ( rule__TableSelection__SourceAssignment_4_1 )
-            // InternalTableDSL.g:6209:3: rule__TableSelection__SourceAssignment_4_1
+            // InternalTableDSL.g:6155:2: ( rule__TableSelection__SourceAssignment_4_1 )
+            // InternalTableDSL.g:6155:3: rule__TableSelection__SourceAssignment_4_1
             {
             pushFollow(FOLLOW_2);
             rule__TableSelection__SourceAssignment_4_1();
@@ -22658,16 +22496,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__Group__0"
-    // InternalTableDSL.g:6218:1: rule__TableTable__Group__0 : rule__TableTable__Group__0__Impl rule__TableTable__Group__1 ;
+    // InternalTableDSL.g:6164:1: rule__TableTable__Group__0 : rule__TableTable__Group__0__Impl rule__TableTable__Group__1 ;
     public final void rule__TableTable__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6222:1: ( rule__TableTable__Group__0__Impl rule__TableTable__Group__1 )
-            // InternalTableDSL.g:6223:2: rule__TableTable__Group__0__Impl rule__TableTable__Group__1
+            // InternalTableDSL.g:6168:1: ( rule__TableTable__Group__0__Impl rule__TableTable__Group__1 )
+            // InternalTableDSL.g:6169:2: rule__TableTable__Group__0__Impl rule__TableTable__Group__1
             {
-            pushFollow(FOLLOW_11);
+            pushFollow(FOLLOW_21);
             rule__TableTable__Group__0__Impl();
 
             state._fsp--;
@@ -22696,23 +22534,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__Group__0__Impl"
-    // InternalTableDSL.g:6230:1: rule__TableTable__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:6176:1: rule__TableTable__Group__0__Impl : ( () ) ;
     public final void rule__TableTable__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6234:1: ( ( () ) )
-            // InternalTableDSL.g:6235:1: ( () )
+            // InternalTableDSL.g:6180:1: ( ( () ) )
+            // InternalTableDSL.g:6181:1: ( () )
             {
-            // InternalTableDSL.g:6235:1: ( () )
-            // InternalTableDSL.g:6236:2: ()
+            // InternalTableDSL.g:6181:1: ( () )
+            // InternalTableDSL.g:6182:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTableAccess().getTableTableAction_0()); 
             }
-            // InternalTableDSL.g:6237:2: ()
-            // InternalTableDSL.g:6237:3: 
+            // InternalTableDSL.g:6183:2: ()
+            // InternalTableDSL.g:6183:3: 
             {
             }
 
@@ -22737,14 +22575,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__Group__1"
-    // InternalTableDSL.g:6245:1: rule__TableTable__Group__1 : rule__TableTable__Group__1__Impl rule__TableTable__Group__2 ;
+    // InternalTableDSL.g:6191:1: rule__TableTable__Group__1 : rule__TableTable__Group__1__Impl rule__TableTable__Group__2 ;
     public final void rule__TableTable__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6249:1: ( rule__TableTable__Group__1__Impl rule__TableTable__Group__2 )
-            // InternalTableDSL.g:6250:2: rule__TableTable__Group__1__Impl rule__TableTable__Group__2
+            // InternalTableDSL.g:6195:1: ( rule__TableTable__Group__1__Impl rule__TableTable__Group__2 )
+            // InternalTableDSL.g:6196:2: rule__TableTable__Group__1__Impl rule__TableTable__Group__2
             {
             pushFollow(FOLLOW_22);
             rule__TableTable__Group__1__Impl();
@@ -22775,24 +22613,24 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__Group__1__Impl"
-    // InternalTableDSL.g:6257:1: rule__TableTable__Group__1__Impl : ( 'table' ) ;
+    // InternalTableDSL.g:6203:1: rule__TableTable__Group__1__Impl : ( 'readOnly' ) ;
     public final void rule__TableTable__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6261:1: ( ( 'table' ) )
-            // InternalTableDSL.g:6262:1: ( 'table' )
+            // InternalTableDSL.g:6207:1: ( ( 'readOnly' ) )
+            // InternalTableDSL.g:6208:1: ( 'readOnly' )
             {
-            // InternalTableDSL.g:6262:1: ( 'table' )
-            // InternalTableDSL.g:6263:2: 'table'
+            // InternalTableDSL.g:6208:1: ( 'readOnly' )
+            // InternalTableDSL.g:6209:2: 'readOnly'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableTableAccess().getTableKeyword_1()); 
+               before(grammarAccess.getTableTableAccess().getReadOnlyKeyword_1()); 
             }
-            match(input,77,FOLLOW_2); if (state.failed) return ;
+            match(input,83,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableTableAccess().getTableKeyword_1()); 
+               after(grammarAccess.getTableTableAccess().getReadOnlyKeyword_1()); 
             }
 
             }
@@ -22816,14 +22654,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__Group__2"
-    // InternalTableDSL.g:6272:1: rule__TableTable__Group__2 : rule__TableTable__Group__2__Impl rule__TableTable__Group__3 ;
+    // InternalTableDSL.g:6218:1: rule__TableTable__Group__2 : rule__TableTable__Group__2__Impl rule__TableTable__Group__3 ;
     public final void rule__TableTable__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6276:1: ( rule__TableTable__Group__2__Impl rule__TableTable__Group__3 )
-            // InternalTableDSL.g:6277:2: rule__TableTable__Group__2__Impl rule__TableTable__Group__3
+            // InternalTableDSL.g:6222:1: ( rule__TableTable__Group__2__Impl rule__TableTable__Group__3 )
+            // InternalTableDSL.g:6223:2: rule__TableTable__Group__2__Impl rule__TableTable__Group__3
             {
             pushFollow(FOLLOW_18);
             rule__TableTable__Group__2__Impl();
@@ -22854,23 +22692,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__Group__2__Impl"
-    // InternalTableDSL.g:6284:1: rule__TableTable__Group__2__Impl : ( ( rule__TableTable__UnorderedGroup_2 ) ) ;
+    // InternalTableDSL.g:6230:1: rule__TableTable__Group__2__Impl : ( ( rule__TableTable__UnorderedGroup_2 ) ) ;
     public final void rule__TableTable__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6288:1: ( ( ( rule__TableTable__UnorderedGroup_2 ) ) )
-            // InternalTableDSL.g:6289:1: ( ( rule__TableTable__UnorderedGroup_2 ) )
+            // InternalTableDSL.g:6234:1: ( ( ( rule__TableTable__UnorderedGroup_2 ) ) )
+            // InternalTableDSL.g:6235:1: ( ( rule__TableTable__UnorderedGroup_2 ) )
             {
-            // InternalTableDSL.g:6289:1: ( ( rule__TableTable__UnorderedGroup_2 ) )
-            // InternalTableDSL.g:6290:2: ( rule__TableTable__UnorderedGroup_2 )
+            // InternalTableDSL.g:6235:1: ( ( rule__TableTable__UnorderedGroup_2 ) )
+            // InternalTableDSL.g:6236:2: ( rule__TableTable__UnorderedGroup_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTableAccess().getUnorderedGroup_2()); 
             }
-            // InternalTableDSL.g:6291:2: ( rule__TableTable__UnorderedGroup_2 )
-            // InternalTableDSL.g:6291:3: rule__TableTable__UnorderedGroup_2
+            // InternalTableDSL.g:6237:2: ( rule__TableTable__UnorderedGroup_2 )
+            // InternalTableDSL.g:6237:3: rule__TableTable__UnorderedGroup_2
             {
             pushFollow(FOLLOW_2);
             rule__TableTable__UnorderedGroup_2();
@@ -22905,14 +22743,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__Group__3"
-    // InternalTableDSL.g:6299:1: rule__TableTable__Group__3 : rule__TableTable__Group__3__Impl ;
+    // InternalTableDSL.g:6245:1: rule__TableTable__Group__3 : rule__TableTable__Group__3__Impl ;
     public final void rule__TableTable__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6303:1: ( rule__TableTable__Group__3__Impl )
-            // InternalTableDSL.g:6304:2: rule__TableTable__Group__3__Impl
+            // InternalTableDSL.g:6249:1: ( rule__TableTable__Group__3__Impl )
+            // InternalTableDSL.g:6250:2: rule__TableTable__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableTable__Group__3__Impl();
@@ -22938,22 +22776,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__Group__3__Impl"
-    // InternalTableDSL.g:6310:1: rule__TableTable__Group__3__Impl : ( ( rule__TableTable__Group_3__0 )? ) ;
+    // InternalTableDSL.g:6256:1: rule__TableTable__Group__3__Impl : ( ( rule__TableTable__Group_3__0 )? ) ;
     public final void rule__TableTable__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6314:1: ( ( ( rule__TableTable__Group_3__0 )? ) )
-            // InternalTableDSL.g:6315:1: ( ( rule__TableTable__Group_3__0 )? )
+            // InternalTableDSL.g:6260:1: ( ( ( rule__TableTable__Group_3__0 )? ) )
+            // InternalTableDSL.g:6261:1: ( ( rule__TableTable__Group_3__0 )? )
             {
-            // InternalTableDSL.g:6315:1: ( ( rule__TableTable__Group_3__0 )? )
-            // InternalTableDSL.g:6316:2: ( rule__TableTable__Group_3__0 )?
+            // InternalTableDSL.g:6261:1: ( ( rule__TableTable__Group_3__0 )? )
+            // InternalTableDSL.g:6262:2: ( rule__TableTable__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTableAccess().getGroup_3()); 
             }
-            // InternalTableDSL.g:6317:2: ( rule__TableTable__Group_3__0 )?
+            // InternalTableDSL.g:6263:2: ( rule__TableTable__Group_3__0 )?
             int alt65=2;
             int LA65_0 = input.LA(1);
 
@@ -22962,7 +22800,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             }
             switch (alt65) {
                 case 1 :
-                    // InternalTableDSL.g:6317:3: rule__TableTable__Group_3__0
+                    // InternalTableDSL.g:6263:3: rule__TableTable__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableTable__Group_3__0();
@@ -23000,14 +22838,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__Group_2_2__0"
-    // InternalTableDSL.g:6326:1: rule__TableTable__Group_2_2__0 : rule__TableTable__Group_2_2__0__Impl rule__TableTable__Group_2_2__1 ;
+    // InternalTableDSL.g:6272:1: rule__TableTable__Group_2_2__0 : rule__TableTable__Group_2_2__0__Impl rule__TableTable__Group_2_2__1 ;
     public final void rule__TableTable__Group_2_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6330:1: ( rule__TableTable__Group_2_2__0__Impl rule__TableTable__Group_2_2__1 )
-            // InternalTableDSL.g:6331:2: rule__TableTable__Group_2_2__0__Impl rule__TableTable__Group_2_2__1
+            // InternalTableDSL.g:6276:1: ( rule__TableTable__Group_2_2__0__Impl rule__TableTable__Group_2_2__1 )
+            // InternalTableDSL.g:6277:2: rule__TableTable__Group_2_2__0__Impl rule__TableTable__Group_2_2__1
             {
             pushFollow(FOLLOW_19);
             rule__TableTable__Group_2_2__0__Impl();
@@ -23038,17 +22876,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__Group_2_2__0__Impl"
-    // InternalTableDSL.g:6338:1: rule__TableTable__Group_2_2__0__Impl : ( 'rowHeader' ) ;
+    // InternalTableDSL.g:6284:1: rule__TableTable__Group_2_2__0__Impl : ( 'rowHeader' ) ;
     public final void rule__TableTable__Group_2_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6342:1: ( ( 'rowHeader' ) )
-            // InternalTableDSL.g:6343:1: ( 'rowHeader' )
+            // InternalTableDSL.g:6288:1: ( ( 'rowHeader' ) )
+            // InternalTableDSL.g:6289:1: ( 'rowHeader' )
             {
-            // InternalTableDSL.g:6343:1: ( 'rowHeader' )
-            // InternalTableDSL.g:6344:2: 'rowHeader'
+            // InternalTableDSL.g:6289:1: ( 'rowHeader' )
+            // InternalTableDSL.g:6290:2: 'rowHeader'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTableAccess().getRowHeaderKeyword_2_2_0()); 
@@ -23079,14 +22917,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__Group_2_2__1"
-    // InternalTableDSL.g:6353:1: rule__TableTable__Group_2_2__1 : rule__TableTable__Group_2_2__1__Impl ;
+    // InternalTableDSL.g:6299:1: rule__TableTable__Group_2_2__1 : rule__TableTable__Group_2_2__1__Impl ;
     public final void rule__TableTable__Group_2_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6357:1: ( rule__TableTable__Group_2_2__1__Impl )
-            // InternalTableDSL.g:6358:2: rule__TableTable__Group_2_2__1__Impl
+            // InternalTableDSL.g:6303:1: ( rule__TableTable__Group_2_2__1__Impl )
+            // InternalTableDSL.g:6304:2: rule__TableTable__Group_2_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableTable__Group_2_2__1__Impl();
@@ -23112,23 +22950,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__Group_2_2__1__Impl"
-    // InternalTableDSL.g:6364:1: rule__TableTable__Group_2_2__1__Impl : ( ( rule__TableTable__HeaderModeAssignment_2_2_1 ) ) ;
+    // InternalTableDSL.g:6310:1: rule__TableTable__Group_2_2__1__Impl : ( ( rule__TableTable__HeaderModeAssignment_2_2_1 ) ) ;
     public final void rule__TableTable__Group_2_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6368:1: ( ( ( rule__TableTable__HeaderModeAssignment_2_2_1 ) ) )
-            // InternalTableDSL.g:6369:1: ( ( rule__TableTable__HeaderModeAssignment_2_2_1 ) )
+            // InternalTableDSL.g:6314:1: ( ( ( rule__TableTable__HeaderModeAssignment_2_2_1 ) ) )
+            // InternalTableDSL.g:6315:1: ( ( rule__TableTable__HeaderModeAssignment_2_2_1 ) )
             {
-            // InternalTableDSL.g:6369:1: ( ( rule__TableTable__HeaderModeAssignment_2_2_1 ) )
-            // InternalTableDSL.g:6370:2: ( rule__TableTable__HeaderModeAssignment_2_2_1 )
+            // InternalTableDSL.g:6315:1: ( ( rule__TableTable__HeaderModeAssignment_2_2_1 ) )
+            // InternalTableDSL.g:6316:2: ( rule__TableTable__HeaderModeAssignment_2_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTableAccess().getHeaderModeAssignment_2_2_1()); 
             }
-            // InternalTableDSL.g:6371:2: ( rule__TableTable__HeaderModeAssignment_2_2_1 )
-            // InternalTableDSL.g:6371:3: rule__TableTable__HeaderModeAssignment_2_2_1
+            // InternalTableDSL.g:6317:2: ( rule__TableTable__HeaderModeAssignment_2_2_1 )
+            // InternalTableDSL.g:6317:3: rule__TableTable__HeaderModeAssignment_2_2_1
             {
             pushFollow(FOLLOW_2);
             rule__TableTable__HeaderModeAssignment_2_2_1();
@@ -23162,196 +23000,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     // $ANTLR end "rule__TableTable__Group_2_2__1__Impl"
 
 
-    // $ANTLR start "rule__TableTable__Group_2_3__0"
-    // InternalTableDSL.g:6380:1: rule__TableTable__Group_2_3__0 : rule__TableTable__Group_2_3__0__Impl rule__TableTable__Group_2_3__1 ;
-    public final void rule__TableTable__Group_2_3__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6384:1: ( rule__TableTable__Group_2_3__0__Impl rule__TableTable__Group_2_3__1 )
-            // InternalTableDSL.g:6385:2: rule__TableTable__Group_2_3__0__Impl rule__TableTable__Group_2_3__1
-            {
-            pushFollow(FOLLOW_20);
-            rule__TableTable__Group_2_3__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_2);
-            rule__TableTable__Group_2_3__1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableTable__Group_2_3__0"
-
-
-    // $ANTLR start "rule__TableTable__Group_2_3__0__Impl"
-    // InternalTableDSL.g:6392:1: rule__TableTable__Group_2_3__0__Impl : ( ( rule__TableTable__PollingAssignment_2_3_0 ) ) ;
-    public final void rule__TableTable__Group_2_3__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6396:1: ( ( ( rule__TableTable__PollingAssignment_2_3_0 ) ) )
-            // InternalTableDSL.g:6397:1: ( ( rule__TableTable__PollingAssignment_2_3_0 ) )
-            {
-            // InternalTableDSL.g:6397:1: ( ( rule__TableTable__PollingAssignment_2_3_0 ) )
-            // InternalTableDSL.g:6398:2: ( rule__TableTable__PollingAssignment_2_3_0 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableTableAccess().getPollingAssignment_2_3_0()); 
-            }
-            // InternalTableDSL.g:6399:2: ( rule__TableTable__PollingAssignment_2_3_0 )
-            // InternalTableDSL.g:6399:3: rule__TableTable__PollingAssignment_2_3_0
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableTable__PollingAssignment_2_3_0();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableTableAccess().getPollingAssignment_2_3_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableTable__Group_2_3__0__Impl"
-
-
-    // $ANTLR start "rule__TableTable__Group_2_3__1"
-    // InternalTableDSL.g:6407:1: rule__TableTable__Group_2_3__1 : rule__TableTable__Group_2_3__1__Impl ;
-    public final void rule__TableTable__Group_2_3__1() throws RecognitionException {
+    // $ANTLR start "rule__TableTable__Group_2_5__0"
+    // InternalTableDSL.g:6326:1: rule__TableTable__Group_2_5__0 : rule__TableTable__Group_2_5__0__Impl rule__TableTable__Group_2_5__1 ;
+    public final void rule__TableTable__Group_2_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6411:1: ( rule__TableTable__Group_2_3__1__Impl )
-            // InternalTableDSL.g:6412:2: rule__TableTable__Group_2_3__1__Impl
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableTable__Group_2_3__1__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableTable__Group_2_3__1"
-
-
-    // $ANTLR start "rule__TableTable__Group_2_3__1__Impl"
-    // InternalTableDSL.g:6418:1: rule__TableTable__Group_2_3__1__Impl : ( ( rule__TableTable__PollingTimeAssignment_2_3_1 ) ) ;
-    public final void rule__TableTable__Group_2_3__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6422:1: ( ( ( rule__TableTable__PollingTimeAssignment_2_3_1 ) ) )
-            // InternalTableDSL.g:6423:1: ( ( rule__TableTable__PollingTimeAssignment_2_3_1 ) )
-            {
-            // InternalTableDSL.g:6423:1: ( ( rule__TableTable__PollingTimeAssignment_2_3_1 ) )
-            // InternalTableDSL.g:6424:2: ( rule__TableTable__PollingTimeAssignment_2_3_1 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableTableAccess().getPollingTimeAssignment_2_3_1()); 
-            }
-            // InternalTableDSL.g:6425:2: ( rule__TableTable__PollingTimeAssignment_2_3_1 )
-            // InternalTableDSL.g:6425:3: rule__TableTable__PollingTimeAssignment_2_3_1
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableTable__PollingTimeAssignment_2_3_1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableTableAccess().getPollingTimeAssignment_2_3_1()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableTable__Group_2_3__1__Impl"
-
-
-    // $ANTLR start "rule__TableTable__Group_2_6__0"
-    // InternalTableDSL.g:6434:1: rule__TableTable__Group_2_6__0 : rule__TableTable__Group_2_6__0__Impl rule__TableTable__Group_2_6__1 ;
-    public final void rule__TableTable__Group_2_6__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6438:1: ( rule__TableTable__Group_2_6__0__Impl rule__TableTable__Group_2_6__1 )
-            // InternalTableDSL.g:6439:2: rule__TableTable__Group_2_6__0__Impl rule__TableTable__Group_2_6__1
+            // InternalTableDSL.g:6330:1: ( rule__TableTable__Group_2_5__0__Impl rule__TableTable__Group_2_5__1 )
+            // InternalTableDSL.g:6331:2: rule__TableTable__Group_2_5__0__Impl rule__TableTable__Group_2_5__1
             {
             pushFollow(FOLLOW_7);
-            rule__TableTable__Group_2_6__0__Impl();
+            rule__TableTable__Group_2_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__TableTable__Group_2_6__1();
+            rule__TableTable__Group_2_5__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -23370,28 +23035,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableTable__Group_2_6__0"
+    // $ANTLR end "rule__TableTable__Group_2_5__0"
 
 
-    // $ANTLR start "rule__TableTable__Group_2_6__0__Impl"
-    // InternalTableDSL.g:6446:1: rule__TableTable__Group_2_6__0__Impl : ( 'toolbar' ) ;
-    public final void rule__TableTable__Group_2_6__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__TableTable__Group_2_5__0__Impl"
+    // InternalTableDSL.g:6338:1: rule__TableTable__Group_2_5__0__Impl : ( 'toolbar' ) ;
+    public final void rule__TableTable__Group_2_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6450:1: ( ( 'toolbar' ) )
-            // InternalTableDSL.g:6451:1: ( 'toolbar' )
+            // InternalTableDSL.g:6342:1: ( ( 'toolbar' ) )
+            // InternalTableDSL.g:6343:1: ( 'toolbar' )
             {
-            // InternalTableDSL.g:6451:1: ( 'toolbar' )
-            // InternalTableDSL.g:6452:2: 'toolbar'
+            // InternalTableDSL.g:6343:1: ( 'toolbar' )
+            // InternalTableDSL.g:6344:2: 'toolbar'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableTableAccess().getToolbarKeyword_2_6_0()); 
+               before(grammarAccess.getTableTableAccess().getToolbarKeyword_2_5_0()); 
             }
             match(input,81,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableTableAccess().getToolbarKeyword_2_6_0()); 
+               after(grammarAccess.getTableTableAccess().getToolbarKeyword_2_5_0()); 
             }
 
             }
@@ -23411,21 +23076,21 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableTable__Group_2_6__0__Impl"
+    // $ANTLR end "rule__TableTable__Group_2_5__0__Impl"
 
 
-    // $ANTLR start "rule__TableTable__Group_2_6__1"
-    // InternalTableDSL.g:6461:1: rule__TableTable__Group_2_6__1 : rule__TableTable__Group_2_6__1__Impl ;
-    public final void rule__TableTable__Group_2_6__1() throws RecognitionException {
+    // $ANTLR start "rule__TableTable__Group_2_5__1"
+    // InternalTableDSL.g:6353:1: rule__TableTable__Group_2_5__1 : rule__TableTable__Group_2_5__1__Impl ;
+    public final void rule__TableTable__Group_2_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6465:1: ( rule__TableTable__Group_2_6__1__Impl )
-            // InternalTableDSL.g:6466:2: rule__TableTable__Group_2_6__1__Impl
+            // InternalTableDSL.g:6357:1: ( rule__TableTable__Group_2_5__1__Impl )
+            // InternalTableDSL.g:6358:2: rule__TableTable__Group_2_5__1__Impl
             {
             pushFollow(FOLLOW_2);
-            rule__TableTable__Group_2_6__1__Impl();
+            rule__TableTable__Group_2_5__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -23444,30 +23109,30 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableTable__Group_2_6__1"
+    // $ANTLR end "rule__TableTable__Group_2_5__1"
 
 
-    // $ANTLR start "rule__TableTable__Group_2_6__1__Impl"
-    // InternalTableDSL.g:6472:1: rule__TableTable__Group_2_6__1__Impl : ( ( rule__TableTable__ToolbarAssignment_2_6_1 ) ) ;
-    public final void rule__TableTable__Group_2_6__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__TableTable__Group_2_5__1__Impl"
+    // InternalTableDSL.g:6364:1: rule__TableTable__Group_2_5__1__Impl : ( ( rule__TableTable__ToolbarAssignment_2_5_1 ) ) ;
+    public final void rule__TableTable__Group_2_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6476:1: ( ( ( rule__TableTable__ToolbarAssignment_2_6_1 ) ) )
-            // InternalTableDSL.g:6477:1: ( ( rule__TableTable__ToolbarAssignment_2_6_1 ) )
+            // InternalTableDSL.g:6368:1: ( ( ( rule__TableTable__ToolbarAssignment_2_5_1 ) ) )
+            // InternalTableDSL.g:6369:1: ( ( rule__TableTable__ToolbarAssignment_2_5_1 ) )
             {
-            // InternalTableDSL.g:6477:1: ( ( rule__TableTable__ToolbarAssignment_2_6_1 ) )
-            // InternalTableDSL.g:6478:2: ( rule__TableTable__ToolbarAssignment_2_6_1 )
+            // InternalTableDSL.g:6369:1: ( ( rule__TableTable__ToolbarAssignment_2_5_1 ) )
+            // InternalTableDSL.g:6370:2: ( rule__TableTable__ToolbarAssignment_2_5_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableTableAccess().getToolbarAssignment_2_6_1()); 
+               before(grammarAccess.getTableTableAccess().getToolbarAssignment_2_5_1()); 
             }
-            // InternalTableDSL.g:6479:2: ( rule__TableTable__ToolbarAssignment_2_6_1 )
-            // InternalTableDSL.g:6479:3: rule__TableTable__ToolbarAssignment_2_6_1
+            // InternalTableDSL.g:6371:2: ( rule__TableTable__ToolbarAssignment_2_5_1 )
+            // InternalTableDSL.g:6371:3: rule__TableTable__ToolbarAssignment_2_5_1
             {
             pushFollow(FOLLOW_2);
-            rule__TableTable__ToolbarAssignment_2_6_1();
+            rule__TableTable__ToolbarAssignment_2_5_1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -23475,7 +23140,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableTableAccess().getToolbarAssignment_2_6_1()); 
+               after(grammarAccess.getTableTableAccess().getToolbarAssignment_2_5_1()); 
             }
 
             }
@@ -23495,20 +23160,20 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableTable__Group_2_6__1__Impl"
+    // $ANTLR end "rule__TableTable__Group_2_5__1__Impl"
 
 
     // $ANTLR start "rule__TableTable__Group_3__0"
-    // InternalTableDSL.g:6488:1: rule__TableTable__Group_3__0 : rule__TableTable__Group_3__0__Impl rule__TableTable__Group_3__1 ;
+    // InternalTableDSL.g:6380:1: rule__TableTable__Group_3__0 : rule__TableTable__Group_3__0__Impl rule__TableTable__Group_3__1 ;
     public final void rule__TableTable__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6492:1: ( rule__TableTable__Group_3__0__Impl rule__TableTable__Group_3__1 )
-            // InternalTableDSL.g:6493:2: rule__TableTable__Group_3__0__Impl rule__TableTable__Group_3__1
+            // InternalTableDSL.g:6384:1: ( rule__TableTable__Group_3__0__Impl rule__TableTable__Group_3__1 )
+            // InternalTableDSL.g:6385:2: rule__TableTable__Group_3__0__Impl rule__TableTable__Group_3__1
             {
-            pushFollow(FOLLOW_21);
+            pushFollow(FOLLOW_20);
             rule__TableTable__Group_3__0__Impl();
 
             state._fsp--;
@@ -23537,17 +23202,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__Group_3__0__Impl"
-    // InternalTableDSL.g:6500:1: rule__TableTable__Group_3__0__Impl : ( 'using' ) ;
+    // InternalTableDSL.g:6392:1: rule__TableTable__Group_3__0__Impl : ( 'using' ) ;
     public final void rule__TableTable__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6504:1: ( ( 'using' ) )
-            // InternalTableDSL.g:6505:1: ( 'using' )
+            // InternalTableDSL.g:6396:1: ( ( 'using' ) )
+            // InternalTableDSL.g:6397:1: ( 'using' )
             {
-            // InternalTableDSL.g:6505:1: ( 'using' )
-            // InternalTableDSL.g:6506:2: 'using'
+            // InternalTableDSL.g:6397:1: ( 'using' )
+            // InternalTableDSL.g:6398:2: 'using'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTableAccess().getUsingKeyword_3_0()); 
@@ -23578,14 +23243,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__Group_3__1"
-    // InternalTableDSL.g:6515:1: rule__TableTable__Group_3__1 : rule__TableTable__Group_3__1__Impl ;
+    // InternalTableDSL.g:6407:1: rule__TableTable__Group_3__1 : rule__TableTable__Group_3__1__Impl ;
     public final void rule__TableTable__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6519:1: ( rule__TableTable__Group_3__1__Impl )
-            // InternalTableDSL.g:6520:2: rule__TableTable__Group_3__1__Impl
+            // InternalTableDSL.g:6411:1: ( rule__TableTable__Group_3__1__Impl )
+            // InternalTableDSL.g:6412:2: rule__TableTable__Group_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableTable__Group_3__1__Impl();
@@ -23611,23 +23276,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__Group_3__1__Impl"
-    // InternalTableDSL.g:6526:1: rule__TableTable__Group_3__1__Impl : ( ( rule__TableTable__SourceAssignment_3_1 ) ) ;
+    // InternalTableDSL.g:6418:1: rule__TableTable__Group_3__1__Impl : ( ( rule__TableTable__SourceAssignment_3_1 ) ) ;
     public final void rule__TableTable__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6530:1: ( ( ( rule__TableTable__SourceAssignment_3_1 ) ) )
-            // InternalTableDSL.g:6531:1: ( ( rule__TableTable__SourceAssignment_3_1 ) )
+            // InternalTableDSL.g:6422:1: ( ( ( rule__TableTable__SourceAssignment_3_1 ) ) )
+            // InternalTableDSL.g:6423:1: ( ( rule__TableTable__SourceAssignment_3_1 ) )
             {
-            // InternalTableDSL.g:6531:1: ( ( rule__TableTable__SourceAssignment_3_1 ) )
-            // InternalTableDSL.g:6532:2: ( rule__TableTable__SourceAssignment_3_1 )
+            // InternalTableDSL.g:6423:1: ( ( rule__TableTable__SourceAssignment_3_1 ) )
+            // InternalTableDSL.g:6424:2: ( rule__TableTable__SourceAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTableAccess().getSourceAssignment_3_1()); 
             }
-            // InternalTableDSL.g:6533:2: ( rule__TableTable__SourceAssignment_3_1 )
-            // InternalTableDSL.g:6533:3: rule__TableTable__SourceAssignment_3_1
+            // InternalTableDSL.g:6425:2: ( rule__TableTable__SourceAssignment_3_1 )
+            // InternalTableDSL.g:6425:3: rule__TableTable__SourceAssignment_3_1
             {
             pushFollow(FOLLOW_2);
             rule__TableTable__SourceAssignment_3_1();
@@ -23661,1019 +23326,15 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     // $ANTLR end "rule__TableTable__Group_3__1__Impl"
 
 
-    // $ANTLR start "rule__TableBean__Group__0"
-    // InternalTableDSL.g:6542:1: rule__TableBean__Group__0 : rule__TableBean__Group__0__Impl rule__TableBean__Group__1 ;
-    public final void rule__TableBean__Group__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6546:1: ( rule__TableBean__Group__0__Impl rule__TableBean__Group__1 )
-            // InternalTableDSL.g:6547:2: rule__TableBean__Group__0__Impl rule__TableBean__Group__1
-            {
-            pushFollow(FOLLOW_13);
-            rule__TableBean__Group__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_2);
-            rule__TableBean__Group__1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group__0"
-
-
-    // $ANTLR start "rule__TableBean__Group__0__Impl"
-    // InternalTableDSL.g:6554:1: rule__TableBean__Group__0__Impl : ( () ) ;
-    public final void rule__TableBean__Group__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6558:1: ( ( () ) )
-            // InternalTableDSL.g:6559:1: ( () )
-            {
-            // InternalTableDSL.g:6559:1: ( () )
-            // InternalTableDSL.g:6560:2: ()
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getTableBeanAction_0()); 
-            }
-            // InternalTableDSL.g:6561:2: ()
-            // InternalTableDSL.g:6561:3: 
-            {
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getTableBeanAction_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group__0__Impl"
-
-
-    // $ANTLR start "rule__TableBean__Group__1"
-    // InternalTableDSL.g:6569:1: rule__TableBean__Group__1 : rule__TableBean__Group__1__Impl rule__TableBean__Group__2 ;
-    public final void rule__TableBean__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6573:1: ( rule__TableBean__Group__1__Impl rule__TableBean__Group__2 )
-            // InternalTableDSL.g:6574:2: rule__TableBean__Group__1__Impl rule__TableBean__Group__2
-            {
-            pushFollow(FOLLOW_22);
-            rule__TableBean__Group__1__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_2);
-            rule__TableBean__Group__2();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group__1"
-
-
-    // $ANTLR start "rule__TableBean__Group__1__Impl"
-    // InternalTableDSL.g:6581:1: rule__TableBean__Group__1__Impl : ( 'bean' ) ;
-    public final void rule__TableBean__Group__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6585:1: ( ( 'bean' ) )
-            // InternalTableDSL.g:6586:1: ( 'bean' )
-            {
-            // InternalTableDSL.g:6586:1: ( 'bean' )
-            // InternalTableDSL.g:6587:2: 'bean'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getBeanKeyword_1()); 
-            }
-            match(input,83,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getBeanKeyword_1()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group__1__Impl"
-
-
-    // $ANTLR start "rule__TableBean__Group__2"
-    // InternalTableDSL.g:6596:1: rule__TableBean__Group__2 : rule__TableBean__Group__2__Impl rule__TableBean__Group__3 ;
-    public final void rule__TableBean__Group__2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6600:1: ( rule__TableBean__Group__2__Impl rule__TableBean__Group__3 )
-            // InternalTableDSL.g:6601:2: rule__TableBean__Group__2__Impl rule__TableBean__Group__3
-            {
-            pushFollow(FOLLOW_18);
-            rule__TableBean__Group__2__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_2);
-            rule__TableBean__Group__3();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group__2"
-
-
-    // $ANTLR start "rule__TableBean__Group__2__Impl"
-    // InternalTableDSL.g:6608:1: rule__TableBean__Group__2__Impl : ( ( rule__TableBean__UnorderedGroup_2 ) ) ;
-    public final void rule__TableBean__Group__2__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6612:1: ( ( ( rule__TableBean__UnorderedGroup_2 ) ) )
-            // InternalTableDSL.g:6613:1: ( ( rule__TableBean__UnorderedGroup_2 ) )
-            {
-            // InternalTableDSL.g:6613:1: ( ( rule__TableBean__UnorderedGroup_2 ) )
-            // InternalTableDSL.g:6614:2: ( rule__TableBean__UnorderedGroup_2 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getUnorderedGroup_2()); 
-            }
-            // InternalTableDSL.g:6615:2: ( rule__TableBean__UnorderedGroup_2 )
-            // InternalTableDSL.g:6615:3: rule__TableBean__UnorderedGroup_2
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableBean__UnorderedGroup_2();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getUnorderedGroup_2()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group__2__Impl"
-
-
-    // $ANTLR start "rule__TableBean__Group__3"
-    // InternalTableDSL.g:6623:1: rule__TableBean__Group__3 : rule__TableBean__Group__3__Impl ;
-    public final void rule__TableBean__Group__3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6627:1: ( rule__TableBean__Group__3__Impl )
-            // InternalTableDSL.g:6628:2: rule__TableBean__Group__3__Impl
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableBean__Group__3__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group__3"
-
-
-    // $ANTLR start "rule__TableBean__Group__3__Impl"
-    // InternalTableDSL.g:6634:1: rule__TableBean__Group__3__Impl : ( ( rule__TableBean__Group_3__0 )? ) ;
-    public final void rule__TableBean__Group__3__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6638:1: ( ( ( rule__TableBean__Group_3__0 )? ) )
-            // InternalTableDSL.g:6639:1: ( ( rule__TableBean__Group_3__0 )? )
-            {
-            // InternalTableDSL.g:6639:1: ( ( rule__TableBean__Group_3__0 )? )
-            // InternalTableDSL.g:6640:2: ( rule__TableBean__Group_3__0 )?
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getGroup_3()); 
-            }
-            // InternalTableDSL.g:6641:2: ( rule__TableBean__Group_3__0 )?
-            int alt66=2;
-            int LA66_0 = input.LA(1);
-
-            if ( (LA66_0==82) ) {
-                alt66=1;
-            }
-            switch (alt66) {
-                case 1 :
-                    // InternalTableDSL.g:6641:3: rule__TableBean__Group_3__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableBean__Group_3__0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getGroup_3()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group__3__Impl"
-
-
-    // $ANTLR start "rule__TableBean__Group_2_2__0"
-    // InternalTableDSL.g:6650:1: rule__TableBean__Group_2_2__0 : rule__TableBean__Group_2_2__0__Impl rule__TableBean__Group_2_2__1 ;
-    public final void rule__TableBean__Group_2_2__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6654:1: ( rule__TableBean__Group_2_2__0__Impl rule__TableBean__Group_2_2__1 )
-            // InternalTableDSL.g:6655:2: rule__TableBean__Group_2_2__0__Impl rule__TableBean__Group_2_2__1
-            {
-            pushFollow(FOLLOW_19);
-            rule__TableBean__Group_2_2__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_2);
-            rule__TableBean__Group_2_2__1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_2_2__0"
-
-
-    // $ANTLR start "rule__TableBean__Group_2_2__0__Impl"
-    // InternalTableDSL.g:6662:1: rule__TableBean__Group_2_2__0__Impl : ( 'rowHeader' ) ;
-    public final void rule__TableBean__Group_2_2__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6666:1: ( ( 'rowHeader' ) )
-            // InternalTableDSL.g:6667:1: ( 'rowHeader' )
-            {
-            // InternalTableDSL.g:6667:1: ( 'rowHeader' )
-            // InternalTableDSL.g:6668:2: 'rowHeader'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getRowHeaderKeyword_2_2_0()); 
-            }
-            match(input,80,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getRowHeaderKeyword_2_2_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_2_2__0__Impl"
-
-
-    // $ANTLR start "rule__TableBean__Group_2_2__1"
-    // InternalTableDSL.g:6677:1: rule__TableBean__Group_2_2__1 : rule__TableBean__Group_2_2__1__Impl ;
-    public final void rule__TableBean__Group_2_2__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6681:1: ( rule__TableBean__Group_2_2__1__Impl )
-            // InternalTableDSL.g:6682:2: rule__TableBean__Group_2_2__1__Impl
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableBean__Group_2_2__1__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_2_2__1"
-
-
-    // $ANTLR start "rule__TableBean__Group_2_2__1__Impl"
-    // InternalTableDSL.g:6688:1: rule__TableBean__Group_2_2__1__Impl : ( ( rule__TableBean__HeaderModeAssignment_2_2_1 ) ) ;
-    public final void rule__TableBean__Group_2_2__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6692:1: ( ( ( rule__TableBean__HeaderModeAssignment_2_2_1 ) ) )
-            // InternalTableDSL.g:6693:1: ( ( rule__TableBean__HeaderModeAssignment_2_2_1 ) )
-            {
-            // InternalTableDSL.g:6693:1: ( ( rule__TableBean__HeaderModeAssignment_2_2_1 ) )
-            // InternalTableDSL.g:6694:2: ( rule__TableBean__HeaderModeAssignment_2_2_1 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getHeaderModeAssignment_2_2_1()); 
-            }
-            // InternalTableDSL.g:6695:2: ( rule__TableBean__HeaderModeAssignment_2_2_1 )
-            // InternalTableDSL.g:6695:3: rule__TableBean__HeaderModeAssignment_2_2_1
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableBean__HeaderModeAssignment_2_2_1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getHeaderModeAssignment_2_2_1()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_2_2__1__Impl"
-
-
-    // $ANTLR start "rule__TableBean__Group_2_3__0"
-    // InternalTableDSL.g:6704:1: rule__TableBean__Group_2_3__0 : rule__TableBean__Group_2_3__0__Impl rule__TableBean__Group_2_3__1 ;
-    public final void rule__TableBean__Group_2_3__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6708:1: ( rule__TableBean__Group_2_3__0__Impl rule__TableBean__Group_2_3__1 )
-            // InternalTableDSL.g:6709:2: rule__TableBean__Group_2_3__0__Impl rule__TableBean__Group_2_3__1
-            {
-            pushFollow(FOLLOW_20);
-            rule__TableBean__Group_2_3__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_2);
-            rule__TableBean__Group_2_3__1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_2_3__0"
-
-
-    // $ANTLR start "rule__TableBean__Group_2_3__0__Impl"
-    // InternalTableDSL.g:6716:1: rule__TableBean__Group_2_3__0__Impl : ( ( rule__TableBean__PollingAssignment_2_3_0 ) ) ;
-    public final void rule__TableBean__Group_2_3__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6720:1: ( ( ( rule__TableBean__PollingAssignment_2_3_0 ) ) )
-            // InternalTableDSL.g:6721:1: ( ( rule__TableBean__PollingAssignment_2_3_0 ) )
-            {
-            // InternalTableDSL.g:6721:1: ( ( rule__TableBean__PollingAssignment_2_3_0 ) )
-            // InternalTableDSL.g:6722:2: ( rule__TableBean__PollingAssignment_2_3_0 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getPollingAssignment_2_3_0()); 
-            }
-            // InternalTableDSL.g:6723:2: ( rule__TableBean__PollingAssignment_2_3_0 )
-            // InternalTableDSL.g:6723:3: rule__TableBean__PollingAssignment_2_3_0
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableBean__PollingAssignment_2_3_0();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getPollingAssignment_2_3_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_2_3__0__Impl"
-
-
-    // $ANTLR start "rule__TableBean__Group_2_3__1"
-    // InternalTableDSL.g:6731:1: rule__TableBean__Group_2_3__1 : rule__TableBean__Group_2_3__1__Impl ;
-    public final void rule__TableBean__Group_2_3__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6735:1: ( rule__TableBean__Group_2_3__1__Impl )
-            // InternalTableDSL.g:6736:2: rule__TableBean__Group_2_3__1__Impl
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableBean__Group_2_3__1__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_2_3__1"
-
-
-    // $ANTLR start "rule__TableBean__Group_2_3__1__Impl"
-    // InternalTableDSL.g:6742:1: rule__TableBean__Group_2_3__1__Impl : ( ( rule__TableBean__PollingTimeAssignment_2_3_1 ) ) ;
-    public final void rule__TableBean__Group_2_3__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6746:1: ( ( ( rule__TableBean__PollingTimeAssignment_2_3_1 ) ) )
-            // InternalTableDSL.g:6747:1: ( ( rule__TableBean__PollingTimeAssignment_2_3_1 ) )
-            {
-            // InternalTableDSL.g:6747:1: ( ( rule__TableBean__PollingTimeAssignment_2_3_1 ) )
-            // InternalTableDSL.g:6748:2: ( rule__TableBean__PollingTimeAssignment_2_3_1 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getPollingTimeAssignment_2_3_1()); 
-            }
-            // InternalTableDSL.g:6749:2: ( rule__TableBean__PollingTimeAssignment_2_3_1 )
-            // InternalTableDSL.g:6749:3: rule__TableBean__PollingTimeAssignment_2_3_1
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableBean__PollingTimeAssignment_2_3_1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getPollingTimeAssignment_2_3_1()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_2_3__1__Impl"
-
-
-    // $ANTLR start "rule__TableBean__Group_2_6__0"
-    // InternalTableDSL.g:6758:1: rule__TableBean__Group_2_6__0 : rule__TableBean__Group_2_6__0__Impl rule__TableBean__Group_2_6__1 ;
-    public final void rule__TableBean__Group_2_6__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6762:1: ( rule__TableBean__Group_2_6__0__Impl rule__TableBean__Group_2_6__1 )
-            // InternalTableDSL.g:6763:2: rule__TableBean__Group_2_6__0__Impl rule__TableBean__Group_2_6__1
-            {
-            pushFollow(FOLLOW_7);
-            rule__TableBean__Group_2_6__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_2);
-            rule__TableBean__Group_2_6__1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_2_6__0"
-
-
-    // $ANTLR start "rule__TableBean__Group_2_6__0__Impl"
-    // InternalTableDSL.g:6770:1: rule__TableBean__Group_2_6__0__Impl : ( 'toolbar' ) ;
-    public final void rule__TableBean__Group_2_6__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6774:1: ( ( 'toolbar' ) )
-            // InternalTableDSL.g:6775:1: ( 'toolbar' )
-            {
-            // InternalTableDSL.g:6775:1: ( 'toolbar' )
-            // InternalTableDSL.g:6776:2: 'toolbar'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getToolbarKeyword_2_6_0()); 
-            }
-            match(input,81,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getToolbarKeyword_2_6_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_2_6__0__Impl"
-
-
-    // $ANTLR start "rule__TableBean__Group_2_6__1"
-    // InternalTableDSL.g:6785:1: rule__TableBean__Group_2_6__1 : rule__TableBean__Group_2_6__1__Impl ;
-    public final void rule__TableBean__Group_2_6__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6789:1: ( rule__TableBean__Group_2_6__1__Impl )
-            // InternalTableDSL.g:6790:2: rule__TableBean__Group_2_6__1__Impl
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableBean__Group_2_6__1__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_2_6__1"
-
-
-    // $ANTLR start "rule__TableBean__Group_2_6__1__Impl"
-    // InternalTableDSL.g:6796:1: rule__TableBean__Group_2_6__1__Impl : ( ( rule__TableBean__ToolbarAssignment_2_6_1 ) ) ;
-    public final void rule__TableBean__Group_2_6__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6800:1: ( ( ( rule__TableBean__ToolbarAssignment_2_6_1 ) ) )
-            // InternalTableDSL.g:6801:1: ( ( rule__TableBean__ToolbarAssignment_2_6_1 ) )
-            {
-            // InternalTableDSL.g:6801:1: ( ( rule__TableBean__ToolbarAssignment_2_6_1 ) )
-            // InternalTableDSL.g:6802:2: ( rule__TableBean__ToolbarAssignment_2_6_1 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getToolbarAssignment_2_6_1()); 
-            }
-            // InternalTableDSL.g:6803:2: ( rule__TableBean__ToolbarAssignment_2_6_1 )
-            // InternalTableDSL.g:6803:3: rule__TableBean__ToolbarAssignment_2_6_1
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableBean__ToolbarAssignment_2_6_1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getToolbarAssignment_2_6_1()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_2_6__1__Impl"
-
-
-    // $ANTLR start "rule__TableBean__Group_3__0"
-    // InternalTableDSL.g:6812:1: rule__TableBean__Group_3__0 : rule__TableBean__Group_3__0__Impl rule__TableBean__Group_3__1 ;
-    public final void rule__TableBean__Group_3__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6816:1: ( rule__TableBean__Group_3__0__Impl rule__TableBean__Group_3__1 )
-            // InternalTableDSL.g:6817:2: rule__TableBean__Group_3__0__Impl rule__TableBean__Group_3__1
-            {
-            pushFollow(FOLLOW_21);
-            rule__TableBean__Group_3__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_2);
-            rule__TableBean__Group_3__1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_3__0"
-
-
-    // $ANTLR start "rule__TableBean__Group_3__0__Impl"
-    // InternalTableDSL.g:6824:1: rule__TableBean__Group_3__0__Impl : ( 'using' ) ;
-    public final void rule__TableBean__Group_3__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6828:1: ( ( 'using' ) )
-            // InternalTableDSL.g:6829:1: ( 'using' )
-            {
-            // InternalTableDSL.g:6829:1: ( 'using' )
-            // InternalTableDSL.g:6830:2: 'using'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getUsingKeyword_3_0()); 
-            }
-            match(input,82,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getUsingKeyword_3_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_3__0__Impl"
-
-
-    // $ANTLR start "rule__TableBean__Group_3__1"
-    // InternalTableDSL.g:6839:1: rule__TableBean__Group_3__1 : rule__TableBean__Group_3__1__Impl ;
-    public final void rule__TableBean__Group_3__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6843:1: ( rule__TableBean__Group_3__1__Impl )
-            // InternalTableDSL.g:6844:2: rule__TableBean__Group_3__1__Impl
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableBean__Group_3__1__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_3__1"
-
-
-    // $ANTLR start "rule__TableBean__Group_3__1__Impl"
-    // InternalTableDSL.g:6850:1: rule__TableBean__Group_3__1__Impl : ( ( rule__TableBean__SourceAssignment_3_1 ) ) ;
-    public final void rule__TableBean__Group_3__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:6854:1: ( ( ( rule__TableBean__SourceAssignment_3_1 ) ) )
-            // InternalTableDSL.g:6855:1: ( ( rule__TableBean__SourceAssignment_3_1 ) )
-            {
-            // InternalTableDSL.g:6855:1: ( ( rule__TableBean__SourceAssignment_3_1 ) )
-            // InternalTableDSL.g:6856:2: ( rule__TableBean__SourceAssignment_3_1 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getSourceAssignment_3_1()); 
-            }
-            // InternalTableDSL.g:6857:2: ( rule__TableBean__SourceAssignment_3_1 )
-            // InternalTableDSL.g:6857:3: rule__TableBean__SourceAssignment_3_1
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableBean__SourceAssignment_3_1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getSourceAssignment_3_1()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__Group_3__1__Impl"
-
-
     // $ANTLR start "rule__TablePreorder__Group__0"
-    // InternalTableDSL.g:6866:1: rule__TablePreorder__Group__0 : rule__TablePreorder__Group__0__Impl rule__TablePreorder__Group__1 ;
+    // InternalTableDSL.g:6434:1: rule__TablePreorder__Group__0 : rule__TablePreorder__Group__0__Impl rule__TablePreorder__Group__1 ;
     public final void rule__TablePreorder__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6870:1: ( rule__TablePreorder__Group__0__Impl rule__TablePreorder__Group__1 )
-            // InternalTableDSL.g:6871:2: rule__TablePreorder__Group__0__Impl rule__TablePreorder__Group__1
+            // InternalTableDSL.g:6438:1: ( rule__TablePreorder__Group__0__Impl rule__TablePreorder__Group__1 )
+            // InternalTableDSL.g:6439:2: rule__TablePreorder__Group__0__Impl rule__TablePreorder__Group__1
             {
             pushFollow(FOLLOW_23);
             rule__TablePreorder__Group__0__Impl();
@@ -24704,23 +23365,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TablePreorder__Group__0__Impl"
-    // InternalTableDSL.g:6878:1: rule__TablePreorder__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:6446:1: rule__TablePreorder__Group__0__Impl : ( () ) ;
     public final void rule__TablePreorder__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6882:1: ( ( () ) )
-            // InternalTableDSL.g:6883:1: ( () )
+            // InternalTableDSL.g:6450:1: ( ( () ) )
+            // InternalTableDSL.g:6451:1: ( () )
             {
-            // InternalTableDSL.g:6883:1: ( () )
-            // InternalTableDSL.g:6884:2: ()
+            // InternalTableDSL.g:6451:1: ( () )
+            // InternalTableDSL.g:6452:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTablePreorderAccess().getTablePreorderAction_0()); 
             }
-            // InternalTableDSL.g:6885:2: ()
-            // InternalTableDSL.g:6885:3: 
+            // InternalTableDSL.g:6453:2: ()
+            // InternalTableDSL.g:6453:3: 
             {
             }
 
@@ -24745,14 +23406,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TablePreorder__Group__1"
-    // InternalTableDSL.g:6893:1: rule__TablePreorder__Group__1 : rule__TablePreorder__Group__1__Impl rule__TablePreorder__Group__2 ;
+    // InternalTableDSL.g:6461:1: rule__TablePreorder__Group__1 : rule__TablePreorder__Group__1__Impl rule__TablePreorder__Group__2 ;
     public final void rule__TablePreorder__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6897:1: ( rule__TablePreorder__Group__1__Impl rule__TablePreorder__Group__2 )
-            // InternalTableDSL.g:6898:2: rule__TablePreorder__Group__1__Impl rule__TablePreorder__Group__2
+            // InternalTableDSL.g:6465:1: ( rule__TablePreorder__Group__1__Impl rule__TablePreorder__Group__2 )
+            // InternalTableDSL.g:6466:2: rule__TablePreorder__Group__1__Impl rule__TablePreorder__Group__2
             {
             pushFollow(FOLLOW_24);
             rule__TablePreorder__Group__1__Impl();
@@ -24783,17 +23444,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TablePreorder__Group__1__Impl"
-    // InternalTableDSL.g:6905:1: rule__TablePreorder__Group__1__Impl : ( 'preorder' ) ;
+    // InternalTableDSL.g:6473:1: rule__TablePreorder__Group__1__Impl : ( 'preorder' ) ;
     public final void rule__TablePreorder__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6909:1: ( ( 'preorder' ) )
-            // InternalTableDSL.g:6910:1: ( 'preorder' )
+            // InternalTableDSL.g:6477:1: ( ( 'preorder' ) )
+            // InternalTableDSL.g:6478:1: ( 'preorder' )
             {
-            // InternalTableDSL.g:6910:1: ( 'preorder' )
-            // InternalTableDSL.g:6911:2: 'preorder'
+            // InternalTableDSL.g:6478:1: ( 'preorder' )
+            // InternalTableDSL.g:6479:2: 'preorder'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTablePreorderAccess().getPreorderKeyword_1()); 
@@ -24824,14 +23485,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TablePreorder__Group__2"
-    // InternalTableDSL.g:6920:1: rule__TablePreorder__Group__2 : rule__TablePreorder__Group__2__Impl rule__TablePreorder__Group__3 ;
+    // InternalTableDSL.g:6488:1: rule__TablePreorder__Group__2 : rule__TablePreorder__Group__2__Impl rule__TablePreorder__Group__3 ;
     public final void rule__TablePreorder__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6924:1: ( rule__TablePreorder__Group__2__Impl rule__TablePreorder__Group__3 )
-            // InternalTableDSL.g:6925:2: rule__TablePreorder__Group__2__Impl rule__TablePreorder__Group__3
+            // InternalTableDSL.g:6492:1: ( rule__TablePreorder__Group__2__Impl rule__TablePreorder__Group__3 )
+            // InternalTableDSL.g:6493:2: rule__TablePreorder__Group__2__Impl rule__TablePreorder__Group__3
             {
             pushFollow(FOLLOW_25);
             rule__TablePreorder__Group__2__Impl();
@@ -24862,23 +23523,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TablePreorder__Group__2__Impl"
-    // InternalTableDSL.g:6932:1: rule__TablePreorder__Group__2__Impl : ( ( rule__TablePreorder__ColumnAssignment_2 ) ) ;
+    // InternalTableDSL.g:6500:1: rule__TablePreorder__Group__2__Impl : ( ( rule__TablePreorder__ColumnAssignment_2 ) ) ;
     public final void rule__TablePreorder__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6936:1: ( ( ( rule__TablePreorder__ColumnAssignment_2 ) ) )
-            // InternalTableDSL.g:6937:1: ( ( rule__TablePreorder__ColumnAssignment_2 ) )
+            // InternalTableDSL.g:6504:1: ( ( ( rule__TablePreorder__ColumnAssignment_2 ) ) )
+            // InternalTableDSL.g:6505:1: ( ( rule__TablePreorder__ColumnAssignment_2 ) )
             {
-            // InternalTableDSL.g:6937:1: ( ( rule__TablePreorder__ColumnAssignment_2 ) )
-            // InternalTableDSL.g:6938:2: ( rule__TablePreorder__ColumnAssignment_2 )
+            // InternalTableDSL.g:6505:1: ( ( rule__TablePreorder__ColumnAssignment_2 ) )
+            // InternalTableDSL.g:6506:2: ( rule__TablePreorder__ColumnAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTablePreorderAccess().getColumnAssignment_2()); 
             }
-            // InternalTableDSL.g:6939:2: ( rule__TablePreorder__ColumnAssignment_2 )
-            // InternalTableDSL.g:6939:3: rule__TablePreorder__ColumnAssignment_2
+            // InternalTableDSL.g:6507:2: ( rule__TablePreorder__ColumnAssignment_2 )
+            // InternalTableDSL.g:6507:3: rule__TablePreorder__ColumnAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TablePreorder__ColumnAssignment_2();
@@ -24913,14 +23574,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TablePreorder__Group__3"
-    // InternalTableDSL.g:6947:1: rule__TablePreorder__Group__3 : rule__TablePreorder__Group__3__Impl ;
+    // InternalTableDSL.g:6515:1: rule__TablePreorder__Group__3 : rule__TablePreorder__Group__3__Impl ;
     public final void rule__TablePreorder__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6951:1: ( rule__TablePreorder__Group__3__Impl )
-            // InternalTableDSL.g:6952:2: rule__TablePreorder__Group__3__Impl
+            // InternalTableDSL.g:6519:1: ( rule__TablePreorder__Group__3__Impl )
+            // InternalTableDSL.g:6520:2: rule__TablePreorder__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TablePreorder__Group__3__Impl();
@@ -24946,31 +23607,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TablePreorder__Group__3__Impl"
-    // InternalTableDSL.g:6958:1: rule__TablePreorder__Group__3__Impl : ( ( rule__TablePreorder__AscendingAssignment_3 )? ) ;
+    // InternalTableDSL.g:6526:1: rule__TablePreorder__Group__3__Impl : ( ( rule__TablePreorder__AscendingAssignment_3 )? ) ;
     public final void rule__TablePreorder__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6962:1: ( ( ( rule__TablePreorder__AscendingAssignment_3 )? ) )
-            // InternalTableDSL.g:6963:1: ( ( rule__TablePreorder__AscendingAssignment_3 )? )
+            // InternalTableDSL.g:6530:1: ( ( ( rule__TablePreorder__AscendingAssignment_3 )? ) )
+            // InternalTableDSL.g:6531:1: ( ( rule__TablePreorder__AscendingAssignment_3 )? )
             {
-            // InternalTableDSL.g:6963:1: ( ( rule__TablePreorder__AscendingAssignment_3 )? )
-            // InternalTableDSL.g:6964:2: ( rule__TablePreorder__AscendingAssignment_3 )?
+            // InternalTableDSL.g:6531:1: ( ( rule__TablePreorder__AscendingAssignment_3 )? )
+            // InternalTableDSL.g:6532:2: ( rule__TablePreorder__AscendingAssignment_3 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTablePreorderAccess().getAscendingAssignment_3()); 
             }
-            // InternalTableDSL.g:6965:2: ( rule__TablePreorder__AscendingAssignment_3 )?
-            int alt67=2;
-            int LA67_0 = input.LA(1);
+            // InternalTableDSL.g:6533:2: ( rule__TablePreorder__AscendingAssignment_3 )?
+            int alt66=2;
+            int LA66_0 = input.LA(1);
 
-            if ( (LA67_0==168) ) {
-                alt67=1;
+            if ( (LA66_0==167) ) {
+                alt66=1;
             }
-            switch (alt67) {
+            switch (alt66) {
                 case 1 :
-                    // InternalTableDSL.g:6965:3: rule__TablePreorder__AscendingAssignment_3
+                    // InternalTableDSL.g:6533:3: rule__TablePreorder__AscendingAssignment_3
                     {
                     pushFollow(FOLLOW_2);
                     rule__TablePreorder__AscendingAssignment_3();
@@ -25008,14 +23669,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group__0"
-    // InternalTableDSL.g:6974:1: rule__TableValue__Group__0 : rule__TableValue__Group__0__Impl rule__TableValue__Group__1 ;
+    // InternalTableDSL.g:6542:1: rule__TableValue__Group__0 : rule__TableValue__Group__0__Impl rule__TableValue__Group__1 ;
     public final void rule__TableValue__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6978:1: ( rule__TableValue__Group__0__Impl rule__TableValue__Group__1 )
-            // InternalTableDSL.g:6979:2: rule__TableValue__Group__0__Impl rule__TableValue__Group__1
+            // InternalTableDSL.g:6546:1: ( rule__TableValue__Group__0__Impl rule__TableValue__Group__1 )
+            // InternalTableDSL.g:6547:2: rule__TableValue__Group__0__Impl rule__TableValue__Group__1
             {
             pushFollow(FOLLOW_26);
             rule__TableValue__Group__0__Impl();
@@ -25046,23 +23707,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group__0__Impl"
-    // InternalTableDSL.g:6986:1: rule__TableValue__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:6554:1: rule__TableValue__Group__0__Impl : ( () ) ;
     public final void rule__TableValue__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:6990:1: ( ( () ) )
-            // InternalTableDSL.g:6991:1: ( () )
+            // InternalTableDSL.g:6558:1: ( ( () ) )
+            // InternalTableDSL.g:6559:1: ( () )
             {
-            // InternalTableDSL.g:6991:1: ( () )
-            // InternalTableDSL.g:6992:2: ()
+            // InternalTableDSL.g:6559:1: ( () )
+            // InternalTableDSL.g:6560:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getTableValueAction_0()); 
             }
-            // InternalTableDSL.g:6993:2: ()
-            // InternalTableDSL.g:6993:3: 
+            // InternalTableDSL.g:6561:2: ()
+            // InternalTableDSL.g:6561:3: 
             {
             }
 
@@ -25087,14 +23748,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group__1"
-    // InternalTableDSL.g:7001:1: rule__TableValue__Group__1 : rule__TableValue__Group__1__Impl rule__TableValue__Group__2 ;
+    // InternalTableDSL.g:6569:1: rule__TableValue__Group__1 : rule__TableValue__Group__1__Impl rule__TableValue__Group__2 ;
     public final void rule__TableValue__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7005:1: ( rule__TableValue__Group__1__Impl rule__TableValue__Group__2 )
-            // InternalTableDSL.g:7006:2: rule__TableValue__Group__1__Impl rule__TableValue__Group__2
+            // InternalTableDSL.g:6573:1: ( rule__TableValue__Group__1__Impl rule__TableValue__Group__2 )
+            // InternalTableDSL.g:6574:2: rule__TableValue__Group__1__Impl rule__TableValue__Group__2
             {
             pushFollow(FOLLOW_24);
             rule__TableValue__Group__1__Impl();
@@ -25125,17 +23786,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group__1__Impl"
-    // InternalTableDSL.g:7013:1: rule__TableValue__Group__1__Impl : ( 'value' ) ;
+    // InternalTableDSL.g:6581:1: rule__TableValue__Group__1__Impl : ( 'value' ) ;
     public final void rule__TableValue__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7017:1: ( ( 'value' ) )
-            // InternalTableDSL.g:7018:1: ( 'value' )
+            // InternalTableDSL.g:6585:1: ( ( 'value' ) )
+            // InternalTableDSL.g:6586:1: ( 'value' )
             {
-            // InternalTableDSL.g:7018:1: ( 'value' )
-            // InternalTableDSL.g:7019:2: 'value'
+            // InternalTableDSL.g:6586:1: ( 'value' )
+            // InternalTableDSL.g:6587:2: 'value'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getValueKeyword_1()); 
@@ -25166,14 +23827,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group__2"
-    // InternalTableDSL.g:7028:1: rule__TableValue__Group__2 : rule__TableValue__Group__2__Impl rule__TableValue__Group__3 ;
+    // InternalTableDSL.g:6596:1: rule__TableValue__Group__2 : rule__TableValue__Group__2__Impl rule__TableValue__Group__3 ;
     public final void rule__TableValue__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7032:1: ( rule__TableValue__Group__2__Impl rule__TableValue__Group__3 )
-            // InternalTableDSL.g:7033:2: rule__TableValue__Group__2__Impl rule__TableValue__Group__3
+            // InternalTableDSL.g:6600:1: ( rule__TableValue__Group__2__Impl rule__TableValue__Group__3 )
+            // InternalTableDSL.g:6601:2: rule__TableValue__Group__2__Impl rule__TableValue__Group__3
             {
             pushFollow(FOLLOW_27);
             rule__TableValue__Group__2__Impl();
@@ -25204,23 +23865,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group__2__Impl"
-    // InternalTableDSL.g:7040:1: rule__TableValue__Group__2__Impl : ( ( rule__TableValue__ColumnAssignment_2 ) ) ;
+    // InternalTableDSL.g:6608:1: rule__TableValue__Group__2__Impl : ( ( rule__TableValue__ColumnAssignment_2 ) ) ;
     public final void rule__TableValue__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7044:1: ( ( ( rule__TableValue__ColumnAssignment_2 ) ) )
-            // InternalTableDSL.g:7045:1: ( ( rule__TableValue__ColumnAssignment_2 ) )
+            // InternalTableDSL.g:6612:1: ( ( ( rule__TableValue__ColumnAssignment_2 ) ) )
+            // InternalTableDSL.g:6613:1: ( ( rule__TableValue__ColumnAssignment_2 ) )
             {
-            // InternalTableDSL.g:7045:1: ( ( rule__TableValue__ColumnAssignment_2 ) )
-            // InternalTableDSL.g:7046:2: ( rule__TableValue__ColumnAssignment_2 )
+            // InternalTableDSL.g:6613:1: ( ( rule__TableValue__ColumnAssignment_2 ) )
+            // InternalTableDSL.g:6614:2: ( rule__TableValue__ColumnAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getColumnAssignment_2()); 
             }
-            // InternalTableDSL.g:7047:2: ( rule__TableValue__ColumnAssignment_2 )
-            // InternalTableDSL.g:7047:3: rule__TableValue__ColumnAssignment_2
+            // InternalTableDSL.g:6615:2: ( rule__TableValue__ColumnAssignment_2 )
+            // InternalTableDSL.g:6615:3: rule__TableValue__ColumnAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TableValue__ColumnAssignment_2();
@@ -25255,14 +23916,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group__3"
-    // InternalTableDSL.g:7055:1: rule__TableValue__Group__3 : rule__TableValue__Group__3__Impl rule__TableValue__Group__4 ;
+    // InternalTableDSL.g:6623:1: rule__TableValue__Group__3 : rule__TableValue__Group__3__Impl rule__TableValue__Group__4 ;
     public final void rule__TableValue__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7059:1: ( rule__TableValue__Group__3__Impl rule__TableValue__Group__4 )
-            // InternalTableDSL.g:7060:2: rule__TableValue__Group__3__Impl rule__TableValue__Group__4
+            // InternalTableDSL.g:6627:1: ( rule__TableValue__Group__3__Impl rule__TableValue__Group__4 )
+            // InternalTableDSL.g:6628:2: rule__TableValue__Group__3__Impl rule__TableValue__Group__4
             {
             pushFollow(FOLLOW_28);
             rule__TableValue__Group__3__Impl();
@@ -25293,23 +23954,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group__3__Impl"
-    // InternalTableDSL.g:7067:1: rule__TableValue__Group__3__Impl : ( ( rule__TableValue__UnorderedGroup_3 ) ) ;
+    // InternalTableDSL.g:6635:1: rule__TableValue__Group__3__Impl : ( ( rule__TableValue__UnorderedGroup_3 ) ) ;
     public final void rule__TableValue__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7071:1: ( ( ( rule__TableValue__UnorderedGroup_3 ) ) )
-            // InternalTableDSL.g:7072:1: ( ( rule__TableValue__UnorderedGroup_3 ) )
+            // InternalTableDSL.g:6639:1: ( ( ( rule__TableValue__UnorderedGroup_3 ) ) )
+            // InternalTableDSL.g:6640:1: ( ( rule__TableValue__UnorderedGroup_3 ) )
             {
-            // InternalTableDSL.g:7072:1: ( ( rule__TableValue__UnorderedGroup_3 ) )
-            // InternalTableDSL.g:7073:2: ( rule__TableValue__UnorderedGroup_3 )
+            // InternalTableDSL.g:6640:1: ( ( rule__TableValue__UnorderedGroup_3 ) )
+            // InternalTableDSL.g:6641:2: ( rule__TableValue__UnorderedGroup_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getUnorderedGroup_3()); 
             }
-            // InternalTableDSL.g:7074:2: ( rule__TableValue__UnorderedGroup_3 )
-            // InternalTableDSL.g:7074:3: rule__TableValue__UnorderedGroup_3
+            // InternalTableDSL.g:6642:2: ( rule__TableValue__UnorderedGroup_3 )
+            // InternalTableDSL.g:6642:3: rule__TableValue__UnorderedGroup_3
             {
             pushFollow(FOLLOW_2);
             rule__TableValue__UnorderedGroup_3();
@@ -25344,14 +24005,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group__4"
-    // InternalTableDSL.g:7082:1: rule__TableValue__Group__4 : rule__TableValue__Group__4__Impl ;
+    // InternalTableDSL.g:6650:1: rule__TableValue__Group__4 : rule__TableValue__Group__4__Impl ;
     public final void rule__TableValue__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7086:1: ( rule__TableValue__Group__4__Impl )
-            // InternalTableDSL.g:7087:2: rule__TableValue__Group__4__Impl
+            // InternalTableDSL.g:6654:1: ( rule__TableValue__Group__4__Impl )
+            // InternalTableDSL.g:6655:2: rule__TableValue__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableValue__Group__4__Impl();
@@ -25377,23 +24038,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group__4__Impl"
-    // InternalTableDSL.g:7093:1: rule__TableValue__Group__4__Impl : ( ( rule__TableValue__UnorderedGroup_4 ) ) ;
+    // InternalTableDSL.g:6661:1: rule__TableValue__Group__4__Impl : ( ( rule__TableValue__UnorderedGroup_4 ) ) ;
     public final void rule__TableValue__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7097:1: ( ( ( rule__TableValue__UnorderedGroup_4 ) ) )
-            // InternalTableDSL.g:7098:1: ( ( rule__TableValue__UnorderedGroup_4 ) )
+            // InternalTableDSL.g:6665:1: ( ( ( rule__TableValue__UnorderedGroup_4 ) ) )
+            // InternalTableDSL.g:6666:1: ( ( rule__TableValue__UnorderedGroup_4 ) )
             {
-            // InternalTableDSL.g:7098:1: ( ( rule__TableValue__UnorderedGroup_4 ) )
-            // InternalTableDSL.g:7099:2: ( rule__TableValue__UnorderedGroup_4 )
+            // InternalTableDSL.g:6666:1: ( ( rule__TableValue__UnorderedGroup_4 ) )
+            // InternalTableDSL.g:6667:2: ( rule__TableValue__UnorderedGroup_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getUnorderedGroup_4()); 
             }
-            // InternalTableDSL.g:7100:2: ( rule__TableValue__UnorderedGroup_4 )
-            // InternalTableDSL.g:7100:3: rule__TableValue__UnorderedGroup_4
+            // InternalTableDSL.g:6668:2: ( rule__TableValue__UnorderedGroup_4 )
+            // InternalTableDSL.g:6668:3: rule__TableValue__UnorderedGroup_4
             {
             pushFollow(FOLLOW_2);
             rule__TableValue__UnorderedGroup_4();
@@ -25428,14 +24089,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_3_1__0"
-    // InternalTableDSL.g:7109:1: rule__TableValue__Group_3_1__0 : rule__TableValue__Group_3_1__0__Impl rule__TableValue__Group_3_1__1 ;
+    // InternalTableDSL.g:6677:1: rule__TableValue__Group_3_1__0 : rule__TableValue__Group_3_1__0__Impl rule__TableValue__Group_3_1__1 ;
     public final void rule__TableValue__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7113:1: ( rule__TableValue__Group_3_1__0__Impl rule__TableValue__Group_3_1__1 )
-            // InternalTableDSL.g:7114:2: rule__TableValue__Group_3_1__0__Impl rule__TableValue__Group_3_1__1
+            // InternalTableDSL.g:6681:1: ( rule__TableValue__Group_3_1__0__Impl rule__TableValue__Group_3_1__1 )
+            // InternalTableDSL.g:6682:2: rule__TableValue__Group_3_1__0__Impl rule__TableValue__Group_3_1__1
             {
             pushFollow(FOLLOW_14);
             rule__TableValue__Group_3_1__0__Impl();
@@ -25466,17 +24127,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_3_1__0__Impl"
-    // InternalTableDSL.g:7121:1: rule__TableValue__Group_3_1__0__Impl : ( 'icon' ) ;
+    // InternalTableDSL.g:6689:1: rule__TableValue__Group_3_1__0__Impl : ( 'icon' ) ;
     public final void rule__TableValue__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7125:1: ( ( 'icon' ) )
-            // InternalTableDSL.g:7126:1: ( 'icon' )
+            // InternalTableDSL.g:6693:1: ( ( 'icon' ) )
+            // InternalTableDSL.g:6694:1: ( 'icon' )
             {
-            // InternalTableDSL.g:7126:1: ( 'icon' )
-            // InternalTableDSL.g:7127:2: 'icon'
+            // InternalTableDSL.g:6694:1: ( 'icon' )
+            // InternalTableDSL.g:6695:2: 'icon'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getIconKeyword_3_1_0()); 
@@ -25507,14 +24168,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_3_1__1"
-    // InternalTableDSL.g:7136:1: rule__TableValue__Group_3_1__1 : rule__TableValue__Group_3_1__1__Impl ;
+    // InternalTableDSL.g:6704:1: rule__TableValue__Group_3_1__1 : rule__TableValue__Group_3_1__1__Impl ;
     public final void rule__TableValue__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7140:1: ( rule__TableValue__Group_3_1__1__Impl )
-            // InternalTableDSL.g:7141:2: rule__TableValue__Group_3_1__1__Impl
+            // InternalTableDSL.g:6708:1: ( rule__TableValue__Group_3_1__1__Impl )
+            // InternalTableDSL.g:6709:2: rule__TableValue__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableValue__Group_3_1__1__Impl();
@@ -25540,23 +24201,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_3_1__1__Impl"
-    // InternalTableDSL.g:7147:1: rule__TableValue__Group_3_1__1__Impl : ( ( rule__TableValue__IconNameAssignment_3_1_1 ) ) ;
+    // InternalTableDSL.g:6715:1: rule__TableValue__Group_3_1__1__Impl : ( ( rule__TableValue__IconNameAssignment_3_1_1 ) ) ;
     public final void rule__TableValue__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7151:1: ( ( ( rule__TableValue__IconNameAssignment_3_1_1 ) ) )
-            // InternalTableDSL.g:7152:1: ( ( rule__TableValue__IconNameAssignment_3_1_1 ) )
+            // InternalTableDSL.g:6719:1: ( ( ( rule__TableValue__IconNameAssignment_3_1_1 ) ) )
+            // InternalTableDSL.g:6720:1: ( ( rule__TableValue__IconNameAssignment_3_1_1 ) )
             {
-            // InternalTableDSL.g:7152:1: ( ( rule__TableValue__IconNameAssignment_3_1_1 ) )
-            // InternalTableDSL.g:7153:2: ( rule__TableValue__IconNameAssignment_3_1_1 )
+            // InternalTableDSL.g:6720:1: ( ( rule__TableValue__IconNameAssignment_3_1_1 ) )
+            // InternalTableDSL.g:6721:2: ( rule__TableValue__IconNameAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getIconNameAssignment_3_1_1()); 
             }
-            // InternalTableDSL.g:7154:2: ( rule__TableValue__IconNameAssignment_3_1_1 )
-            // InternalTableDSL.g:7154:3: rule__TableValue__IconNameAssignment_3_1_1
+            // InternalTableDSL.g:6722:2: ( rule__TableValue__IconNameAssignment_3_1_1 )
+            // InternalTableDSL.g:6722:3: rule__TableValue__IconNameAssignment_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__TableValue__IconNameAssignment_3_1_1();
@@ -25591,14 +24252,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_3_3__0"
-    // InternalTableDSL.g:7163:1: rule__TableValue__Group_3_3__0 : rule__TableValue__Group_3_3__0__Impl rule__TableValue__Group_3_3__1 ;
+    // InternalTableDSL.g:6731:1: rule__TableValue__Group_3_3__0 : rule__TableValue__Group_3_3__0__Impl rule__TableValue__Group_3_3__1 ;
     public final void rule__TableValue__Group_3_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7167:1: ( rule__TableValue__Group_3_3__0__Impl rule__TableValue__Group_3_3__1 )
-            // InternalTableDSL.g:7168:2: rule__TableValue__Group_3_3__0__Impl rule__TableValue__Group_3_3__1
+            // InternalTableDSL.g:6735:1: ( rule__TableValue__Group_3_3__0__Impl rule__TableValue__Group_3_3__1 )
+            // InternalTableDSL.g:6736:2: rule__TableValue__Group_3_3__0__Impl rule__TableValue__Group_3_3__1
             {
             pushFollow(FOLLOW_29);
             rule__TableValue__Group_3_3__0__Impl();
@@ -25629,23 +24290,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_3_3__0__Impl"
-    // InternalTableDSL.g:7175:1: rule__TableValue__Group_3_3__0__Impl : ( ( rule__TableValue__HasImageAssignment_3_3_0 ) ) ;
+    // InternalTableDSL.g:6743:1: rule__TableValue__Group_3_3__0__Impl : ( ( rule__TableValue__HasImageAssignment_3_3_0 ) ) ;
     public final void rule__TableValue__Group_3_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7179:1: ( ( ( rule__TableValue__HasImageAssignment_3_3_0 ) ) )
-            // InternalTableDSL.g:7180:1: ( ( rule__TableValue__HasImageAssignment_3_3_0 ) )
+            // InternalTableDSL.g:6747:1: ( ( ( rule__TableValue__HasImageAssignment_3_3_0 ) ) )
+            // InternalTableDSL.g:6748:1: ( ( rule__TableValue__HasImageAssignment_3_3_0 ) )
             {
-            // InternalTableDSL.g:7180:1: ( ( rule__TableValue__HasImageAssignment_3_3_0 ) )
-            // InternalTableDSL.g:7181:2: ( rule__TableValue__HasImageAssignment_3_3_0 )
+            // InternalTableDSL.g:6748:1: ( ( rule__TableValue__HasImageAssignment_3_3_0 ) )
+            // InternalTableDSL.g:6749:2: ( rule__TableValue__HasImageAssignment_3_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getHasImageAssignment_3_3_0()); 
             }
-            // InternalTableDSL.g:7182:2: ( rule__TableValue__HasImageAssignment_3_3_0 )
-            // InternalTableDSL.g:7182:3: rule__TableValue__HasImageAssignment_3_3_0
+            // InternalTableDSL.g:6750:2: ( rule__TableValue__HasImageAssignment_3_3_0 )
+            // InternalTableDSL.g:6750:3: rule__TableValue__HasImageAssignment_3_3_0
             {
             pushFollow(FOLLOW_2);
             rule__TableValue__HasImageAssignment_3_3_0();
@@ -25680,14 +24341,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_3_3__1"
-    // InternalTableDSL.g:7190:1: rule__TableValue__Group_3_3__1 : rule__TableValue__Group_3_3__1__Impl ;
+    // InternalTableDSL.g:6758:1: rule__TableValue__Group_3_3__1 : rule__TableValue__Group_3_3__1__Impl ;
     public final void rule__TableValue__Group_3_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7194:1: ( rule__TableValue__Group_3_3__1__Impl )
-            // InternalTableDSL.g:7195:2: rule__TableValue__Group_3_3__1__Impl
+            // InternalTableDSL.g:6762:1: ( rule__TableValue__Group_3_3__1__Impl )
+            // InternalTableDSL.g:6763:2: rule__TableValue__Group_3_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableValue__Group_3_3__1__Impl();
@@ -25713,23 +24374,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_3_3__1__Impl"
-    // InternalTableDSL.g:7201:1: rule__TableValue__Group_3_3__1__Impl : ( ( rule__TableValue__ImageAssignment_3_3_1 ) ) ;
+    // InternalTableDSL.g:6769:1: rule__TableValue__Group_3_3__1__Impl : ( ( rule__TableValue__ImageAssignment_3_3_1 ) ) ;
     public final void rule__TableValue__Group_3_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7205:1: ( ( ( rule__TableValue__ImageAssignment_3_3_1 ) ) )
-            // InternalTableDSL.g:7206:1: ( ( rule__TableValue__ImageAssignment_3_3_1 ) )
+            // InternalTableDSL.g:6773:1: ( ( ( rule__TableValue__ImageAssignment_3_3_1 ) ) )
+            // InternalTableDSL.g:6774:1: ( ( rule__TableValue__ImageAssignment_3_3_1 ) )
             {
-            // InternalTableDSL.g:7206:1: ( ( rule__TableValue__ImageAssignment_3_3_1 ) )
-            // InternalTableDSL.g:7207:2: ( rule__TableValue__ImageAssignment_3_3_1 )
+            // InternalTableDSL.g:6774:1: ( ( rule__TableValue__ImageAssignment_3_3_1 ) )
+            // InternalTableDSL.g:6775:2: ( rule__TableValue__ImageAssignment_3_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getImageAssignment_3_3_1()); 
             }
-            // InternalTableDSL.g:7208:2: ( rule__TableValue__ImageAssignment_3_3_1 )
-            // InternalTableDSL.g:7208:3: rule__TableValue__ImageAssignment_3_3_1
+            // InternalTableDSL.g:6776:2: ( rule__TableValue__ImageAssignment_3_3_1 )
+            // InternalTableDSL.g:6776:3: rule__TableValue__ImageAssignment_3_3_1
             {
             pushFollow(FOLLOW_2);
             rule__TableValue__ImageAssignment_3_3_1();
@@ -25764,14 +24425,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_0__0"
-    // InternalTableDSL.g:7217:1: rule__TableValue__Group_4_0__0 : rule__TableValue__Group_4_0__0__Impl rule__TableValue__Group_4_0__1 ;
+    // InternalTableDSL.g:6785:1: rule__TableValue__Group_4_0__0 : rule__TableValue__Group_4_0__0__Impl rule__TableValue__Group_4_0__1 ;
     public final void rule__TableValue__Group_4_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7221:1: ( rule__TableValue__Group_4_0__0__Impl rule__TableValue__Group_4_0__1 )
-            // InternalTableDSL.g:7222:2: rule__TableValue__Group_4_0__0__Impl rule__TableValue__Group_4_0__1
+            // InternalTableDSL.g:6789:1: ( rule__TableValue__Group_4_0__0__Impl rule__TableValue__Group_4_0__1 )
+            // InternalTableDSL.g:6790:2: rule__TableValue__Group_4_0__0__Impl rule__TableValue__Group_4_0__1
             {
             pushFollow(FOLLOW_30);
             rule__TableValue__Group_4_0__0__Impl();
@@ -25802,17 +24463,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_0__0__Impl"
-    // InternalTableDSL.g:7229:1: rule__TableValue__Group_4_0__0__Impl : ( 'intervals' ) ;
+    // InternalTableDSL.g:6797:1: rule__TableValue__Group_4_0__0__Impl : ( 'intervals' ) ;
     public final void rule__TableValue__Group_4_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7233:1: ( ( 'intervals' ) )
-            // InternalTableDSL.g:7234:1: ( 'intervals' )
+            // InternalTableDSL.g:6801:1: ( ( 'intervals' ) )
+            // InternalTableDSL.g:6802:1: ( 'intervals' )
             {
-            // InternalTableDSL.g:7234:1: ( 'intervals' )
-            // InternalTableDSL.g:7235:2: 'intervals'
+            // InternalTableDSL.g:6802:1: ( 'intervals' )
+            // InternalTableDSL.g:6803:2: 'intervals'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getIntervalsKeyword_4_0_0()); 
@@ -25843,14 +24504,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_0__1"
-    // InternalTableDSL.g:7244:1: rule__TableValue__Group_4_0__1 : rule__TableValue__Group_4_0__1__Impl rule__TableValue__Group_4_0__2 ;
+    // InternalTableDSL.g:6812:1: rule__TableValue__Group_4_0__1 : rule__TableValue__Group_4_0__1__Impl rule__TableValue__Group_4_0__2 ;
     public final void rule__TableValue__Group_4_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7248:1: ( rule__TableValue__Group_4_0__1__Impl rule__TableValue__Group_4_0__2 )
-            // InternalTableDSL.g:7249:2: rule__TableValue__Group_4_0__1__Impl rule__TableValue__Group_4_0__2
+            // InternalTableDSL.g:6816:1: ( rule__TableValue__Group_4_0__1__Impl rule__TableValue__Group_4_0__2 )
+            // InternalTableDSL.g:6817:2: rule__TableValue__Group_4_0__1__Impl rule__TableValue__Group_4_0__2
             {
             pushFollow(FOLLOW_30);
             rule__TableValue__Group_4_0__1__Impl();
@@ -25881,31 +24542,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_0__1__Impl"
-    // InternalTableDSL.g:7256:1: rule__TableValue__Group_4_0__1__Impl : ( ( rule__TableValue__HideLabelIntervalAssignment_4_0_1 )? ) ;
+    // InternalTableDSL.g:6824:1: rule__TableValue__Group_4_0__1__Impl : ( ( rule__TableValue__HideLabelIntervalAssignment_4_0_1 )? ) ;
     public final void rule__TableValue__Group_4_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7260:1: ( ( ( rule__TableValue__HideLabelIntervalAssignment_4_0_1 )? ) )
-            // InternalTableDSL.g:7261:1: ( ( rule__TableValue__HideLabelIntervalAssignment_4_0_1 )? )
+            // InternalTableDSL.g:6828:1: ( ( ( rule__TableValue__HideLabelIntervalAssignment_4_0_1 )? ) )
+            // InternalTableDSL.g:6829:1: ( ( rule__TableValue__HideLabelIntervalAssignment_4_0_1 )? )
             {
-            // InternalTableDSL.g:7261:1: ( ( rule__TableValue__HideLabelIntervalAssignment_4_0_1 )? )
-            // InternalTableDSL.g:7262:2: ( rule__TableValue__HideLabelIntervalAssignment_4_0_1 )?
+            // InternalTableDSL.g:6829:1: ( ( rule__TableValue__HideLabelIntervalAssignment_4_0_1 )? )
+            // InternalTableDSL.g:6830:2: ( rule__TableValue__HideLabelIntervalAssignment_4_0_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getHideLabelIntervalAssignment_4_0_1()); 
             }
-            // InternalTableDSL.g:7263:2: ( rule__TableValue__HideLabelIntervalAssignment_4_0_1 )?
-            int alt68=2;
-            int LA68_0 = input.LA(1);
+            // InternalTableDSL.g:6831:2: ( rule__TableValue__HideLabelIntervalAssignment_4_0_1 )?
+            int alt67=2;
+            int LA67_0 = input.LA(1);
 
-            if ( (LA68_0==171) ) {
-                alt68=1;
+            if ( (LA67_0==170) ) {
+                alt67=1;
             }
-            switch (alt68) {
+            switch (alt67) {
                 case 1 :
-                    // InternalTableDSL.g:7263:3: rule__TableValue__HideLabelIntervalAssignment_4_0_1
+                    // InternalTableDSL.g:6831:3: rule__TableValue__HideLabelIntervalAssignment_4_0_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableValue__HideLabelIntervalAssignment_4_0_1();
@@ -25943,14 +24604,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_0__2"
-    // InternalTableDSL.g:7271:1: rule__TableValue__Group_4_0__2 : rule__TableValue__Group_4_0__2__Impl rule__TableValue__Group_4_0__3 ;
+    // InternalTableDSL.g:6839:1: rule__TableValue__Group_4_0__2 : rule__TableValue__Group_4_0__2__Impl rule__TableValue__Group_4_0__3 ;
     public final void rule__TableValue__Group_4_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7275:1: ( rule__TableValue__Group_4_0__2__Impl rule__TableValue__Group_4_0__3 )
-            // InternalTableDSL.g:7276:2: rule__TableValue__Group_4_0__2__Impl rule__TableValue__Group_4_0__3
+            // InternalTableDSL.g:6843:1: ( rule__TableValue__Group_4_0__2__Impl rule__TableValue__Group_4_0__3 )
+            // InternalTableDSL.g:6844:2: rule__TableValue__Group_4_0__2__Impl rule__TableValue__Group_4_0__3
             {
             pushFollow(FOLLOW_31);
             rule__TableValue__Group_4_0__2__Impl();
@@ -25981,17 +24642,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_0__2__Impl"
-    // InternalTableDSL.g:7283:1: rule__TableValue__Group_4_0__2__Impl : ( '{' ) ;
+    // InternalTableDSL.g:6851:1: rule__TableValue__Group_4_0__2__Impl : ( '{' ) ;
     public final void rule__TableValue__Group_4_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7287:1: ( ( '{' ) )
-            // InternalTableDSL.g:7288:1: ( '{' )
+            // InternalTableDSL.g:6855:1: ( ( '{' ) )
+            // InternalTableDSL.g:6856:1: ( '{' )
             {
-            // InternalTableDSL.g:7288:1: ( '{' )
-            // InternalTableDSL.g:7289:2: '{'
+            // InternalTableDSL.g:6856:1: ( '{' )
+            // InternalTableDSL.g:6857:2: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getLeftCurlyBracketKeyword_4_0_2()); 
@@ -26022,14 +24683,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_0__3"
-    // InternalTableDSL.g:7298:1: rule__TableValue__Group_4_0__3 : rule__TableValue__Group_4_0__3__Impl rule__TableValue__Group_4_0__4 ;
+    // InternalTableDSL.g:6866:1: rule__TableValue__Group_4_0__3 : rule__TableValue__Group_4_0__3__Impl rule__TableValue__Group_4_0__4 ;
     public final void rule__TableValue__Group_4_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7302:1: ( rule__TableValue__Group_4_0__3__Impl rule__TableValue__Group_4_0__4 )
-            // InternalTableDSL.g:7303:2: rule__TableValue__Group_4_0__3__Impl rule__TableValue__Group_4_0__4
+            // InternalTableDSL.g:6870:1: ( rule__TableValue__Group_4_0__3__Impl rule__TableValue__Group_4_0__4 )
+            // InternalTableDSL.g:6871:2: rule__TableValue__Group_4_0__3__Impl rule__TableValue__Group_4_0__4
             {
             pushFollow(FOLLOW_31);
             rule__TableValue__Group_4_0__3__Impl();
@@ -26060,35 +24721,35 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_0__3__Impl"
-    // InternalTableDSL.g:7310:1: rule__TableValue__Group_4_0__3__Impl : ( ( rule__TableValue__IntervalsAssignment_4_0_3 )* ) ;
+    // InternalTableDSL.g:6878:1: rule__TableValue__Group_4_0__3__Impl : ( ( rule__TableValue__IntervalsAssignment_4_0_3 )* ) ;
     public final void rule__TableValue__Group_4_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7314:1: ( ( ( rule__TableValue__IntervalsAssignment_4_0_3 )* ) )
-            // InternalTableDSL.g:7315:1: ( ( rule__TableValue__IntervalsAssignment_4_0_3 )* )
+            // InternalTableDSL.g:6882:1: ( ( ( rule__TableValue__IntervalsAssignment_4_0_3 )* ) )
+            // InternalTableDSL.g:6883:1: ( ( rule__TableValue__IntervalsAssignment_4_0_3 )* )
             {
-            // InternalTableDSL.g:7315:1: ( ( rule__TableValue__IntervalsAssignment_4_0_3 )* )
-            // InternalTableDSL.g:7316:2: ( rule__TableValue__IntervalsAssignment_4_0_3 )*
+            // InternalTableDSL.g:6883:1: ( ( rule__TableValue__IntervalsAssignment_4_0_3 )* )
+            // InternalTableDSL.g:6884:2: ( rule__TableValue__IntervalsAssignment_4_0_3 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getIntervalsAssignment_4_0_3()); 
             }
-            // InternalTableDSL.g:7317:2: ( rule__TableValue__IntervalsAssignment_4_0_3 )*
-            loop69:
+            // InternalTableDSL.g:6885:2: ( rule__TableValue__IntervalsAssignment_4_0_3 )*
+            loop68:
             do {
-                int alt69=2;
-                int LA69_0 = input.LA(1);
+                int alt68=2;
+                int LA68_0 = input.LA(1);
 
-                if ( ((LA69_0>=101 && LA69_0<=103)) ) {
-                    alt69=1;
+                if ( ((LA68_0>=101 && LA68_0<=103)) ) {
+                    alt68=1;
                 }
 
 
-                switch (alt69) {
+                switch (alt68) {
             	case 1 :
-            	    // InternalTableDSL.g:7317:3: rule__TableValue__IntervalsAssignment_4_0_3
+            	    // InternalTableDSL.g:6885:3: rule__TableValue__IntervalsAssignment_4_0_3
             	    {
             	    pushFollow(FOLLOW_32);
             	    rule__TableValue__IntervalsAssignment_4_0_3();
@@ -26100,7 +24761,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop69;
+            	    break loop68;
                 }
             } while (true);
 
@@ -26129,14 +24790,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_0__4"
-    // InternalTableDSL.g:7325:1: rule__TableValue__Group_4_0__4 : rule__TableValue__Group_4_0__4__Impl ;
+    // InternalTableDSL.g:6893:1: rule__TableValue__Group_4_0__4 : rule__TableValue__Group_4_0__4__Impl ;
     public final void rule__TableValue__Group_4_0__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7329:1: ( rule__TableValue__Group_4_0__4__Impl )
-            // InternalTableDSL.g:7330:2: rule__TableValue__Group_4_0__4__Impl
+            // InternalTableDSL.g:6897:1: ( rule__TableValue__Group_4_0__4__Impl )
+            // InternalTableDSL.g:6898:2: rule__TableValue__Group_4_0__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableValue__Group_4_0__4__Impl();
@@ -26162,17 +24823,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_0__4__Impl"
-    // InternalTableDSL.g:7336:1: rule__TableValue__Group_4_0__4__Impl : ( '}' ) ;
+    // InternalTableDSL.g:6904:1: rule__TableValue__Group_4_0__4__Impl : ( '}' ) ;
     public final void rule__TableValue__Group_4_0__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7340:1: ( ( '}' ) )
-            // InternalTableDSL.g:7341:1: ( '}' )
+            // InternalTableDSL.g:6908:1: ( ( '}' ) )
+            // InternalTableDSL.g:6909:1: ( '}' )
             {
-            // InternalTableDSL.g:7341:1: ( '}' )
-            // InternalTableDSL.g:7342:2: '}'
+            // InternalTableDSL.g:6909:1: ( '}' )
+            // InternalTableDSL.g:6910:2: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getRightCurlyBracketKeyword_4_0_4()); 
@@ -26203,14 +24864,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_1__0"
-    // InternalTableDSL.g:7352:1: rule__TableValue__Group_4_1__0 : rule__TableValue__Group_4_1__0__Impl rule__TableValue__Group_4_1__1 ;
+    // InternalTableDSL.g:6920:1: rule__TableValue__Group_4_1__0 : rule__TableValue__Group_4_1__0__Impl rule__TableValue__Group_4_1__1 ;
     public final void rule__TableValue__Group_4_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7356:1: ( rule__TableValue__Group_4_1__0__Impl rule__TableValue__Group_4_1__1 )
-            // InternalTableDSL.g:7357:2: rule__TableValue__Group_4_1__0__Impl rule__TableValue__Group_4_1__1
+            // InternalTableDSL.g:6924:1: ( rule__TableValue__Group_4_1__0__Impl rule__TableValue__Group_4_1__1 )
+            // InternalTableDSL.g:6925:2: rule__TableValue__Group_4_1__0__Impl rule__TableValue__Group_4_1__1
             {
             pushFollow(FOLLOW_30);
             rule__TableValue__Group_4_1__0__Impl();
@@ -26241,17 +24902,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_1__0__Impl"
-    // InternalTableDSL.g:7364:1: rule__TableValue__Group_4_1__0__Impl : ( 'lookups' ) ;
+    // InternalTableDSL.g:6932:1: rule__TableValue__Group_4_1__0__Impl : ( 'lookups' ) ;
     public final void rule__TableValue__Group_4_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7368:1: ( ( 'lookups' ) )
-            // InternalTableDSL.g:7369:1: ( 'lookups' )
+            // InternalTableDSL.g:6936:1: ( ( 'lookups' ) )
+            // InternalTableDSL.g:6937:1: ( 'lookups' )
             {
-            // InternalTableDSL.g:7369:1: ( 'lookups' )
-            // InternalTableDSL.g:7370:2: 'lookups'
+            // InternalTableDSL.g:6937:1: ( 'lookups' )
+            // InternalTableDSL.g:6938:2: 'lookups'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getLookupsKeyword_4_1_0()); 
@@ -26282,14 +24943,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_1__1"
-    // InternalTableDSL.g:7379:1: rule__TableValue__Group_4_1__1 : rule__TableValue__Group_4_1__1__Impl rule__TableValue__Group_4_1__2 ;
+    // InternalTableDSL.g:6947:1: rule__TableValue__Group_4_1__1 : rule__TableValue__Group_4_1__1__Impl rule__TableValue__Group_4_1__2 ;
     public final void rule__TableValue__Group_4_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7383:1: ( rule__TableValue__Group_4_1__1__Impl rule__TableValue__Group_4_1__2 )
-            // InternalTableDSL.g:7384:2: rule__TableValue__Group_4_1__1__Impl rule__TableValue__Group_4_1__2
+            // InternalTableDSL.g:6951:1: ( rule__TableValue__Group_4_1__1__Impl rule__TableValue__Group_4_1__2 )
+            // InternalTableDSL.g:6952:2: rule__TableValue__Group_4_1__1__Impl rule__TableValue__Group_4_1__2
             {
             pushFollow(FOLLOW_30);
             rule__TableValue__Group_4_1__1__Impl();
@@ -26320,31 +24981,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_1__1__Impl"
-    // InternalTableDSL.g:7391:1: rule__TableValue__Group_4_1__1__Impl : ( ( rule__TableValue__HideLabelLookupAssignment_4_1_1 )? ) ;
+    // InternalTableDSL.g:6959:1: rule__TableValue__Group_4_1__1__Impl : ( ( rule__TableValue__HideLabelLookupAssignment_4_1_1 )? ) ;
     public final void rule__TableValue__Group_4_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7395:1: ( ( ( rule__TableValue__HideLabelLookupAssignment_4_1_1 )? ) )
-            // InternalTableDSL.g:7396:1: ( ( rule__TableValue__HideLabelLookupAssignment_4_1_1 )? )
+            // InternalTableDSL.g:6963:1: ( ( ( rule__TableValue__HideLabelLookupAssignment_4_1_1 )? ) )
+            // InternalTableDSL.g:6964:1: ( ( rule__TableValue__HideLabelLookupAssignment_4_1_1 )? )
             {
-            // InternalTableDSL.g:7396:1: ( ( rule__TableValue__HideLabelLookupAssignment_4_1_1 )? )
-            // InternalTableDSL.g:7397:2: ( rule__TableValue__HideLabelLookupAssignment_4_1_1 )?
+            // InternalTableDSL.g:6964:1: ( ( rule__TableValue__HideLabelLookupAssignment_4_1_1 )? )
+            // InternalTableDSL.g:6965:2: ( rule__TableValue__HideLabelLookupAssignment_4_1_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getHideLabelLookupAssignment_4_1_1()); 
             }
-            // InternalTableDSL.g:7398:2: ( rule__TableValue__HideLabelLookupAssignment_4_1_1 )?
-            int alt70=2;
-            int LA70_0 = input.LA(1);
+            // InternalTableDSL.g:6966:2: ( rule__TableValue__HideLabelLookupAssignment_4_1_1 )?
+            int alt69=2;
+            int LA69_0 = input.LA(1);
 
-            if ( (LA70_0==171) ) {
-                alt70=1;
+            if ( (LA69_0==170) ) {
+                alt69=1;
             }
-            switch (alt70) {
+            switch (alt69) {
                 case 1 :
-                    // InternalTableDSL.g:7398:3: rule__TableValue__HideLabelLookupAssignment_4_1_1
+                    // InternalTableDSL.g:6966:3: rule__TableValue__HideLabelLookupAssignment_4_1_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableValue__HideLabelLookupAssignment_4_1_1();
@@ -26382,14 +25043,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_1__2"
-    // InternalTableDSL.g:7406:1: rule__TableValue__Group_4_1__2 : rule__TableValue__Group_4_1__2__Impl rule__TableValue__Group_4_1__3 ;
+    // InternalTableDSL.g:6974:1: rule__TableValue__Group_4_1__2 : rule__TableValue__Group_4_1__2__Impl rule__TableValue__Group_4_1__3 ;
     public final void rule__TableValue__Group_4_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7410:1: ( rule__TableValue__Group_4_1__2__Impl rule__TableValue__Group_4_1__3 )
-            // InternalTableDSL.g:7411:2: rule__TableValue__Group_4_1__2__Impl rule__TableValue__Group_4_1__3
+            // InternalTableDSL.g:6978:1: ( rule__TableValue__Group_4_1__2__Impl rule__TableValue__Group_4_1__3 )
+            // InternalTableDSL.g:6979:2: rule__TableValue__Group_4_1__2__Impl rule__TableValue__Group_4_1__3
             {
             pushFollow(FOLLOW_33);
             rule__TableValue__Group_4_1__2__Impl();
@@ -26420,17 +25081,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_1__2__Impl"
-    // InternalTableDSL.g:7418:1: rule__TableValue__Group_4_1__2__Impl : ( '{' ) ;
+    // InternalTableDSL.g:6986:1: rule__TableValue__Group_4_1__2__Impl : ( '{' ) ;
     public final void rule__TableValue__Group_4_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7422:1: ( ( '{' ) )
-            // InternalTableDSL.g:7423:1: ( '{' )
+            // InternalTableDSL.g:6990:1: ( ( '{' ) )
+            // InternalTableDSL.g:6991:1: ( '{' )
             {
-            // InternalTableDSL.g:7423:1: ( '{' )
-            // InternalTableDSL.g:7424:2: '{'
+            // InternalTableDSL.g:6991:1: ( '{' )
+            // InternalTableDSL.g:6992:2: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getLeftCurlyBracketKeyword_4_1_2()); 
@@ -26461,14 +25122,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_1__3"
-    // InternalTableDSL.g:7433:1: rule__TableValue__Group_4_1__3 : rule__TableValue__Group_4_1__3__Impl rule__TableValue__Group_4_1__4 ;
+    // InternalTableDSL.g:7001:1: rule__TableValue__Group_4_1__3 : rule__TableValue__Group_4_1__3__Impl rule__TableValue__Group_4_1__4 ;
     public final void rule__TableValue__Group_4_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7437:1: ( rule__TableValue__Group_4_1__3__Impl rule__TableValue__Group_4_1__4 )
-            // InternalTableDSL.g:7438:2: rule__TableValue__Group_4_1__3__Impl rule__TableValue__Group_4_1__4
+            // InternalTableDSL.g:7005:1: ( rule__TableValue__Group_4_1__3__Impl rule__TableValue__Group_4_1__4 )
+            // InternalTableDSL.g:7006:2: rule__TableValue__Group_4_1__3__Impl rule__TableValue__Group_4_1__4
             {
             pushFollow(FOLLOW_33);
             rule__TableValue__Group_4_1__3__Impl();
@@ -26499,35 +25160,35 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_1__3__Impl"
-    // InternalTableDSL.g:7445:1: rule__TableValue__Group_4_1__3__Impl : ( ( rule__TableValue__LookupsAssignment_4_1_3 )* ) ;
+    // InternalTableDSL.g:7013:1: rule__TableValue__Group_4_1__3__Impl : ( ( rule__TableValue__LookupsAssignment_4_1_3 )* ) ;
     public final void rule__TableValue__Group_4_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7449:1: ( ( ( rule__TableValue__LookupsAssignment_4_1_3 )* ) )
-            // InternalTableDSL.g:7450:1: ( ( rule__TableValue__LookupsAssignment_4_1_3 )* )
+            // InternalTableDSL.g:7017:1: ( ( ( rule__TableValue__LookupsAssignment_4_1_3 )* ) )
+            // InternalTableDSL.g:7018:1: ( ( rule__TableValue__LookupsAssignment_4_1_3 )* )
             {
-            // InternalTableDSL.g:7450:1: ( ( rule__TableValue__LookupsAssignment_4_1_3 )* )
-            // InternalTableDSL.g:7451:2: ( rule__TableValue__LookupsAssignment_4_1_3 )*
+            // InternalTableDSL.g:7018:1: ( ( rule__TableValue__LookupsAssignment_4_1_3 )* )
+            // InternalTableDSL.g:7019:2: ( rule__TableValue__LookupsAssignment_4_1_3 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getLookupsAssignment_4_1_3()); 
             }
-            // InternalTableDSL.g:7452:2: ( rule__TableValue__LookupsAssignment_4_1_3 )*
-            loop71:
+            // InternalTableDSL.g:7020:2: ( rule__TableValue__LookupsAssignment_4_1_3 )*
+            loop70:
             do {
-                int alt71=2;
-                int LA71_0 = input.LA(1);
+                int alt70=2;
+                int LA70_0 = input.LA(1);
 
-                if ( ((LA71_0>=103 && LA71_0<=106)) ) {
-                    alt71=1;
+                if ( ((LA70_0>=103 && LA70_0<=106)) ) {
+                    alt70=1;
                 }
 
 
-                switch (alt71) {
+                switch (alt70) {
             	case 1 :
-            	    // InternalTableDSL.g:7452:3: rule__TableValue__LookupsAssignment_4_1_3
+            	    // InternalTableDSL.g:7020:3: rule__TableValue__LookupsAssignment_4_1_3
             	    {
             	    pushFollow(FOLLOW_34);
             	    rule__TableValue__LookupsAssignment_4_1_3();
@@ -26539,7 +25200,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop71;
+            	    break loop70;
                 }
             } while (true);
 
@@ -26568,14 +25229,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_1__4"
-    // InternalTableDSL.g:7460:1: rule__TableValue__Group_4_1__4 : rule__TableValue__Group_4_1__4__Impl ;
+    // InternalTableDSL.g:7028:1: rule__TableValue__Group_4_1__4 : rule__TableValue__Group_4_1__4__Impl ;
     public final void rule__TableValue__Group_4_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7464:1: ( rule__TableValue__Group_4_1__4__Impl )
-            // InternalTableDSL.g:7465:2: rule__TableValue__Group_4_1__4__Impl
+            // InternalTableDSL.g:7032:1: ( rule__TableValue__Group_4_1__4__Impl )
+            // InternalTableDSL.g:7033:2: rule__TableValue__Group_4_1__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableValue__Group_4_1__4__Impl();
@@ -26601,17 +25262,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__Group_4_1__4__Impl"
-    // InternalTableDSL.g:7471:1: rule__TableValue__Group_4_1__4__Impl : ( '}' ) ;
+    // InternalTableDSL.g:7039:1: rule__TableValue__Group_4_1__4__Impl : ( '}' ) ;
     public final void rule__TableValue__Group_4_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7475:1: ( ( '}' ) )
-            // InternalTableDSL.g:7476:1: ( '}' )
+            // InternalTableDSL.g:7043:1: ( ( '}' ) )
+            // InternalTableDSL.g:7044:1: ( '}' )
             {
-            // InternalTableDSL.g:7476:1: ( '}' )
-            // InternalTableDSL.g:7477:2: '}'
+            // InternalTableDSL.g:7044:1: ( '}' )
+            // InternalTableDSL.g:7045:2: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getRightCurlyBracketKeyword_4_1_4()); 
@@ -26642,14 +25303,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableFormatter__Group__0"
-    // InternalTableDSL.g:7487:1: rule__TableFormatter__Group__0 : rule__TableFormatter__Group__0__Impl rule__TableFormatter__Group__1 ;
+    // InternalTableDSL.g:7055:1: rule__TableFormatter__Group__0 : rule__TableFormatter__Group__0__Impl rule__TableFormatter__Group__1 ;
     public final void rule__TableFormatter__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7491:1: ( rule__TableFormatter__Group__0__Impl rule__TableFormatter__Group__1 )
-            // InternalTableDSL.g:7492:2: rule__TableFormatter__Group__0__Impl rule__TableFormatter__Group__1
+            // InternalTableDSL.g:7059:1: ( rule__TableFormatter__Group__0__Impl rule__TableFormatter__Group__1 )
+            // InternalTableDSL.g:7060:2: rule__TableFormatter__Group__0__Impl rule__TableFormatter__Group__1
             {
             pushFollow(FOLLOW_35);
             rule__TableFormatter__Group__0__Impl();
@@ -26680,23 +25341,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableFormatter__Group__0__Impl"
-    // InternalTableDSL.g:7499:1: rule__TableFormatter__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:7067:1: rule__TableFormatter__Group__0__Impl : ( () ) ;
     public final void rule__TableFormatter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7503:1: ( ( () ) )
-            // InternalTableDSL.g:7504:1: ( () )
+            // InternalTableDSL.g:7071:1: ( ( () ) )
+            // InternalTableDSL.g:7072:1: ( () )
             {
-            // InternalTableDSL.g:7504:1: ( () )
-            // InternalTableDSL.g:7505:2: ()
+            // InternalTableDSL.g:7072:1: ( () )
+            // InternalTableDSL.g:7073:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableFormatterAccess().getTableFormatterAction_0()); 
             }
-            // InternalTableDSL.g:7506:2: ()
-            // InternalTableDSL.g:7506:3: 
+            // InternalTableDSL.g:7074:2: ()
+            // InternalTableDSL.g:7074:3: 
             {
             }
 
@@ -26721,14 +25382,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableFormatter__Group__1"
-    // InternalTableDSL.g:7514:1: rule__TableFormatter__Group__1 : rule__TableFormatter__Group__1__Impl rule__TableFormatter__Group__2 ;
+    // InternalTableDSL.g:7082:1: rule__TableFormatter__Group__1 : rule__TableFormatter__Group__1__Impl rule__TableFormatter__Group__2 ;
     public final void rule__TableFormatter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7518:1: ( rule__TableFormatter__Group__1__Impl rule__TableFormatter__Group__2 )
-            // InternalTableDSL.g:7519:2: rule__TableFormatter__Group__1__Impl rule__TableFormatter__Group__2
+            // InternalTableDSL.g:7086:1: ( rule__TableFormatter__Group__1__Impl rule__TableFormatter__Group__2 )
+            // InternalTableDSL.g:7087:2: rule__TableFormatter__Group__1__Impl rule__TableFormatter__Group__2
             {
             pushFollow(FOLLOW_14);
             rule__TableFormatter__Group__1__Impl();
@@ -26759,17 +25420,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableFormatter__Group__1__Impl"
-    // InternalTableDSL.g:7526:1: rule__TableFormatter__Group__1__Impl : ( 'formatter' ) ;
+    // InternalTableDSL.g:7094:1: rule__TableFormatter__Group__1__Impl : ( 'formatter' ) ;
     public final void rule__TableFormatter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7530:1: ( ( 'formatter' ) )
-            // InternalTableDSL.g:7531:1: ( 'formatter' )
+            // InternalTableDSL.g:7098:1: ( ( 'formatter' ) )
+            // InternalTableDSL.g:7099:1: ( 'formatter' )
             {
-            // InternalTableDSL.g:7531:1: ( 'formatter' )
-            // InternalTableDSL.g:7532:2: 'formatter'
+            // InternalTableDSL.g:7099:1: ( 'formatter' )
+            // InternalTableDSL.g:7100:2: 'formatter'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableFormatterAccess().getFormatterKeyword_1()); 
@@ -26800,14 +25461,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableFormatter__Group__2"
-    // InternalTableDSL.g:7541:1: rule__TableFormatter__Group__2 : rule__TableFormatter__Group__2__Impl ;
+    // InternalTableDSL.g:7109:1: rule__TableFormatter__Group__2 : rule__TableFormatter__Group__2__Impl ;
     public final void rule__TableFormatter__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7545:1: ( rule__TableFormatter__Group__2__Impl )
-            // InternalTableDSL.g:7546:2: rule__TableFormatter__Group__2__Impl
+            // InternalTableDSL.g:7113:1: ( rule__TableFormatter__Group__2__Impl )
+            // InternalTableDSL.g:7114:2: rule__TableFormatter__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableFormatter__Group__2__Impl();
@@ -26833,23 +25494,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableFormatter__Group__2__Impl"
-    // InternalTableDSL.g:7552:1: rule__TableFormatter__Group__2__Impl : ( ( rule__TableFormatter__FormatAssignment_2 ) ) ;
+    // InternalTableDSL.g:7120:1: rule__TableFormatter__Group__2__Impl : ( ( rule__TableFormatter__FormatAssignment_2 ) ) ;
     public final void rule__TableFormatter__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7556:1: ( ( ( rule__TableFormatter__FormatAssignment_2 ) ) )
-            // InternalTableDSL.g:7557:1: ( ( rule__TableFormatter__FormatAssignment_2 ) )
+            // InternalTableDSL.g:7124:1: ( ( ( rule__TableFormatter__FormatAssignment_2 ) ) )
+            // InternalTableDSL.g:7125:1: ( ( rule__TableFormatter__FormatAssignment_2 ) )
             {
-            // InternalTableDSL.g:7557:1: ( ( rule__TableFormatter__FormatAssignment_2 ) )
-            // InternalTableDSL.g:7558:2: ( rule__TableFormatter__FormatAssignment_2 )
+            // InternalTableDSL.g:7125:1: ( ( rule__TableFormatter__FormatAssignment_2 ) )
+            // InternalTableDSL.g:7126:2: ( rule__TableFormatter__FormatAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableFormatterAccess().getFormatAssignment_2()); 
             }
-            // InternalTableDSL.g:7559:2: ( rule__TableFormatter__FormatAssignment_2 )
-            // InternalTableDSL.g:7559:3: rule__TableFormatter__FormatAssignment_2
+            // InternalTableDSL.g:7127:2: ( rule__TableFormatter__FormatAssignment_2 )
+            // InternalTableDSL.g:7127:3: rule__TableFormatter__FormatAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TableFormatter__FormatAssignment_2();
@@ -26884,14 +25545,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__Group__0"
-    // InternalTableDSL.g:7568:1: rule__TableImage__Group__0 : rule__TableImage__Group__0__Impl rule__TableImage__Group__1 ;
+    // InternalTableDSL.g:7136:1: rule__TableImage__Group__0 : rule__TableImage__Group__0__Impl rule__TableImage__Group__1 ;
     public final void rule__TableImage__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7572:1: ( rule__TableImage__Group__0__Impl rule__TableImage__Group__1 )
-            // InternalTableDSL.g:7573:2: rule__TableImage__Group__0__Impl rule__TableImage__Group__1
+            // InternalTableDSL.g:7140:1: ( rule__TableImage__Group__0__Impl rule__TableImage__Group__1 )
+            // InternalTableDSL.g:7141:2: rule__TableImage__Group__0__Impl rule__TableImage__Group__1
             {
             pushFollow(FOLLOW_29);
             rule__TableImage__Group__0__Impl();
@@ -26922,23 +25583,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__Group__0__Impl"
-    // InternalTableDSL.g:7580:1: rule__TableImage__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:7148:1: rule__TableImage__Group__0__Impl : ( () ) ;
     public final void rule__TableImage__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7584:1: ( ( () ) )
-            // InternalTableDSL.g:7585:1: ( () )
+            // InternalTableDSL.g:7152:1: ( ( () ) )
+            // InternalTableDSL.g:7153:1: ( () )
             {
-            // InternalTableDSL.g:7585:1: ( () )
-            // InternalTableDSL.g:7586:2: ()
+            // InternalTableDSL.g:7153:1: ( () )
+            // InternalTableDSL.g:7154:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageAccess().getTableImageAction_0()); 
             }
-            // InternalTableDSL.g:7587:2: ()
-            // InternalTableDSL.g:7587:3: 
+            // InternalTableDSL.g:7155:2: ()
+            // InternalTableDSL.g:7155:3: 
             {
             }
 
@@ -26963,14 +25624,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__Group__1"
-    // InternalTableDSL.g:7595:1: rule__TableImage__Group__1 : rule__TableImage__Group__1__Impl rule__TableImage__Group__2 ;
+    // InternalTableDSL.g:7163:1: rule__TableImage__Group__1 : rule__TableImage__Group__1__Impl rule__TableImage__Group__2 ;
     public final void rule__TableImage__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7599:1: ( rule__TableImage__Group__1__Impl rule__TableImage__Group__2 )
-            // InternalTableDSL.g:7600:2: rule__TableImage__Group__1__Impl rule__TableImage__Group__2
+            // InternalTableDSL.g:7167:1: ( rule__TableImage__Group__1__Impl rule__TableImage__Group__2 )
+            // InternalTableDSL.g:7168:2: rule__TableImage__Group__1__Impl rule__TableImage__Group__2
             {
             pushFollow(FOLLOW_14);
             rule__TableImage__Group__1__Impl();
@@ -27001,17 +25662,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__Group__1__Impl"
-    // InternalTableDSL.g:7607:1: rule__TableImage__Group__1__Impl : ( 'path' ) ;
+    // InternalTableDSL.g:7175:1: rule__TableImage__Group__1__Impl : ( 'path' ) ;
     public final void rule__TableImage__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7611:1: ( ( 'path' ) )
-            // InternalTableDSL.g:7612:1: ( 'path' )
+            // InternalTableDSL.g:7179:1: ( ( 'path' ) )
+            // InternalTableDSL.g:7180:1: ( 'path' )
             {
-            // InternalTableDSL.g:7612:1: ( 'path' )
-            // InternalTableDSL.g:7613:2: 'path'
+            // InternalTableDSL.g:7180:1: ( 'path' )
+            // InternalTableDSL.g:7181:2: 'path'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageAccess().getPathKeyword_1()); 
@@ -27042,14 +25703,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__Group__2"
-    // InternalTableDSL.g:7622:1: rule__TableImage__Group__2 : rule__TableImage__Group__2__Impl rule__TableImage__Group__3 ;
+    // InternalTableDSL.g:7190:1: rule__TableImage__Group__2 : rule__TableImage__Group__2__Impl rule__TableImage__Group__3 ;
     public final void rule__TableImage__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7626:1: ( rule__TableImage__Group__2__Impl rule__TableImage__Group__3 )
-            // InternalTableDSL.g:7627:2: rule__TableImage__Group__2__Impl rule__TableImage__Group__3
+            // InternalTableDSL.g:7194:1: ( rule__TableImage__Group__2__Impl rule__TableImage__Group__3 )
+            // InternalTableDSL.g:7195:2: rule__TableImage__Group__2__Impl rule__TableImage__Group__3
             {
             pushFollow(FOLLOW_36);
             rule__TableImage__Group__2__Impl();
@@ -27080,23 +25741,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__Group__2__Impl"
-    // InternalTableDSL.g:7634:1: rule__TableImage__Group__2__Impl : ( ( rule__TableImage__ImagePathPatternAssignment_2 ) ) ;
+    // InternalTableDSL.g:7202:1: rule__TableImage__Group__2__Impl : ( ( rule__TableImage__ImagePathPatternAssignment_2 ) ) ;
     public final void rule__TableImage__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7638:1: ( ( ( rule__TableImage__ImagePathPatternAssignment_2 ) ) )
-            // InternalTableDSL.g:7639:1: ( ( rule__TableImage__ImagePathPatternAssignment_2 ) )
+            // InternalTableDSL.g:7206:1: ( ( ( rule__TableImage__ImagePathPatternAssignment_2 ) ) )
+            // InternalTableDSL.g:7207:1: ( ( rule__TableImage__ImagePathPatternAssignment_2 ) )
             {
-            // InternalTableDSL.g:7639:1: ( ( rule__TableImage__ImagePathPatternAssignment_2 ) )
-            // InternalTableDSL.g:7640:2: ( rule__TableImage__ImagePathPatternAssignment_2 )
+            // InternalTableDSL.g:7207:1: ( ( rule__TableImage__ImagePathPatternAssignment_2 ) )
+            // InternalTableDSL.g:7208:2: ( rule__TableImage__ImagePathPatternAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageAccess().getImagePathPatternAssignment_2()); 
             }
-            // InternalTableDSL.g:7641:2: ( rule__TableImage__ImagePathPatternAssignment_2 )
-            // InternalTableDSL.g:7641:3: rule__TableImage__ImagePathPatternAssignment_2
+            // InternalTableDSL.g:7209:2: ( rule__TableImage__ImagePathPatternAssignment_2 )
+            // InternalTableDSL.g:7209:3: rule__TableImage__ImagePathPatternAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TableImage__ImagePathPatternAssignment_2();
@@ -27131,14 +25792,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__Group__3"
-    // InternalTableDSL.g:7649:1: rule__TableImage__Group__3 : rule__TableImage__Group__3__Impl ;
+    // InternalTableDSL.g:7217:1: rule__TableImage__Group__3 : rule__TableImage__Group__3__Impl ;
     public final void rule__TableImage__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7653:1: ( rule__TableImage__Group__3__Impl )
-            // InternalTableDSL.g:7654:2: rule__TableImage__Group__3__Impl
+            // InternalTableDSL.g:7221:1: ( rule__TableImage__Group__3__Impl )
+            // InternalTableDSL.g:7222:2: rule__TableImage__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableImage__Group__3__Impl();
@@ -27164,23 +25825,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__Group__3__Impl"
-    // InternalTableDSL.g:7660:1: rule__TableImage__Group__3__Impl : ( ( rule__TableImage__UnorderedGroup_3 ) ) ;
+    // InternalTableDSL.g:7228:1: rule__TableImage__Group__3__Impl : ( ( rule__TableImage__UnorderedGroup_3 ) ) ;
     public final void rule__TableImage__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7664:1: ( ( ( rule__TableImage__UnorderedGroup_3 ) ) )
-            // InternalTableDSL.g:7665:1: ( ( rule__TableImage__UnorderedGroup_3 ) )
+            // InternalTableDSL.g:7232:1: ( ( ( rule__TableImage__UnorderedGroup_3 ) ) )
+            // InternalTableDSL.g:7233:1: ( ( rule__TableImage__UnorderedGroup_3 ) )
             {
-            // InternalTableDSL.g:7665:1: ( ( rule__TableImage__UnorderedGroup_3 ) )
-            // InternalTableDSL.g:7666:2: ( rule__TableImage__UnorderedGroup_3 )
+            // InternalTableDSL.g:7233:1: ( ( rule__TableImage__UnorderedGroup_3 ) )
+            // InternalTableDSL.g:7234:2: ( rule__TableImage__UnorderedGroup_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageAccess().getUnorderedGroup_3()); 
             }
-            // InternalTableDSL.g:7667:2: ( rule__TableImage__UnorderedGroup_3 )
-            // InternalTableDSL.g:7667:3: rule__TableImage__UnorderedGroup_3
+            // InternalTableDSL.g:7235:2: ( rule__TableImage__UnorderedGroup_3 )
+            // InternalTableDSL.g:7235:3: rule__TableImage__UnorderedGroup_3
             {
             pushFollow(FOLLOW_2);
             rule__TableImage__UnorderedGroup_3();
@@ -27215,14 +25876,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__Group_3_2__0"
-    // InternalTableDSL.g:7676:1: rule__TableImage__Group_3_2__0 : rule__TableImage__Group_3_2__0__Impl rule__TableImage__Group_3_2__1 ;
+    // InternalTableDSL.g:7244:1: rule__TableImage__Group_3_2__0 : rule__TableImage__Group_3_2__0__Impl rule__TableImage__Group_3_2__1 ;
     public final void rule__TableImage__Group_3_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7680:1: ( rule__TableImage__Group_3_2__0__Impl rule__TableImage__Group_3_2__1 )
-            // InternalTableDSL.g:7681:2: rule__TableImage__Group_3_2__0__Impl rule__TableImage__Group_3_2__1
+            // InternalTableDSL.g:7248:1: ( rule__TableImage__Group_3_2__0__Impl rule__TableImage__Group_3_2__1 )
+            // InternalTableDSL.g:7249:2: rule__TableImage__Group_3_2__0__Impl rule__TableImage__Group_3_2__1
             {
             pushFollow(FOLLOW_14);
             rule__TableImage__Group_3_2__0__Impl();
@@ -27253,23 +25914,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__Group_3_2__0__Impl"
-    // InternalTableDSL.g:7688:1: rule__TableImage__Group_3_2__0__Impl : ( ( rule__TableImage__ResizeAssignment_3_2_0 ) ) ;
+    // InternalTableDSL.g:7256:1: rule__TableImage__Group_3_2__0__Impl : ( ( rule__TableImage__ResizeAssignment_3_2_0 ) ) ;
     public final void rule__TableImage__Group_3_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7692:1: ( ( ( rule__TableImage__ResizeAssignment_3_2_0 ) ) )
-            // InternalTableDSL.g:7693:1: ( ( rule__TableImage__ResizeAssignment_3_2_0 ) )
+            // InternalTableDSL.g:7260:1: ( ( ( rule__TableImage__ResizeAssignment_3_2_0 ) ) )
+            // InternalTableDSL.g:7261:1: ( ( rule__TableImage__ResizeAssignment_3_2_0 ) )
             {
-            // InternalTableDSL.g:7693:1: ( ( rule__TableImage__ResizeAssignment_3_2_0 ) )
-            // InternalTableDSL.g:7694:2: ( rule__TableImage__ResizeAssignment_3_2_0 )
+            // InternalTableDSL.g:7261:1: ( ( rule__TableImage__ResizeAssignment_3_2_0 ) )
+            // InternalTableDSL.g:7262:2: ( rule__TableImage__ResizeAssignment_3_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageAccess().getResizeAssignment_3_2_0()); 
             }
-            // InternalTableDSL.g:7695:2: ( rule__TableImage__ResizeAssignment_3_2_0 )
-            // InternalTableDSL.g:7695:3: rule__TableImage__ResizeAssignment_3_2_0
+            // InternalTableDSL.g:7263:2: ( rule__TableImage__ResizeAssignment_3_2_0 )
+            // InternalTableDSL.g:7263:3: rule__TableImage__ResizeAssignment_3_2_0
             {
             pushFollow(FOLLOW_2);
             rule__TableImage__ResizeAssignment_3_2_0();
@@ -27304,14 +25965,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__Group_3_2__1"
-    // InternalTableDSL.g:7703:1: rule__TableImage__Group_3_2__1 : rule__TableImage__Group_3_2__1__Impl ;
+    // InternalTableDSL.g:7271:1: rule__TableImage__Group_3_2__1 : rule__TableImage__Group_3_2__1__Impl ;
     public final void rule__TableImage__Group_3_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7707:1: ( rule__TableImage__Group_3_2__1__Impl )
-            // InternalTableDSL.g:7708:2: rule__TableImage__Group_3_2__1__Impl
+            // InternalTableDSL.g:7275:1: ( rule__TableImage__Group_3_2__1__Impl )
+            // InternalTableDSL.g:7276:2: rule__TableImage__Group_3_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableImage__Group_3_2__1__Impl();
@@ -27337,23 +25998,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__Group_3_2__1__Impl"
-    // InternalTableDSL.g:7714:1: rule__TableImage__Group_3_2__1__Impl : ( ( rule__TableImage__ResizeStringAssignment_3_2_1 ) ) ;
+    // InternalTableDSL.g:7282:1: rule__TableImage__Group_3_2__1__Impl : ( ( rule__TableImage__ResizeStringAssignment_3_2_1 ) ) ;
     public final void rule__TableImage__Group_3_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7718:1: ( ( ( rule__TableImage__ResizeStringAssignment_3_2_1 ) ) )
-            // InternalTableDSL.g:7719:1: ( ( rule__TableImage__ResizeStringAssignment_3_2_1 ) )
+            // InternalTableDSL.g:7286:1: ( ( ( rule__TableImage__ResizeStringAssignment_3_2_1 ) ) )
+            // InternalTableDSL.g:7287:1: ( ( rule__TableImage__ResizeStringAssignment_3_2_1 ) )
             {
-            // InternalTableDSL.g:7719:1: ( ( rule__TableImage__ResizeStringAssignment_3_2_1 ) )
-            // InternalTableDSL.g:7720:2: ( rule__TableImage__ResizeStringAssignment_3_2_1 )
+            // InternalTableDSL.g:7287:1: ( ( rule__TableImage__ResizeStringAssignment_3_2_1 ) )
+            // InternalTableDSL.g:7288:2: ( rule__TableImage__ResizeStringAssignment_3_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageAccess().getResizeStringAssignment_3_2_1()); 
             }
-            // InternalTableDSL.g:7721:2: ( rule__TableImage__ResizeStringAssignment_3_2_1 )
-            // InternalTableDSL.g:7721:3: rule__TableImage__ResizeStringAssignment_3_2_1
+            // InternalTableDSL.g:7289:2: ( rule__TableImage__ResizeStringAssignment_3_2_1 )
+            // InternalTableDSL.g:7289:3: rule__TableImage__ResizeStringAssignment_3_2_1
             {
             pushFollow(FOLLOW_2);
             rule__TableImage__ResizeStringAssignment_3_2_1();
@@ -27388,14 +26049,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTooltipPattern__Group__0"
-    // InternalTableDSL.g:7730:1: rule__TableTooltipPattern__Group__0 : rule__TableTooltipPattern__Group__0__Impl rule__TableTooltipPattern__Group__1 ;
+    // InternalTableDSL.g:7298:1: rule__TableTooltipPattern__Group__0 : rule__TableTooltipPattern__Group__0__Impl rule__TableTooltipPattern__Group__1 ;
     public final void rule__TableTooltipPattern__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7734:1: ( rule__TableTooltipPattern__Group__0__Impl rule__TableTooltipPattern__Group__1 )
-            // InternalTableDSL.g:7735:2: rule__TableTooltipPattern__Group__0__Impl rule__TableTooltipPattern__Group__1
+            // InternalTableDSL.g:7302:1: ( rule__TableTooltipPattern__Group__0__Impl rule__TableTooltipPattern__Group__1 )
+            // InternalTableDSL.g:7303:2: rule__TableTooltipPattern__Group__0__Impl rule__TableTooltipPattern__Group__1
             {
             pushFollow(FOLLOW_27);
             rule__TableTooltipPattern__Group__0__Impl();
@@ -27426,23 +26087,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTooltipPattern__Group__0__Impl"
-    // InternalTableDSL.g:7742:1: rule__TableTooltipPattern__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:7310:1: rule__TableTooltipPattern__Group__0__Impl : ( () ) ;
     public final void rule__TableTooltipPattern__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7746:1: ( ( () ) )
-            // InternalTableDSL.g:7747:1: ( () )
+            // InternalTableDSL.g:7314:1: ( ( () ) )
+            // InternalTableDSL.g:7315:1: ( () )
             {
-            // InternalTableDSL.g:7747:1: ( () )
-            // InternalTableDSL.g:7748:2: ()
+            // InternalTableDSL.g:7315:1: ( () )
+            // InternalTableDSL.g:7316:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTooltipPatternAccess().getTableTooltipPatternAction_0()); 
             }
-            // InternalTableDSL.g:7749:2: ()
-            // InternalTableDSL.g:7749:3: 
+            // InternalTableDSL.g:7317:2: ()
+            // InternalTableDSL.g:7317:3: 
             {
             }
 
@@ -27467,14 +26128,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTooltipPattern__Group__1"
-    // InternalTableDSL.g:7757:1: rule__TableTooltipPattern__Group__1 : rule__TableTooltipPattern__Group__1__Impl rule__TableTooltipPattern__Group__2 ;
+    // InternalTableDSL.g:7325:1: rule__TableTooltipPattern__Group__1 : rule__TableTooltipPattern__Group__1__Impl rule__TableTooltipPattern__Group__2 ;
     public final void rule__TableTooltipPattern__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7761:1: ( rule__TableTooltipPattern__Group__1__Impl rule__TableTooltipPattern__Group__2 )
-            // InternalTableDSL.g:7762:2: rule__TableTooltipPattern__Group__1__Impl rule__TableTooltipPattern__Group__2
+            // InternalTableDSL.g:7329:1: ( rule__TableTooltipPattern__Group__1__Impl rule__TableTooltipPattern__Group__2 )
+            // InternalTableDSL.g:7330:2: rule__TableTooltipPattern__Group__1__Impl rule__TableTooltipPattern__Group__2
             {
             pushFollow(FOLLOW_14);
             rule__TableTooltipPattern__Group__1__Impl();
@@ -27505,17 +26166,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTooltipPattern__Group__1__Impl"
-    // InternalTableDSL.g:7769:1: rule__TableTooltipPattern__Group__1__Impl : ( 'tooltipPattern' ) ;
+    // InternalTableDSL.g:7337:1: rule__TableTooltipPattern__Group__1__Impl : ( 'tooltipPattern' ) ;
     public final void rule__TableTooltipPattern__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7773:1: ( ( 'tooltipPattern' ) )
-            // InternalTableDSL.g:7774:1: ( 'tooltipPattern' )
+            // InternalTableDSL.g:7341:1: ( ( 'tooltipPattern' ) )
+            // InternalTableDSL.g:7342:1: ( 'tooltipPattern' )
             {
-            // InternalTableDSL.g:7774:1: ( 'tooltipPattern' )
-            // InternalTableDSL.g:7775:2: 'tooltipPattern'
+            // InternalTableDSL.g:7342:1: ( 'tooltipPattern' )
+            // InternalTableDSL.g:7343:2: 'tooltipPattern'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTooltipPatternAccess().getTooltipPatternKeyword_1()); 
@@ -27546,14 +26207,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTooltipPattern__Group__2"
-    // InternalTableDSL.g:7784:1: rule__TableTooltipPattern__Group__2 : rule__TableTooltipPattern__Group__2__Impl ;
+    // InternalTableDSL.g:7352:1: rule__TableTooltipPattern__Group__2 : rule__TableTooltipPattern__Group__2__Impl ;
     public final void rule__TableTooltipPattern__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7788:1: ( rule__TableTooltipPattern__Group__2__Impl )
-            // InternalTableDSL.g:7789:2: rule__TableTooltipPattern__Group__2__Impl
+            // InternalTableDSL.g:7356:1: ( rule__TableTooltipPattern__Group__2__Impl )
+            // InternalTableDSL.g:7357:2: rule__TableTooltipPattern__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableTooltipPattern__Group__2__Impl();
@@ -27579,23 +26240,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTooltipPattern__Group__2__Impl"
-    // InternalTableDSL.g:7795:1: rule__TableTooltipPattern__Group__2__Impl : ( ( rule__TableTooltipPattern__TooltipPatternAssignment_2 ) ) ;
+    // InternalTableDSL.g:7363:1: rule__TableTooltipPattern__Group__2__Impl : ( ( rule__TableTooltipPattern__TooltipPatternAssignment_2 ) ) ;
     public final void rule__TableTooltipPattern__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7799:1: ( ( ( rule__TableTooltipPattern__TooltipPatternAssignment_2 ) ) )
-            // InternalTableDSL.g:7800:1: ( ( rule__TableTooltipPattern__TooltipPatternAssignment_2 ) )
+            // InternalTableDSL.g:7367:1: ( ( ( rule__TableTooltipPattern__TooltipPatternAssignment_2 ) ) )
+            // InternalTableDSL.g:7368:1: ( ( rule__TableTooltipPattern__TooltipPatternAssignment_2 ) )
             {
-            // InternalTableDSL.g:7800:1: ( ( rule__TableTooltipPattern__TooltipPatternAssignment_2 ) )
-            // InternalTableDSL.g:7801:2: ( rule__TableTooltipPattern__TooltipPatternAssignment_2 )
+            // InternalTableDSL.g:7368:1: ( ( rule__TableTooltipPattern__TooltipPatternAssignment_2 ) )
+            // InternalTableDSL.g:7369:2: ( rule__TableTooltipPattern__TooltipPatternAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTooltipPatternAccess().getTooltipPatternAssignment_2()); 
             }
-            // InternalTableDSL.g:7802:2: ( rule__TableTooltipPattern__TooltipPatternAssignment_2 )
-            // InternalTableDSL.g:7802:3: rule__TableTooltipPattern__TooltipPatternAssignment_2
+            // InternalTableDSL.g:7370:2: ( rule__TableTooltipPattern__TooltipPatternAssignment_2 )
+            // InternalTableDSL.g:7370:3: rule__TableTooltipPattern__TooltipPatternAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TableTooltipPattern__TooltipPatternAssignment_2();
@@ -27630,14 +26291,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTask__Group__0"
-    // InternalTableDSL.g:7811:1: rule__TableTask__Group__0 : rule__TableTask__Group__0__Impl rule__TableTask__Group__1 ;
+    // InternalTableDSL.g:7379:1: rule__TableTask__Group__0 : rule__TableTask__Group__0__Impl rule__TableTask__Group__1 ;
     public final void rule__TableTask__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7815:1: ( rule__TableTask__Group__0__Impl rule__TableTask__Group__1 )
-            // InternalTableDSL.g:7816:2: rule__TableTask__Group__0__Impl rule__TableTask__Group__1
+            // InternalTableDSL.g:7383:1: ( rule__TableTask__Group__0__Impl rule__TableTask__Group__1 )
+            // InternalTableDSL.g:7384:2: rule__TableTask__Group__0__Impl rule__TableTask__Group__1
             {
             pushFollow(FOLLOW_37);
             rule__TableTask__Group__0__Impl();
@@ -27668,23 +26329,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTask__Group__0__Impl"
-    // InternalTableDSL.g:7823:1: rule__TableTask__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:7391:1: rule__TableTask__Group__0__Impl : ( () ) ;
     public final void rule__TableTask__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7827:1: ( ( () ) )
-            // InternalTableDSL.g:7828:1: ( () )
+            // InternalTableDSL.g:7395:1: ( ( () ) )
+            // InternalTableDSL.g:7396:1: ( () )
             {
-            // InternalTableDSL.g:7828:1: ( () )
-            // InternalTableDSL.g:7829:2: ()
+            // InternalTableDSL.g:7396:1: ( () )
+            // InternalTableDSL.g:7397:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTaskAccess().getTableTaskAction_0()); 
             }
-            // InternalTableDSL.g:7830:2: ()
-            // InternalTableDSL.g:7830:3: 
+            // InternalTableDSL.g:7398:2: ()
+            // InternalTableDSL.g:7398:3: 
             {
             }
 
@@ -27709,14 +26370,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTask__Group__1"
-    // InternalTableDSL.g:7838:1: rule__TableTask__Group__1 : rule__TableTask__Group__1__Impl ;
+    // InternalTableDSL.g:7406:1: rule__TableTask__Group__1 : rule__TableTask__Group__1__Impl ;
     public final void rule__TableTask__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7842:1: ( rule__TableTask__Group__1__Impl )
-            // InternalTableDSL.g:7843:2: rule__TableTask__Group__1__Impl
+            // InternalTableDSL.g:7410:1: ( rule__TableTask__Group__1__Impl )
+            // InternalTableDSL.g:7411:2: rule__TableTask__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableTask__Group__1__Impl();
@@ -27742,17 +26403,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTask__Group__1__Impl"
-    // InternalTableDSL.g:7849:1: rule__TableTask__Group__1__Impl : ( 'taskId' ) ;
+    // InternalTableDSL.g:7417:1: rule__TableTask__Group__1__Impl : ( 'taskId' ) ;
     public final void rule__TableTask__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7853:1: ( ( 'taskId' ) )
-            // InternalTableDSL.g:7854:1: ( 'taskId' )
+            // InternalTableDSL.g:7421:1: ( ( 'taskId' ) )
+            // InternalTableDSL.g:7422:1: ( 'taskId' )
             {
-            // InternalTableDSL.g:7854:1: ( 'taskId' )
-            // InternalTableDSL.g:7855:2: 'taskId'
+            // InternalTableDSL.g:7422:1: ( 'taskId' )
+            // InternalTableDSL.g:7423:2: 'taskId'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTaskAccess().getTaskIdKeyword_1()); 
@@ -27783,14 +26444,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAllColumns__Group__0"
-    // InternalTableDSL.g:7865:1: rule__TableAllColumns__Group__0 : rule__TableAllColumns__Group__0__Impl rule__TableAllColumns__Group__1 ;
+    // InternalTableDSL.g:7433:1: rule__TableAllColumns__Group__0 : rule__TableAllColumns__Group__0__Impl rule__TableAllColumns__Group__1 ;
     public final void rule__TableAllColumns__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7869:1: ( rule__TableAllColumns__Group__0__Impl rule__TableAllColumns__Group__1 )
-            // InternalTableDSL.g:7870:2: rule__TableAllColumns__Group__0__Impl rule__TableAllColumns__Group__1
+            // InternalTableDSL.g:7437:1: ( rule__TableAllColumns__Group__0__Impl rule__TableAllColumns__Group__1 )
+            // InternalTableDSL.g:7438:2: rule__TableAllColumns__Group__0__Impl rule__TableAllColumns__Group__1
             {
             pushFollow(FOLLOW_24);
             rule__TableAllColumns__Group__0__Impl();
@@ -27821,23 +26482,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAllColumns__Group__0__Impl"
-    // InternalTableDSL.g:7877:1: rule__TableAllColumns__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:7445:1: rule__TableAllColumns__Group__0__Impl : ( () ) ;
     public final void rule__TableAllColumns__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7881:1: ( ( () ) )
-            // InternalTableDSL.g:7882:1: ( () )
+            // InternalTableDSL.g:7449:1: ( ( () ) )
+            // InternalTableDSL.g:7450:1: ( () )
             {
-            // InternalTableDSL.g:7882:1: ( () )
-            // InternalTableDSL.g:7883:2: ()
+            // InternalTableDSL.g:7450:1: ( () )
+            // InternalTableDSL.g:7451:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAllColumnsAccess().getTableAllColumnsAction_0()); 
             }
-            // InternalTableDSL.g:7884:2: ()
-            // InternalTableDSL.g:7884:3: 
+            // InternalTableDSL.g:7452:2: ()
+            // InternalTableDSL.g:7452:3: 
             {
             }
 
@@ -27862,14 +26523,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAllColumns__Group__1"
-    // InternalTableDSL.g:7892:1: rule__TableAllColumns__Group__1 : rule__TableAllColumns__Group__1__Impl ;
+    // InternalTableDSL.g:7460:1: rule__TableAllColumns__Group__1 : rule__TableAllColumns__Group__1__Impl ;
     public final void rule__TableAllColumns__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7896:1: ( rule__TableAllColumns__Group__1__Impl )
-            // InternalTableDSL.g:7897:2: rule__TableAllColumns__Group__1__Impl
+            // InternalTableDSL.g:7464:1: ( rule__TableAllColumns__Group__1__Impl )
+            // InternalTableDSL.g:7465:2: rule__TableAllColumns__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableAllColumns__Group__1__Impl();
@@ -27895,17 +26556,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAllColumns__Group__1__Impl"
-    // InternalTableDSL.g:7903:1: rule__TableAllColumns__Group__1__Impl : ( 'allColumns' ) ;
+    // InternalTableDSL.g:7471:1: rule__TableAllColumns__Group__1__Impl : ( 'allColumns' ) ;
     public final void rule__TableAllColumns__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7907:1: ( ( 'allColumns' ) )
-            // InternalTableDSL.g:7908:1: ( 'allColumns' )
+            // InternalTableDSL.g:7475:1: ( ( 'allColumns' ) )
+            // InternalTableDSL.g:7476:1: ( 'allColumns' )
             {
-            // InternalTableDSL.g:7908:1: ( 'allColumns' )
-            // InternalTableDSL.g:7909:2: 'allColumns'
+            // InternalTableDSL.g:7476:1: ( 'allColumns' )
+            // InternalTableDSL.g:7477:2: 'allColumns'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAllColumnsAccess().getAllColumnsKeyword_1()); 
@@ -27936,16 +26597,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableOrdinal__Group__0"
-    // InternalTableDSL.g:7919:1: rule__TableOrdinal__Group__0 : rule__TableOrdinal__Group__0__Impl rule__TableOrdinal__Group__1 ;
+    // InternalTableDSL.g:7487:1: rule__TableOrdinal__Group__0 : rule__TableOrdinal__Group__0__Impl rule__TableOrdinal__Group__1 ;
     public final void rule__TableOrdinal__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7923:1: ( rule__TableOrdinal__Group__0__Impl rule__TableOrdinal__Group__1 )
-            // InternalTableDSL.g:7924:2: rule__TableOrdinal__Group__0__Impl rule__TableOrdinal__Group__1
+            // InternalTableDSL.g:7491:1: ( rule__TableOrdinal__Group__0__Impl rule__TableOrdinal__Group__1 )
+            // InternalTableDSL.g:7492:2: rule__TableOrdinal__Group__0__Impl rule__TableOrdinal__Group__1
             {
-            pushFollow(FOLLOW_20);
+            pushFollow(FOLLOW_38);
             rule__TableOrdinal__Group__0__Impl();
 
             state._fsp--;
@@ -27974,17 +26635,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableOrdinal__Group__0__Impl"
-    // InternalTableDSL.g:7931:1: rule__TableOrdinal__Group__0__Impl : ( 'ordinal' ) ;
+    // InternalTableDSL.g:7499:1: rule__TableOrdinal__Group__0__Impl : ( 'ordinal' ) ;
     public final void rule__TableOrdinal__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7935:1: ( ( 'ordinal' ) )
-            // InternalTableDSL.g:7936:1: ( 'ordinal' )
+            // InternalTableDSL.g:7503:1: ( ( 'ordinal' ) )
+            // InternalTableDSL.g:7504:1: ( 'ordinal' )
             {
-            // InternalTableDSL.g:7936:1: ( 'ordinal' )
-            // InternalTableDSL.g:7937:2: 'ordinal'
+            // InternalTableDSL.g:7504:1: ( 'ordinal' )
+            // InternalTableDSL.g:7505:2: 'ordinal'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableOrdinalAccess().getOrdinalKeyword_0()); 
@@ -28015,14 +26676,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableOrdinal__Group__1"
-    // InternalTableDSL.g:7946:1: rule__TableOrdinal__Group__1 : rule__TableOrdinal__Group__1__Impl ;
+    // InternalTableDSL.g:7514:1: rule__TableOrdinal__Group__1 : rule__TableOrdinal__Group__1__Impl ;
     public final void rule__TableOrdinal__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7950:1: ( rule__TableOrdinal__Group__1__Impl )
-            // InternalTableDSL.g:7951:2: rule__TableOrdinal__Group__1__Impl
+            // InternalTableDSL.g:7518:1: ( rule__TableOrdinal__Group__1__Impl )
+            // InternalTableDSL.g:7519:2: rule__TableOrdinal__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableOrdinal__Group__1__Impl();
@@ -28048,23 +26709,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableOrdinal__Group__1__Impl"
-    // InternalTableDSL.g:7957:1: rule__TableOrdinal__Group__1__Impl : ( ( rule__TableOrdinal__ValueRefAssignment_1 ) ) ;
+    // InternalTableDSL.g:7525:1: rule__TableOrdinal__Group__1__Impl : ( ( rule__TableOrdinal__ValueRefAssignment_1 ) ) ;
     public final void rule__TableOrdinal__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7961:1: ( ( ( rule__TableOrdinal__ValueRefAssignment_1 ) ) )
-            // InternalTableDSL.g:7962:1: ( ( rule__TableOrdinal__ValueRefAssignment_1 ) )
+            // InternalTableDSL.g:7529:1: ( ( ( rule__TableOrdinal__ValueRefAssignment_1 ) ) )
+            // InternalTableDSL.g:7530:1: ( ( rule__TableOrdinal__ValueRefAssignment_1 ) )
             {
-            // InternalTableDSL.g:7962:1: ( ( rule__TableOrdinal__ValueRefAssignment_1 ) )
-            // InternalTableDSL.g:7963:2: ( rule__TableOrdinal__ValueRefAssignment_1 )
+            // InternalTableDSL.g:7530:1: ( ( rule__TableOrdinal__ValueRefAssignment_1 ) )
+            // InternalTableDSL.g:7531:2: ( rule__TableOrdinal__ValueRefAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableOrdinalAccess().getValueRefAssignment_1()); 
             }
-            // InternalTableDSL.g:7964:2: ( rule__TableOrdinal__ValueRefAssignment_1 )
-            // InternalTableDSL.g:7964:3: rule__TableOrdinal__ValueRefAssignment_1
+            // InternalTableDSL.g:7532:2: ( rule__TableOrdinal__ValueRefAssignment_1 )
+            // InternalTableDSL.g:7532:3: rule__TableOrdinal__ValueRefAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__TableOrdinal__ValueRefAssignment_1();
@@ -28099,14 +26760,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableColumn__Group__0"
-    // InternalTableDSL.g:7973:1: rule__TableColumn__Group__0 : rule__TableColumn__Group__0__Impl rule__TableColumn__Group__1 ;
+    // InternalTableDSL.g:7541:1: rule__TableColumn__Group__0 : rule__TableColumn__Group__0__Impl rule__TableColumn__Group__1 ;
     public final void rule__TableColumn__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7977:1: ( rule__TableColumn__Group__0__Impl rule__TableColumn__Group__1 )
-            // InternalTableDSL.g:7978:2: rule__TableColumn__Group__0__Impl rule__TableColumn__Group__1
+            // InternalTableDSL.g:7545:1: ( rule__TableColumn__Group__0__Impl rule__TableColumn__Group__1 )
+            // InternalTableDSL.g:7546:2: rule__TableColumn__Group__0__Impl rule__TableColumn__Group__1
             {
             pushFollow(FOLLOW_7);
             rule__TableColumn__Group__0__Impl();
@@ -28137,17 +26798,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableColumn__Group__0__Impl"
-    // InternalTableDSL.g:7985:1: rule__TableColumn__Group__0__Impl : ( 'column' ) ;
+    // InternalTableDSL.g:7553:1: rule__TableColumn__Group__0__Impl : ( 'column' ) ;
     public final void rule__TableColumn__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:7989:1: ( ( 'column' ) )
-            // InternalTableDSL.g:7990:1: ( 'column' )
+            // InternalTableDSL.g:7557:1: ( ( 'column' ) )
+            // InternalTableDSL.g:7558:1: ( 'column' )
             {
-            // InternalTableDSL.g:7990:1: ( 'column' )
-            // InternalTableDSL.g:7991:2: 'column'
+            // InternalTableDSL.g:7558:1: ( 'column' )
+            // InternalTableDSL.g:7559:2: 'column'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableColumnAccess().getColumnKeyword_0()); 
@@ -28178,14 +26839,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableColumn__Group__1"
-    // InternalTableDSL.g:8000:1: rule__TableColumn__Group__1 : rule__TableColumn__Group__1__Impl ;
+    // InternalTableDSL.g:7568:1: rule__TableColumn__Group__1 : rule__TableColumn__Group__1__Impl ;
     public final void rule__TableColumn__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8004:1: ( rule__TableColumn__Group__1__Impl )
-            // InternalTableDSL.g:8005:2: rule__TableColumn__Group__1__Impl
+            // InternalTableDSL.g:7572:1: ( rule__TableColumn__Group__1__Impl )
+            // InternalTableDSL.g:7573:2: rule__TableColumn__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableColumn__Group__1__Impl();
@@ -28211,23 +26872,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableColumn__Group__1__Impl"
-    // InternalTableDSL.g:8011:1: rule__TableColumn__Group__1__Impl : ( ( rule__TableColumn__ValueRefAssignment_1 ) ) ;
+    // InternalTableDSL.g:7579:1: rule__TableColumn__Group__1__Impl : ( ( rule__TableColumn__ValueRefAssignment_1 ) ) ;
     public final void rule__TableColumn__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8015:1: ( ( ( rule__TableColumn__ValueRefAssignment_1 ) ) )
-            // InternalTableDSL.g:8016:1: ( ( rule__TableColumn__ValueRefAssignment_1 ) )
+            // InternalTableDSL.g:7583:1: ( ( ( rule__TableColumn__ValueRefAssignment_1 ) ) )
+            // InternalTableDSL.g:7584:1: ( ( rule__TableColumn__ValueRefAssignment_1 ) )
             {
-            // InternalTableDSL.g:8016:1: ( ( rule__TableColumn__ValueRefAssignment_1 ) )
-            // InternalTableDSL.g:8017:2: ( rule__TableColumn__ValueRefAssignment_1 )
+            // InternalTableDSL.g:7584:1: ( ( rule__TableColumn__ValueRefAssignment_1 ) )
+            // InternalTableDSL.g:7585:2: ( rule__TableColumn__ValueRefAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableColumnAccess().getValueRefAssignment_1()); 
             }
-            // InternalTableDSL.g:8018:2: ( rule__TableColumn__ValueRefAssignment_1 )
-            // InternalTableDSL.g:8018:3: rule__TableColumn__ValueRefAssignment_1
+            // InternalTableDSL.g:7586:2: ( rule__TableColumn__ValueRefAssignment_1 )
+            // InternalTableDSL.g:7586:3: rule__TableColumn__ValueRefAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__TableColumn__ValueRefAssignment_1();
@@ -28262,14 +26923,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableMeasure__Group__0"
-    // InternalTableDSL.g:8027:1: rule__TableMeasure__Group__0 : rule__TableMeasure__Group__0__Impl rule__TableMeasure__Group__1 ;
+    // InternalTableDSL.g:7595:1: rule__TableMeasure__Group__0 : rule__TableMeasure__Group__0__Impl rule__TableMeasure__Group__1 ;
     public final void rule__TableMeasure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8031:1: ( rule__TableMeasure__Group__0__Impl rule__TableMeasure__Group__1 )
-            // InternalTableDSL.g:8032:2: rule__TableMeasure__Group__0__Impl rule__TableMeasure__Group__1
+            // InternalTableDSL.g:7599:1: ( rule__TableMeasure__Group__0__Impl rule__TableMeasure__Group__1 )
+            // InternalTableDSL.g:7600:2: rule__TableMeasure__Group__0__Impl rule__TableMeasure__Group__1
             {
             pushFollow(FOLLOW_7);
             rule__TableMeasure__Group__0__Impl();
@@ -28300,17 +26961,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableMeasure__Group__0__Impl"
-    // InternalTableDSL.g:8039:1: rule__TableMeasure__Group__0__Impl : ( 'measure' ) ;
+    // InternalTableDSL.g:7607:1: rule__TableMeasure__Group__0__Impl : ( 'measure' ) ;
     public final void rule__TableMeasure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8043:1: ( ( 'measure' ) )
-            // InternalTableDSL.g:8044:1: ( 'measure' )
+            // InternalTableDSL.g:7611:1: ( ( 'measure' ) )
+            // InternalTableDSL.g:7612:1: ( 'measure' )
             {
-            // InternalTableDSL.g:8044:1: ( 'measure' )
-            // InternalTableDSL.g:8045:2: 'measure'
+            // InternalTableDSL.g:7612:1: ( 'measure' )
+            // InternalTableDSL.g:7613:2: 'measure'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableMeasureAccess().getMeasureKeyword_0()); 
@@ -28341,14 +27002,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableMeasure__Group__1"
-    // InternalTableDSL.g:8054:1: rule__TableMeasure__Group__1 : rule__TableMeasure__Group__1__Impl ;
+    // InternalTableDSL.g:7622:1: rule__TableMeasure__Group__1 : rule__TableMeasure__Group__1__Impl ;
     public final void rule__TableMeasure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8058:1: ( rule__TableMeasure__Group__1__Impl )
-            // InternalTableDSL.g:8059:2: rule__TableMeasure__Group__1__Impl
+            // InternalTableDSL.g:7626:1: ( rule__TableMeasure__Group__1__Impl )
+            // InternalTableDSL.g:7627:2: rule__TableMeasure__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableMeasure__Group__1__Impl();
@@ -28374,23 +27035,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableMeasure__Group__1__Impl"
-    // InternalTableDSL.g:8065:1: rule__TableMeasure__Group__1__Impl : ( ( rule__TableMeasure__ValueRefAssignment_1 ) ) ;
+    // InternalTableDSL.g:7633:1: rule__TableMeasure__Group__1__Impl : ( ( rule__TableMeasure__ValueRefAssignment_1 ) ) ;
     public final void rule__TableMeasure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8069:1: ( ( ( rule__TableMeasure__ValueRefAssignment_1 ) ) )
-            // InternalTableDSL.g:8070:1: ( ( rule__TableMeasure__ValueRefAssignment_1 ) )
+            // InternalTableDSL.g:7637:1: ( ( ( rule__TableMeasure__ValueRefAssignment_1 ) ) )
+            // InternalTableDSL.g:7638:1: ( ( rule__TableMeasure__ValueRefAssignment_1 ) )
             {
-            // InternalTableDSL.g:8070:1: ( ( rule__TableMeasure__ValueRefAssignment_1 ) )
-            // InternalTableDSL.g:8071:2: ( rule__TableMeasure__ValueRefAssignment_1 )
+            // InternalTableDSL.g:7638:1: ( ( rule__TableMeasure__ValueRefAssignment_1 ) )
+            // InternalTableDSL.g:7639:2: ( rule__TableMeasure__ValueRefAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableMeasureAccess().getValueRefAssignment_1()); 
             }
-            // InternalTableDSL.g:8072:2: ( rule__TableMeasure__ValueRefAssignment_1 )
-            // InternalTableDSL.g:8072:3: rule__TableMeasure__ValueRefAssignment_1
+            // InternalTableDSL.g:7640:2: ( rule__TableMeasure__ValueRefAssignment_1 )
+            // InternalTableDSL.g:7640:3: rule__TableMeasure__ValueRefAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__TableMeasure__ValueRefAssignment_1();
@@ -28425,14 +27086,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDerived__Group__0"
-    // InternalTableDSL.g:8081:1: rule__TableDerived__Group__0 : rule__TableDerived__Group__0__Impl rule__TableDerived__Group__1 ;
+    // InternalTableDSL.g:7649:1: rule__TableDerived__Group__0 : rule__TableDerived__Group__0__Impl rule__TableDerived__Group__1 ;
     public final void rule__TableDerived__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8085:1: ( rule__TableDerived__Group__0__Impl rule__TableDerived__Group__1 )
-            // InternalTableDSL.g:8086:2: rule__TableDerived__Group__0__Impl rule__TableDerived__Group__1
+            // InternalTableDSL.g:7653:1: ( rule__TableDerived__Group__0__Impl rule__TableDerived__Group__1 )
+            // InternalTableDSL.g:7654:2: rule__TableDerived__Group__0__Impl rule__TableDerived__Group__1
             {
             pushFollow(FOLLOW_7);
             rule__TableDerived__Group__0__Impl();
@@ -28463,17 +27124,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDerived__Group__0__Impl"
-    // InternalTableDSL.g:8093:1: rule__TableDerived__Group__0__Impl : ( 'derived' ) ;
+    // InternalTableDSL.g:7661:1: rule__TableDerived__Group__0__Impl : ( 'derived' ) ;
     public final void rule__TableDerived__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8097:1: ( ( 'derived' ) )
-            // InternalTableDSL.g:8098:1: ( 'derived' )
+            // InternalTableDSL.g:7665:1: ( ( 'derived' ) )
+            // InternalTableDSL.g:7666:1: ( 'derived' )
             {
-            // InternalTableDSL.g:8098:1: ( 'derived' )
-            // InternalTableDSL.g:8099:2: 'derived'
+            // InternalTableDSL.g:7666:1: ( 'derived' )
+            // InternalTableDSL.g:7667:2: 'derived'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDerivedAccess().getDerivedKeyword_0()); 
@@ -28504,14 +27165,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDerived__Group__1"
-    // InternalTableDSL.g:8108:1: rule__TableDerived__Group__1 : rule__TableDerived__Group__1__Impl ;
+    // InternalTableDSL.g:7676:1: rule__TableDerived__Group__1 : rule__TableDerived__Group__1__Impl ;
     public final void rule__TableDerived__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8112:1: ( rule__TableDerived__Group__1__Impl )
-            // InternalTableDSL.g:8113:2: rule__TableDerived__Group__1__Impl
+            // InternalTableDSL.g:7680:1: ( rule__TableDerived__Group__1__Impl )
+            // InternalTableDSL.g:7681:2: rule__TableDerived__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableDerived__Group__1__Impl();
@@ -28537,23 +27198,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDerived__Group__1__Impl"
-    // InternalTableDSL.g:8119:1: rule__TableDerived__Group__1__Impl : ( ( rule__TableDerived__ValueRefAssignment_1 ) ) ;
+    // InternalTableDSL.g:7687:1: rule__TableDerived__Group__1__Impl : ( ( rule__TableDerived__ValueRefAssignment_1 ) ) ;
     public final void rule__TableDerived__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8123:1: ( ( ( rule__TableDerived__ValueRefAssignment_1 ) ) )
-            // InternalTableDSL.g:8124:1: ( ( rule__TableDerived__ValueRefAssignment_1 ) )
+            // InternalTableDSL.g:7691:1: ( ( ( rule__TableDerived__ValueRefAssignment_1 ) ) )
+            // InternalTableDSL.g:7692:1: ( ( rule__TableDerived__ValueRefAssignment_1 ) )
             {
-            // InternalTableDSL.g:8124:1: ( ( rule__TableDerived__ValueRefAssignment_1 ) )
-            // InternalTableDSL.g:8125:2: ( rule__TableDerived__ValueRefAssignment_1 )
+            // InternalTableDSL.g:7692:1: ( ( rule__TableDerived__ValueRefAssignment_1 ) )
+            // InternalTableDSL.g:7693:2: ( rule__TableDerived__ValueRefAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDerivedAccess().getValueRefAssignment_1()); 
             }
-            // InternalTableDSL.g:8126:2: ( rule__TableDerived__ValueRefAssignment_1 )
-            // InternalTableDSL.g:8126:3: rule__TableDerived__ValueRefAssignment_1
+            // InternalTableDSL.g:7694:2: ( rule__TableDerived__ValueRefAssignment_1 )
+            // InternalTableDSL.g:7694:3: rule__TableDerived__ValueRefAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__TableDerived__ValueRefAssignment_1();
@@ -28588,14 +27249,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableHierarchy__Group__0"
-    // InternalTableDSL.g:8135:1: rule__TableHierarchy__Group__0 : rule__TableHierarchy__Group__0__Impl rule__TableHierarchy__Group__1 ;
+    // InternalTableDSL.g:7703:1: rule__TableHierarchy__Group__0 : rule__TableHierarchy__Group__0__Impl rule__TableHierarchy__Group__1 ;
     public final void rule__TableHierarchy__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8139:1: ( rule__TableHierarchy__Group__0__Impl rule__TableHierarchy__Group__1 )
-            // InternalTableDSL.g:8140:2: rule__TableHierarchy__Group__0__Impl rule__TableHierarchy__Group__1
+            // InternalTableDSL.g:7707:1: ( rule__TableHierarchy__Group__0__Impl rule__TableHierarchy__Group__1 )
+            // InternalTableDSL.g:7708:2: rule__TableHierarchy__Group__0__Impl rule__TableHierarchy__Group__1
             {
             pushFollow(FOLLOW_7);
             rule__TableHierarchy__Group__0__Impl();
@@ -28626,17 +27287,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableHierarchy__Group__0__Impl"
-    // InternalTableDSL.g:8147:1: rule__TableHierarchy__Group__0__Impl : ( 'level' ) ;
+    // InternalTableDSL.g:7715:1: rule__TableHierarchy__Group__0__Impl : ( 'level' ) ;
     public final void rule__TableHierarchy__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8151:1: ( ( 'level' ) )
-            // InternalTableDSL.g:8152:1: ( 'level' )
+            // InternalTableDSL.g:7719:1: ( ( 'level' ) )
+            // InternalTableDSL.g:7720:1: ( 'level' )
             {
-            // InternalTableDSL.g:8152:1: ( 'level' )
-            // InternalTableDSL.g:8153:2: 'level'
+            // InternalTableDSL.g:7720:1: ( 'level' )
+            // InternalTableDSL.g:7721:2: 'level'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableHierarchyAccess().getLevelKeyword_0()); 
@@ -28667,14 +27328,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableHierarchy__Group__1"
-    // InternalTableDSL.g:8162:1: rule__TableHierarchy__Group__1 : rule__TableHierarchy__Group__1__Impl ;
+    // InternalTableDSL.g:7730:1: rule__TableHierarchy__Group__1 : rule__TableHierarchy__Group__1__Impl ;
     public final void rule__TableHierarchy__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8166:1: ( rule__TableHierarchy__Group__1__Impl )
-            // InternalTableDSL.g:8167:2: rule__TableHierarchy__Group__1__Impl
+            // InternalTableDSL.g:7734:1: ( rule__TableHierarchy__Group__1__Impl )
+            // InternalTableDSL.g:7735:2: rule__TableHierarchy__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableHierarchy__Group__1__Impl();
@@ -28700,23 +27361,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableHierarchy__Group__1__Impl"
-    // InternalTableDSL.g:8173:1: rule__TableHierarchy__Group__1__Impl : ( ( rule__TableHierarchy__ValueRefAssignment_1 ) ) ;
+    // InternalTableDSL.g:7741:1: rule__TableHierarchy__Group__1__Impl : ( ( rule__TableHierarchy__ValueRefAssignment_1 ) ) ;
     public final void rule__TableHierarchy__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8177:1: ( ( ( rule__TableHierarchy__ValueRefAssignment_1 ) ) )
-            // InternalTableDSL.g:8178:1: ( ( rule__TableHierarchy__ValueRefAssignment_1 ) )
+            // InternalTableDSL.g:7745:1: ( ( ( rule__TableHierarchy__ValueRefAssignment_1 ) ) )
+            // InternalTableDSL.g:7746:1: ( ( rule__TableHierarchy__ValueRefAssignment_1 ) )
             {
-            // InternalTableDSL.g:8178:1: ( ( rule__TableHierarchy__ValueRefAssignment_1 ) )
-            // InternalTableDSL.g:8179:2: ( rule__TableHierarchy__ValueRefAssignment_1 )
+            // InternalTableDSL.g:7746:1: ( ( rule__TableHierarchy__ValueRefAssignment_1 ) )
+            // InternalTableDSL.g:7747:2: ( rule__TableHierarchy__ValueRefAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableHierarchyAccess().getValueRefAssignment_1()); 
             }
-            // InternalTableDSL.g:8180:2: ( rule__TableHierarchy__ValueRefAssignment_1 )
-            // InternalTableDSL.g:8180:3: rule__TableHierarchy__ValueRefAssignment_1
+            // InternalTableDSL.g:7748:2: ( rule__TableHierarchy__ValueRefAssignment_1 )
+            // InternalTableDSL.g:7748:3: rule__TableHierarchy__ValueRefAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__TableHierarchy__ValueRefAssignment_1();
@@ -28751,16 +27412,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAttribute__Group__0"
-    // InternalTableDSL.g:8189:1: rule__TableAttribute__Group__0 : rule__TableAttribute__Group__0__Impl rule__TableAttribute__Group__1 ;
+    // InternalTableDSL.g:7757:1: rule__TableAttribute__Group__0 : rule__TableAttribute__Group__0__Impl rule__TableAttribute__Group__1 ;
     public final void rule__TableAttribute__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8193:1: ( rule__TableAttribute__Group__0__Impl rule__TableAttribute__Group__1 )
-            // InternalTableDSL.g:8194:2: rule__TableAttribute__Group__0__Impl rule__TableAttribute__Group__1
+            // InternalTableDSL.g:7761:1: ( rule__TableAttribute__Group__0__Impl rule__TableAttribute__Group__1 )
+            // InternalTableDSL.g:7762:2: rule__TableAttribute__Group__0__Impl rule__TableAttribute__Group__1
             {
-            pushFollow(FOLLOW_38);
+            pushFollow(FOLLOW_39);
             rule__TableAttribute__Group__0__Impl();
 
             state._fsp--;
@@ -28789,23 +27450,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAttribute__Group__0__Impl"
-    // InternalTableDSL.g:8201:1: rule__TableAttribute__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:7769:1: rule__TableAttribute__Group__0__Impl : ( () ) ;
     public final void rule__TableAttribute__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8205:1: ( ( () ) )
-            // InternalTableDSL.g:8206:1: ( () )
+            // InternalTableDSL.g:7773:1: ( ( () ) )
+            // InternalTableDSL.g:7774:1: ( () )
             {
-            // InternalTableDSL.g:8206:1: ( () )
-            // InternalTableDSL.g:8207:2: ()
+            // InternalTableDSL.g:7774:1: ( () )
+            // InternalTableDSL.g:7775:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAttributeAccess().getTableAttributeAction_0()); 
             }
-            // InternalTableDSL.g:8208:2: ()
-            // InternalTableDSL.g:8208:3: 
+            // InternalTableDSL.g:7776:2: ()
+            // InternalTableDSL.g:7776:3: 
             {
             }
 
@@ -28830,14 +27491,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAttribute__Group__1"
-    // InternalTableDSL.g:8216:1: rule__TableAttribute__Group__1 : rule__TableAttribute__Group__1__Impl rule__TableAttribute__Group__2 ;
+    // InternalTableDSL.g:7784:1: rule__TableAttribute__Group__1 : rule__TableAttribute__Group__1__Impl rule__TableAttribute__Group__2 ;
     public final void rule__TableAttribute__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8220:1: ( rule__TableAttribute__Group__1__Impl rule__TableAttribute__Group__2 )
-            // InternalTableDSL.g:8221:2: rule__TableAttribute__Group__1__Impl rule__TableAttribute__Group__2
+            // InternalTableDSL.g:7788:1: ( rule__TableAttribute__Group__1__Impl rule__TableAttribute__Group__2 )
+            // InternalTableDSL.g:7789:2: rule__TableAttribute__Group__1__Impl rule__TableAttribute__Group__2
             {
             pushFollow(FOLLOW_7);
             rule__TableAttribute__Group__1__Impl();
@@ -28868,17 +27529,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAttribute__Group__1__Impl"
-    // InternalTableDSL.g:8228:1: rule__TableAttribute__Group__1__Impl : ( 'property' ) ;
+    // InternalTableDSL.g:7796:1: rule__TableAttribute__Group__1__Impl : ( 'property' ) ;
     public final void rule__TableAttribute__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8232:1: ( ( 'property' ) )
-            // InternalTableDSL.g:8233:1: ( 'property' )
+            // InternalTableDSL.g:7800:1: ( ( 'property' ) )
+            // InternalTableDSL.g:7801:1: ( 'property' )
             {
-            // InternalTableDSL.g:8233:1: ( 'property' )
-            // InternalTableDSL.g:8234:2: 'property'
+            // InternalTableDSL.g:7801:1: ( 'property' )
+            // InternalTableDSL.g:7802:2: 'property'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAttributeAccess().getPropertyKeyword_1()); 
@@ -28909,14 +27570,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAttribute__Group__2"
-    // InternalTableDSL.g:8243:1: rule__TableAttribute__Group__2 : rule__TableAttribute__Group__2__Impl ;
+    // InternalTableDSL.g:7811:1: rule__TableAttribute__Group__2 : rule__TableAttribute__Group__2__Impl ;
     public final void rule__TableAttribute__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8247:1: ( rule__TableAttribute__Group__2__Impl )
-            // InternalTableDSL.g:8248:2: rule__TableAttribute__Group__2__Impl
+            // InternalTableDSL.g:7815:1: ( rule__TableAttribute__Group__2__Impl )
+            // InternalTableDSL.g:7816:2: rule__TableAttribute__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableAttribute__Group__2__Impl();
@@ -28942,23 +27603,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAttribute__Group__2__Impl"
-    // InternalTableDSL.g:8254:1: rule__TableAttribute__Group__2__Impl : ( ( rule__TableAttribute__ValueRefAssignment_2 ) ) ;
+    // InternalTableDSL.g:7822:1: rule__TableAttribute__Group__2__Impl : ( ( rule__TableAttribute__ValueRefAssignment_2 ) ) ;
     public final void rule__TableAttribute__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8258:1: ( ( ( rule__TableAttribute__ValueRefAssignment_2 ) ) )
-            // InternalTableDSL.g:8259:1: ( ( rule__TableAttribute__ValueRefAssignment_2 ) )
+            // InternalTableDSL.g:7826:1: ( ( ( rule__TableAttribute__ValueRefAssignment_2 ) ) )
+            // InternalTableDSL.g:7827:1: ( ( rule__TableAttribute__ValueRefAssignment_2 ) )
             {
-            // InternalTableDSL.g:8259:1: ( ( rule__TableAttribute__ValueRefAssignment_2 ) )
-            // InternalTableDSL.g:8260:2: ( rule__TableAttribute__ValueRefAssignment_2 )
+            // InternalTableDSL.g:7827:1: ( ( rule__TableAttribute__ValueRefAssignment_2 ) )
+            // InternalTableDSL.g:7828:2: ( rule__TableAttribute__ValueRefAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAttributeAccess().getValueRefAssignment_2()); 
             }
-            // InternalTableDSL.g:8261:2: ( rule__TableAttribute__ValueRefAssignment_2 )
-            // InternalTableDSL.g:8261:3: rule__TableAttribute__ValueRefAssignment_2
+            // InternalTableDSL.g:7829:2: ( rule__TableAttribute__ValueRefAssignment_2 )
+            // InternalTableDSL.g:7829:3: rule__TableAttribute__ValueRefAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TableAttribute__ValueRefAssignment_2();
@@ -28993,14 +27654,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAggregation__Group__0"
-    // InternalTableDSL.g:8270:1: rule__TableAggregation__Group__0 : rule__TableAggregation__Group__0__Impl rule__TableAggregation__Group__1 ;
+    // InternalTableDSL.g:7838:1: rule__TableAggregation__Group__0 : rule__TableAggregation__Group__0__Impl rule__TableAggregation__Group__1 ;
     public final void rule__TableAggregation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8274:1: ( rule__TableAggregation__Group__0__Impl rule__TableAggregation__Group__1 )
-            // InternalTableDSL.g:8275:2: rule__TableAggregation__Group__0__Impl rule__TableAggregation__Group__1
+            // InternalTableDSL.g:7842:1: ( rule__TableAggregation__Group__0__Impl rule__TableAggregation__Group__1 )
+            // InternalTableDSL.g:7843:2: rule__TableAggregation__Group__0__Impl rule__TableAggregation__Group__1
             {
             pushFollow(FOLLOW_7);
             rule__TableAggregation__Group__0__Impl();
@@ -29031,17 +27692,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAggregation__Group__0__Impl"
-    // InternalTableDSL.g:8282:1: rule__TableAggregation__Group__0__Impl : ( 'aggregation' ) ;
+    // InternalTableDSL.g:7850:1: rule__TableAggregation__Group__0__Impl : ( 'aggregation' ) ;
     public final void rule__TableAggregation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8286:1: ( ( 'aggregation' ) )
-            // InternalTableDSL.g:8287:1: ( 'aggregation' )
+            // InternalTableDSL.g:7854:1: ( ( 'aggregation' ) )
+            // InternalTableDSL.g:7855:1: ( 'aggregation' )
             {
-            // InternalTableDSL.g:8287:1: ( 'aggregation' )
-            // InternalTableDSL.g:8288:2: 'aggregation'
+            // InternalTableDSL.g:7855:1: ( 'aggregation' )
+            // InternalTableDSL.g:7856:2: 'aggregation'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAggregationAccess().getAggregationKeyword_0()); 
@@ -29072,14 +27733,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAggregation__Group__1"
-    // InternalTableDSL.g:8297:1: rule__TableAggregation__Group__1 : rule__TableAggregation__Group__1__Impl ;
+    // InternalTableDSL.g:7865:1: rule__TableAggregation__Group__1 : rule__TableAggregation__Group__1__Impl ;
     public final void rule__TableAggregation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8301:1: ( rule__TableAggregation__Group__1__Impl )
-            // InternalTableDSL.g:8302:2: rule__TableAggregation__Group__1__Impl
+            // InternalTableDSL.g:7869:1: ( rule__TableAggregation__Group__1__Impl )
+            // InternalTableDSL.g:7870:2: rule__TableAggregation__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableAggregation__Group__1__Impl();
@@ -29105,23 +27766,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAggregation__Group__1__Impl"
-    // InternalTableDSL.g:8308:1: rule__TableAggregation__Group__1__Impl : ( ( rule__TableAggregation__ValueRefAssignment_1 ) ) ;
+    // InternalTableDSL.g:7876:1: rule__TableAggregation__Group__1__Impl : ( ( rule__TableAggregation__ValueRefAssignment_1 ) ) ;
     public final void rule__TableAggregation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8312:1: ( ( ( rule__TableAggregation__ValueRefAssignment_1 ) ) )
-            // InternalTableDSL.g:8313:1: ( ( rule__TableAggregation__ValueRefAssignment_1 ) )
+            // InternalTableDSL.g:7880:1: ( ( ( rule__TableAggregation__ValueRefAssignment_1 ) ) )
+            // InternalTableDSL.g:7881:1: ( ( rule__TableAggregation__ValueRefAssignment_1 ) )
             {
-            // InternalTableDSL.g:8313:1: ( ( rule__TableAggregation__ValueRefAssignment_1 ) )
-            // InternalTableDSL.g:8314:2: ( rule__TableAggregation__ValueRefAssignment_1 )
+            // InternalTableDSL.g:7881:1: ( ( rule__TableAggregation__ValueRefAssignment_1 ) )
+            // InternalTableDSL.g:7882:2: ( rule__TableAggregation__ValueRefAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAggregationAccess().getValueRefAssignment_1()); 
             }
-            // InternalTableDSL.g:8315:2: ( rule__TableAggregation__ValueRefAssignment_1 )
-            // InternalTableDSL.g:8315:3: rule__TableAggregation__ValueRefAssignment_1
+            // InternalTableDSL.g:7883:2: ( rule__TableAggregation__ValueRefAssignment_1 )
+            // InternalTableDSL.g:7883:3: rule__TableAggregation__ValueRefAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__TableAggregation__ValueRefAssignment_1();
@@ -29156,16 +27817,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberInterval__Group__0"
-    // InternalTableDSL.g:8324:1: rule__TableNumberInterval__Group__0 : rule__TableNumberInterval__Group__0__Impl rule__TableNumberInterval__Group__1 ;
+    // InternalTableDSL.g:7892:1: rule__TableNumberInterval__Group__0 : rule__TableNumberInterval__Group__0__Impl rule__TableNumberInterval__Group__1 ;
     public final void rule__TableNumberInterval__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8328:1: ( rule__TableNumberInterval__Group__0__Impl rule__TableNumberInterval__Group__1 )
-            // InternalTableDSL.g:8329:2: rule__TableNumberInterval__Group__0__Impl rule__TableNumberInterval__Group__1
+            // InternalTableDSL.g:7896:1: ( rule__TableNumberInterval__Group__0__Impl rule__TableNumberInterval__Group__1 )
+            // InternalTableDSL.g:7897:2: rule__TableNumberInterval__Group__0__Impl rule__TableNumberInterval__Group__1
             {
-            pushFollow(FOLLOW_39);
+            pushFollow(FOLLOW_40);
             rule__TableNumberInterval__Group__0__Impl();
 
             state._fsp--;
@@ -29194,23 +27855,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberInterval__Group__0__Impl"
-    // InternalTableDSL.g:8336:1: rule__TableNumberInterval__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:7904:1: rule__TableNumberInterval__Group__0__Impl : ( () ) ;
     public final void rule__TableNumberInterval__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8340:1: ( ( () ) )
-            // InternalTableDSL.g:8341:1: ( () )
+            // InternalTableDSL.g:7908:1: ( ( () ) )
+            // InternalTableDSL.g:7909:1: ( () )
             {
-            // InternalTableDSL.g:8341:1: ( () )
-            // InternalTableDSL.g:8342:2: ()
+            // InternalTableDSL.g:7909:1: ( () )
+            // InternalTableDSL.g:7910:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberIntervalAccess().getTableNumberIntervalAction_0()); 
             }
-            // InternalTableDSL.g:8343:2: ()
-            // InternalTableDSL.g:8343:3: 
+            // InternalTableDSL.g:7911:2: ()
+            // InternalTableDSL.g:7911:3: 
             {
             }
 
@@ -29235,16 +27896,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberInterval__Group__1"
-    // InternalTableDSL.g:8351:1: rule__TableNumberInterval__Group__1 : rule__TableNumberInterval__Group__1__Impl rule__TableNumberInterval__Group__2 ;
+    // InternalTableDSL.g:7919:1: rule__TableNumberInterval__Group__1 : rule__TableNumberInterval__Group__1__Impl rule__TableNumberInterval__Group__2 ;
     public final void rule__TableNumberInterval__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8355:1: ( rule__TableNumberInterval__Group__1__Impl rule__TableNumberInterval__Group__2 )
-            // InternalTableDSL.g:8356:2: rule__TableNumberInterval__Group__1__Impl rule__TableNumberInterval__Group__2
+            // InternalTableDSL.g:7923:1: ( rule__TableNumberInterval__Group__1__Impl rule__TableNumberInterval__Group__2 )
+            // InternalTableDSL.g:7924:2: rule__TableNumberInterval__Group__1__Impl rule__TableNumberInterval__Group__2
             {
-            pushFollow(FOLLOW_40);
+            pushFollow(FOLLOW_41);
             rule__TableNumberInterval__Group__1__Impl();
 
             state._fsp--;
@@ -29273,17 +27934,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberInterval__Group__1__Impl"
-    // InternalTableDSL.g:8363:1: rule__TableNumberInterval__Group__1__Impl : ( 'upToNumber' ) ;
+    // InternalTableDSL.g:7931:1: rule__TableNumberInterval__Group__1__Impl : ( 'upToNumber' ) ;
     public final void rule__TableNumberInterval__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8367:1: ( ( 'upToNumber' ) )
-            // InternalTableDSL.g:8368:1: ( 'upToNumber' )
+            // InternalTableDSL.g:7935:1: ( ( 'upToNumber' ) )
+            // InternalTableDSL.g:7936:1: ( 'upToNumber' )
             {
-            // InternalTableDSL.g:8368:1: ( 'upToNumber' )
-            // InternalTableDSL.g:8369:2: 'upToNumber'
+            // InternalTableDSL.g:7936:1: ( 'upToNumber' )
+            // InternalTableDSL.g:7937:2: 'upToNumber'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberIntervalAccess().getUpToNumberKeyword_1()); 
@@ -29314,16 +27975,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberInterval__Group__2"
-    // InternalTableDSL.g:8378:1: rule__TableNumberInterval__Group__2 : rule__TableNumberInterval__Group__2__Impl rule__TableNumberInterval__Group__3 ;
+    // InternalTableDSL.g:7946:1: rule__TableNumberInterval__Group__2 : rule__TableNumberInterval__Group__2__Impl rule__TableNumberInterval__Group__3 ;
     public final void rule__TableNumberInterval__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8382:1: ( rule__TableNumberInterval__Group__2__Impl rule__TableNumberInterval__Group__3 )
-            // InternalTableDSL.g:8383:2: rule__TableNumberInterval__Group__2__Impl rule__TableNumberInterval__Group__3
+            // InternalTableDSL.g:7950:1: ( rule__TableNumberInterval__Group__2__Impl rule__TableNumberInterval__Group__3 )
+            // InternalTableDSL.g:7951:2: rule__TableNumberInterval__Group__2__Impl rule__TableNumberInterval__Group__3
             {
-            pushFollow(FOLLOW_41);
+            pushFollow(FOLLOW_42);
             rule__TableNumberInterval__Group__2__Impl();
 
             state._fsp--;
@@ -29352,23 +28013,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberInterval__Group__2__Impl"
-    // InternalTableDSL.g:8390:1: rule__TableNumberInterval__Group__2__Impl : ( ( rule__TableNumberInterval__NumberIntervalValueAssignment_2 ) ) ;
+    // InternalTableDSL.g:7958:1: rule__TableNumberInterval__Group__2__Impl : ( ( rule__TableNumberInterval__NumberIntervalValueAssignment_2 ) ) ;
     public final void rule__TableNumberInterval__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8394:1: ( ( ( rule__TableNumberInterval__NumberIntervalValueAssignment_2 ) ) )
-            // InternalTableDSL.g:8395:1: ( ( rule__TableNumberInterval__NumberIntervalValueAssignment_2 ) )
+            // InternalTableDSL.g:7962:1: ( ( ( rule__TableNumberInterval__NumberIntervalValueAssignment_2 ) ) )
+            // InternalTableDSL.g:7963:1: ( ( rule__TableNumberInterval__NumberIntervalValueAssignment_2 ) )
             {
-            // InternalTableDSL.g:8395:1: ( ( rule__TableNumberInterval__NumberIntervalValueAssignment_2 ) )
-            // InternalTableDSL.g:8396:2: ( rule__TableNumberInterval__NumberIntervalValueAssignment_2 )
+            // InternalTableDSL.g:7963:1: ( ( rule__TableNumberInterval__NumberIntervalValueAssignment_2 ) )
+            // InternalTableDSL.g:7964:2: ( rule__TableNumberInterval__NumberIntervalValueAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberIntervalAccess().getNumberIntervalValueAssignment_2()); 
             }
-            // InternalTableDSL.g:8397:2: ( rule__TableNumberInterval__NumberIntervalValueAssignment_2 )
-            // InternalTableDSL.g:8397:3: rule__TableNumberInterval__NumberIntervalValueAssignment_2
+            // InternalTableDSL.g:7965:2: ( rule__TableNumberInterval__NumberIntervalValueAssignment_2 )
+            // InternalTableDSL.g:7965:3: rule__TableNumberInterval__NumberIntervalValueAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TableNumberInterval__NumberIntervalValueAssignment_2();
@@ -29403,14 +28064,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberInterval__Group__3"
-    // InternalTableDSL.g:8405:1: rule__TableNumberInterval__Group__3 : rule__TableNumberInterval__Group__3__Impl ;
+    // InternalTableDSL.g:7973:1: rule__TableNumberInterval__Group__3 : rule__TableNumberInterval__Group__3__Impl ;
     public final void rule__TableNumberInterval__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8409:1: ( rule__TableNumberInterval__Group__3__Impl )
-            // InternalTableDSL.g:8410:2: rule__TableNumberInterval__Group__3__Impl
+            // InternalTableDSL.g:7977:1: ( rule__TableNumberInterval__Group__3__Impl )
+            // InternalTableDSL.g:7978:2: rule__TableNumberInterval__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableNumberInterval__Group__3__Impl();
@@ -29436,23 +28097,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberInterval__Group__3__Impl"
-    // InternalTableDSL.g:8416:1: rule__TableNumberInterval__Group__3__Impl : ( ( rule__TableNumberInterval__NumberRangeAssignment_3 ) ) ;
+    // InternalTableDSL.g:7984:1: rule__TableNumberInterval__Group__3__Impl : ( ( rule__TableNumberInterval__NumberRangeAssignment_3 ) ) ;
     public final void rule__TableNumberInterval__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8420:1: ( ( ( rule__TableNumberInterval__NumberRangeAssignment_3 ) ) )
-            // InternalTableDSL.g:8421:1: ( ( rule__TableNumberInterval__NumberRangeAssignment_3 ) )
+            // InternalTableDSL.g:7988:1: ( ( ( rule__TableNumberInterval__NumberRangeAssignment_3 ) ) )
+            // InternalTableDSL.g:7989:1: ( ( rule__TableNumberInterval__NumberRangeAssignment_3 ) )
             {
-            // InternalTableDSL.g:8421:1: ( ( rule__TableNumberInterval__NumberRangeAssignment_3 ) )
-            // InternalTableDSL.g:8422:2: ( rule__TableNumberInterval__NumberRangeAssignment_3 )
+            // InternalTableDSL.g:7989:1: ( ( rule__TableNumberInterval__NumberRangeAssignment_3 ) )
+            // InternalTableDSL.g:7990:2: ( rule__TableNumberInterval__NumberRangeAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberIntervalAccess().getNumberRangeAssignment_3()); 
             }
-            // InternalTableDSL.g:8423:2: ( rule__TableNumberInterval__NumberRangeAssignment_3 )
-            // InternalTableDSL.g:8423:3: rule__TableNumberInterval__NumberRangeAssignment_3
+            // InternalTableDSL.g:7991:2: ( rule__TableNumberInterval__NumberRangeAssignment_3 )
+            // InternalTableDSL.g:7991:3: rule__TableNumberInterval__NumberRangeAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__TableNumberInterval__NumberRangeAssignment_3();
@@ -29487,16 +28148,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntInterval__Group__0"
-    // InternalTableDSL.g:8432:1: rule__TableIntInterval__Group__0 : rule__TableIntInterval__Group__0__Impl rule__TableIntInterval__Group__1 ;
+    // InternalTableDSL.g:8000:1: rule__TableIntInterval__Group__0 : rule__TableIntInterval__Group__0__Impl rule__TableIntInterval__Group__1 ;
     public final void rule__TableIntInterval__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8436:1: ( rule__TableIntInterval__Group__0__Impl rule__TableIntInterval__Group__1 )
-            // InternalTableDSL.g:8437:2: rule__TableIntInterval__Group__0__Impl rule__TableIntInterval__Group__1
+            // InternalTableDSL.g:8004:1: ( rule__TableIntInterval__Group__0__Impl rule__TableIntInterval__Group__1 )
+            // InternalTableDSL.g:8005:2: rule__TableIntInterval__Group__0__Impl rule__TableIntInterval__Group__1
             {
-            pushFollow(FOLLOW_42);
+            pushFollow(FOLLOW_43);
             rule__TableIntInterval__Group__0__Impl();
 
             state._fsp--;
@@ -29525,23 +28186,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntInterval__Group__0__Impl"
-    // InternalTableDSL.g:8444:1: rule__TableIntInterval__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:8012:1: rule__TableIntInterval__Group__0__Impl : ( () ) ;
     public final void rule__TableIntInterval__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8448:1: ( ( () ) )
-            // InternalTableDSL.g:8449:1: ( () )
+            // InternalTableDSL.g:8016:1: ( ( () ) )
+            // InternalTableDSL.g:8017:1: ( () )
             {
-            // InternalTableDSL.g:8449:1: ( () )
-            // InternalTableDSL.g:8450:2: ()
+            // InternalTableDSL.g:8017:1: ( () )
+            // InternalTableDSL.g:8018:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntIntervalAccess().getTableIntIntervalAction_0()); 
             }
-            // InternalTableDSL.g:8451:2: ()
-            // InternalTableDSL.g:8451:3: 
+            // InternalTableDSL.g:8019:2: ()
+            // InternalTableDSL.g:8019:3: 
             {
             }
 
@@ -29566,16 +28227,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntInterval__Group__1"
-    // InternalTableDSL.g:8459:1: rule__TableIntInterval__Group__1 : rule__TableIntInterval__Group__1__Impl rule__TableIntInterval__Group__2 ;
+    // InternalTableDSL.g:8027:1: rule__TableIntInterval__Group__1 : rule__TableIntInterval__Group__1__Impl rule__TableIntInterval__Group__2 ;
     public final void rule__TableIntInterval__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8463:1: ( rule__TableIntInterval__Group__1__Impl rule__TableIntInterval__Group__2 )
-            // InternalTableDSL.g:8464:2: rule__TableIntInterval__Group__1__Impl rule__TableIntInterval__Group__2
+            // InternalTableDSL.g:8031:1: ( rule__TableIntInterval__Group__1__Impl rule__TableIntInterval__Group__2 )
+            // InternalTableDSL.g:8032:2: rule__TableIntInterval__Group__1__Impl rule__TableIntInterval__Group__2
             {
-            pushFollow(FOLLOW_43);
+            pushFollow(FOLLOW_44);
             rule__TableIntInterval__Group__1__Impl();
 
             state._fsp--;
@@ -29604,17 +28265,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntInterval__Group__1__Impl"
-    // InternalTableDSL.g:8471:1: rule__TableIntInterval__Group__1__Impl : ( 'upToInteger' ) ;
+    // InternalTableDSL.g:8039:1: rule__TableIntInterval__Group__1__Impl : ( 'upToInteger' ) ;
     public final void rule__TableIntInterval__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8475:1: ( ( 'upToInteger' ) )
-            // InternalTableDSL.g:8476:1: ( 'upToInteger' )
+            // InternalTableDSL.g:8043:1: ( ( 'upToInteger' ) )
+            // InternalTableDSL.g:8044:1: ( 'upToInteger' )
             {
-            // InternalTableDSL.g:8476:1: ( 'upToInteger' )
-            // InternalTableDSL.g:8477:2: 'upToInteger'
+            // InternalTableDSL.g:8044:1: ( 'upToInteger' )
+            // InternalTableDSL.g:8045:2: 'upToInteger'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntIntervalAccess().getUpToIntegerKeyword_1()); 
@@ -29645,16 +28306,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntInterval__Group__2"
-    // InternalTableDSL.g:8486:1: rule__TableIntInterval__Group__2 : rule__TableIntInterval__Group__2__Impl rule__TableIntInterval__Group__3 ;
+    // InternalTableDSL.g:8054:1: rule__TableIntInterval__Group__2 : rule__TableIntInterval__Group__2__Impl rule__TableIntInterval__Group__3 ;
     public final void rule__TableIntInterval__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8490:1: ( rule__TableIntInterval__Group__2__Impl rule__TableIntInterval__Group__3 )
-            // InternalTableDSL.g:8491:2: rule__TableIntInterval__Group__2__Impl rule__TableIntInterval__Group__3
+            // InternalTableDSL.g:8058:1: ( rule__TableIntInterval__Group__2__Impl rule__TableIntInterval__Group__3 )
+            // InternalTableDSL.g:8059:2: rule__TableIntInterval__Group__2__Impl rule__TableIntInterval__Group__3
             {
-            pushFollow(FOLLOW_41);
+            pushFollow(FOLLOW_42);
             rule__TableIntInterval__Group__2__Impl();
 
             state._fsp--;
@@ -29683,23 +28344,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntInterval__Group__2__Impl"
-    // InternalTableDSL.g:8498:1: rule__TableIntInterval__Group__2__Impl : ( ( rule__TableIntInterval__IntIntervalValueAssignment_2 ) ) ;
+    // InternalTableDSL.g:8066:1: rule__TableIntInterval__Group__2__Impl : ( ( rule__TableIntInterval__IntIntervalValueAssignment_2 ) ) ;
     public final void rule__TableIntInterval__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8502:1: ( ( ( rule__TableIntInterval__IntIntervalValueAssignment_2 ) ) )
-            // InternalTableDSL.g:8503:1: ( ( rule__TableIntInterval__IntIntervalValueAssignment_2 ) )
+            // InternalTableDSL.g:8070:1: ( ( ( rule__TableIntInterval__IntIntervalValueAssignment_2 ) ) )
+            // InternalTableDSL.g:8071:1: ( ( rule__TableIntInterval__IntIntervalValueAssignment_2 ) )
             {
-            // InternalTableDSL.g:8503:1: ( ( rule__TableIntInterval__IntIntervalValueAssignment_2 ) )
-            // InternalTableDSL.g:8504:2: ( rule__TableIntInterval__IntIntervalValueAssignment_2 )
+            // InternalTableDSL.g:8071:1: ( ( rule__TableIntInterval__IntIntervalValueAssignment_2 ) )
+            // InternalTableDSL.g:8072:2: ( rule__TableIntInterval__IntIntervalValueAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntIntervalAccess().getIntIntervalValueAssignment_2()); 
             }
-            // InternalTableDSL.g:8505:2: ( rule__TableIntInterval__IntIntervalValueAssignment_2 )
-            // InternalTableDSL.g:8505:3: rule__TableIntInterval__IntIntervalValueAssignment_2
+            // InternalTableDSL.g:8073:2: ( rule__TableIntInterval__IntIntervalValueAssignment_2 )
+            // InternalTableDSL.g:8073:3: rule__TableIntInterval__IntIntervalValueAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TableIntInterval__IntIntervalValueAssignment_2();
@@ -29734,14 +28395,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntInterval__Group__3"
-    // InternalTableDSL.g:8513:1: rule__TableIntInterval__Group__3 : rule__TableIntInterval__Group__3__Impl ;
+    // InternalTableDSL.g:8081:1: rule__TableIntInterval__Group__3 : rule__TableIntInterval__Group__3__Impl ;
     public final void rule__TableIntInterval__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8517:1: ( rule__TableIntInterval__Group__3__Impl )
-            // InternalTableDSL.g:8518:2: rule__TableIntInterval__Group__3__Impl
+            // InternalTableDSL.g:8085:1: ( rule__TableIntInterval__Group__3__Impl )
+            // InternalTableDSL.g:8086:2: rule__TableIntInterval__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableIntInterval__Group__3__Impl();
@@ -29767,23 +28428,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntInterval__Group__3__Impl"
-    // InternalTableDSL.g:8524:1: rule__TableIntInterval__Group__3__Impl : ( ( rule__TableIntInterval__IntRangeAssignment_3 ) ) ;
+    // InternalTableDSL.g:8092:1: rule__TableIntInterval__Group__3__Impl : ( ( rule__TableIntInterval__IntRangeAssignment_3 ) ) ;
     public final void rule__TableIntInterval__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8528:1: ( ( ( rule__TableIntInterval__IntRangeAssignment_3 ) ) )
-            // InternalTableDSL.g:8529:1: ( ( rule__TableIntInterval__IntRangeAssignment_3 ) )
+            // InternalTableDSL.g:8096:1: ( ( ( rule__TableIntInterval__IntRangeAssignment_3 ) ) )
+            // InternalTableDSL.g:8097:1: ( ( rule__TableIntInterval__IntRangeAssignment_3 ) )
             {
-            // InternalTableDSL.g:8529:1: ( ( rule__TableIntInterval__IntRangeAssignment_3 ) )
-            // InternalTableDSL.g:8530:2: ( rule__TableIntInterval__IntRangeAssignment_3 )
+            // InternalTableDSL.g:8097:1: ( ( rule__TableIntInterval__IntRangeAssignment_3 ) )
+            // InternalTableDSL.g:8098:2: ( rule__TableIntInterval__IntRangeAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntIntervalAccess().getIntRangeAssignment_3()); 
             }
-            // InternalTableDSL.g:8531:2: ( rule__TableIntInterval__IntRangeAssignment_3 )
-            // InternalTableDSL.g:8531:3: rule__TableIntInterval__IntRangeAssignment_3
+            // InternalTableDSL.g:8099:2: ( rule__TableIntInterval__IntRangeAssignment_3 )
+            // InternalTableDSL.g:8099:3: rule__TableIntInterval__IntRangeAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__TableIntInterval__IntRangeAssignment_3();
@@ -29818,16 +28479,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayInterval__Group__0"
-    // InternalTableDSL.g:8540:1: rule__TableDateDayInterval__Group__0 : rule__TableDateDayInterval__Group__0__Impl rule__TableDateDayInterval__Group__1 ;
+    // InternalTableDSL.g:8108:1: rule__TableDateDayInterval__Group__0 : rule__TableDateDayInterval__Group__0__Impl rule__TableDateDayInterval__Group__1 ;
     public final void rule__TableDateDayInterval__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8544:1: ( rule__TableDateDayInterval__Group__0__Impl rule__TableDateDayInterval__Group__1 )
-            // InternalTableDSL.g:8545:2: rule__TableDateDayInterval__Group__0__Impl rule__TableDateDayInterval__Group__1
+            // InternalTableDSL.g:8112:1: ( rule__TableDateDayInterval__Group__0__Impl rule__TableDateDayInterval__Group__1 )
+            // InternalTableDSL.g:8113:2: rule__TableDateDayInterval__Group__0__Impl rule__TableDateDayInterval__Group__1
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_45);
             rule__TableDateDayInterval__Group__0__Impl();
 
             state._fsp--;
@@ -29856,23 +28517,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayInterval__Group__0__Impl"
-    // InternalTableDSL.g:8552:1: rule__TableDateDayInterval__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:8120:1: rule__TableDateDayInterval__Group__0__Impl : ( () ) ;
     public final void rule__TableDateDayInterval__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8556:1: ( ( () ) )
-            // InternalTableDSL.g:8557:1: ( () )
+            // InternalTableDSL.g:8124:1: ( ( () ) )
+            // InternalTableDSL.g:8125:1: ( () )
             {
-            // InternalTableDSL.g:8557:1: ( () )
-            // InternalTableDSL.g:8558:2: ()
+            // InternalTableDSL.g:8125:1: ( () )
+            // InternalTableDSL.g:8126:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayIntervalAccess().getTableDateDayIntervalAction_0()); 
             }
-            // InternalTableDSL.g:8559:2: ()
-            // InternalTableDSL.g:8559:3: 
+            // InternalTableDSL.g:8127:2: ()
+            // InternalTableDSL.g:8127:3: 
             {
             }
 
@@ -29897,16 +28558,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayInterval__Group__1"
-    // InternalTableDSL.g:8567:1: rule__TableDateDayInterval__Group__1 : rule__TableDateDayInterval__Group__1__Impl rule__TableDateDayInterval__Group__2 ;
+    // InternalTableDSL.g:8135:1: rule__TableDateDayInterval__Group__1 : rule__TableDateDayInterval__Group__1__Impl rule__TableDateDayInterval__Group__2 ;
     public final void rule__TableDateDayInterval__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8571:1: ( rule__TableDateDayInterval__Group__1__Impl rule__TableDateDayInterval__Group__2 )
-            // InternalTableDSL.g:8572:2: rule__TableDateDayInterval__Group__1__Impl rule__TableDateDayInterval__Group__2
+            // InternalTableDSL.g:8139:1: ( rule__TableDateDayInterval__Group__1__Impl rule__TableDateDayInterval__Group__2 )
+            // InternalTableDSL.g:8140:2: rule__TableDateDayInterval__Group__1__Impl rule__TableDateDayInterval__Group__2
             {
-            pushFollow(FOLLOW_43);
+            pushFollow(FOLLOW_44);
             rule__TableDateDayInterval__Group__1__Impl();
 
             state._fsp--;
@@ -29935,17 +28596,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayInterval__Group__1__Impl"
-    // InternalTableDSL.g:8579:1: rule__TableDateDayInterval__Group__1__Impl : ( 'daysInPast' ) ;
+    // InternalTableDSL.g:8147:1: rule__TableDateDayInterval__Group__1__Impl : ( 'daysInPast' ) ;
     public final void rule__TableDateDayInterval__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8583:1: ( ( 'daysInPast' ) )
-            // InternalTableDSL.g:8584:1: ( 'daysInPast' )
+            // InternalTableDSL.g:8151:1: ( ( 'daysInPast' ) )
+            // InternalTableDSL.g:8152:1: ( 'daysInPast' )
             {
-            // InternalTableDSL.g:8584:1: ( 'daysInPast' )
-            // InternalTableDSL.g:8585:2: 'daysInPast'
+            // InternalTableDSL.g:8152:1: ( 'daysInPast' )
+            // InternalTableDSL.g:8153:2: 'daysInPast'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayIntervalAccess().getDaysInPastKeyword_1()); 
@@ -29976,16 +28637,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayInterval__Group__2"
-    // InternalTableDSL.g:8594:1: rule__TableDateDayInterval__Group__2 : rule__TableDateDayInterval__Group__2__Impl rule__TableDateDayInterval__Group__3 ;
+    // InternalTableDSL.g:8162:1: rule__TableDateDayInterval__Group__2 : rule__TableDateDayInterval__Group__2__Impl rule__TableDateDayInterval__Group__3 ;
     public final void rule__TableDateDayInterval__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8598:1: ( rule__TableDateDayInterval__Group__2__Impl rule__TableDateDayInterval__Group__3 )
-            // InternalTableDSL.g:8599:2: rule__TableDateDayInterval__Group__2__Impl rule__TableDateDayInterval__Group__3
+            // InternalTableDSL.g:8166:1: ( rule__TableDateDayInterval__Group__2__Impl rule__TableDateDayInterval__Group__3 )
+            // InternalTableDSL.g:8167:2: rule__TableDateDayInterval__Group__2__Impl rule__TableDateDayInterval__Group__3
             {
-            pushFollow(FOLLOW_41);
+            pushFollow(FOLLOW_42);
             rule__TableDateDayInterval__Group__2__Impl();
 
             state._fsp--;
@@ -30014,23 +28675,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayInterval__Group__2__Impl"
-    // InternalTableDSL.g:8606:1: rule__TableDateDayInterval__Group__2__Impl : ( ( rule__TableDateDayInterval__DateIntervalValueAssignment_2 ) ) ;
+    // InternalTableDSL.g:8174:1: rule__TableDateDayInterval__Group__2__Impl : ( ( rule__TableDateDayInterval__DateIntervalValueAssignment_2 ) ) ;
     public final void rule__TableDateDayInterval__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8610:1: ( ( ( rule__TableDateDayInterval__DateIntervalValueAssignment_2 ) ) )
-            // InternalTableDSL.g:8611:1: ( ( rule__TableDateDayInterval__DateIntervalValueAssignment_2 ) )
+            // InternalTableDSL.g:8178:1: ( ( ( rule__TableDateDayInterval__DateIntervalValueAssignment_2 ) ) )
+            // InternalTableDSL.g:8179:1: ( ( rule__TableDateDayInterval__DateIntervalValueAssignment_2 ) )
             {
-            // InternalTableDSL.g:8611:1: ( ( rule__TableDateDayInterval__DateIntervalValueAssignment_2 ) )
-            // InternalTableDSL.g:8612:2: ( rule__TableDateDayInterval__DateIntervalValueAssignment_2 )
+            // InternalTableDSL.g:8179:1: ( ( rule__TableDateDayInterval__DateIntervalValueAssignment_2 ) )
+            // InternalTableDSL.g:8180:2: ( rule__TableDateDayInterval__DateIntervalValueAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayIntervalAccess().getDateIntervalValueAssignment_2()); 
             }
-            // InternalTableDSL.g:8613:2: ( rule__TableDateDayInterval__DateIntervalValueAssignment_2 )
-            // InternalTableDSL.g:8613:3: rule__TableDateDayInterval__DateIntervalValueAssignment_2
+            // InternalTableDSL.g:8181:2: ( rule__TableDateDayInterval__DateIntervalValueAssignment_2 )
+            // InternalTableDSL.g:8181:3: rule__TableDateDayInterval__DateIntervalValueAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TableDateDayInterval__DateIntervalValueAssignment_2();
@@ -30065,14 +28726,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayInterval__Group__3"
-    // InternalTableDSL.g:8621:1: rule__TableDateDayInterval__Group__3 : rule__TableDateDayInterval__Group__3__Impl ;
+    // InternalTableDSL.g:8189:1: rule__TableDateDayInterval__Group__3 : rule__TableDateDayInterval__Group__3__Impl ;
     public final void rule__TableDateDayInterval__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8625:1: ( rule__TableDateDayInterval__Group__3__Impl )
-            // InternalTableDSL.g:8626:2: rule__TableDateDayInterval__Group__3__Impl
+            // InternalTableDSL.g:8193:1: ( rule__TableDateDayInterval__Group__3__Impl )
+            // InternalTableDSL.g:8194:2: rule__TableDateDayInterval__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableDateDayInterval__Group__3__Impl();
@@ -30098,23 +28759,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayInterval__Group__3__Impl"
-    // InternalTableDSL.g:8632:1: rule__TableDateDayInterval__Group__3__Impl : ( ( rule__TableDateDayInterval__DateRangeAssignment_3 ) ) ;
+    // InternalTableDSL.g:8200:1: rule__TableDateDayInterval__Group__3__Impl : ( ( rule__TableDateDayInterval__DateRangeAssignment_3 ) ) ;
     public final void rule__TableDateDayInterval__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8636:1: ( ( ( rule__TableDateDayInterval__DateRangeAssignment_3 ) ) )
-            // InternalTableDSL.g:8637:1: ( ( rule__TableDateDayInterval__DateRangeAssignment_3 ) )
+            // InternalTableDSL.g:8204:1: ( ( ( rule__TableDateDayInterval__DateRangeAssignment_3 ) ) )
+            // InternalTableDSL.g:8205:1: ( ( rule__TableDateDayInterval__DateRangeAssignment_3 ) )
             {
-            // InternalTableDSL.g:8637:1: ( ( rule__TableDateDayInterval__DateRangeAssignment_3 ) )
-            // InternalTableDSL.g:8638:2: ( rule__TableDateDayInterval__DateRangeAssignment_3 )
+            // InternalTableDSL.g:8205:1: ( ( rule__TableDateDayInterval__DateRangeAssignment_3 ) )
+            // InternalTableDSL.g:8206:2: ( rule__TableDateDayInterval__DateRangeAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayIntervalAccess().getDateRangeAssignment_3()); 
             }
-            // InternalTableDSL.g:8639:2: ( rule__TableDateDayInterval__DateRangeAssignment_3 )
-            // InternalTableDSL.g:8639:3: rule__TableDateDayInterval__DateRangeAssignment_3
+            // InternalTableDSL.g:8207:2: ( rule__TableDateDayInterval__DateRangeAssignment_3 )
+            // InternalTableDSL.g:8207:3: rule__TableDateDayInterval__DateRangeAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__TableDateDayInterval__DateRangeAssignment_3();
@@ -30149,16 +28810,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntLookup__Group__0"
-    // InternalTableDSL.g:8648:1: rule__TableIntLookup__Group__0 : rule__TableIntLookup__Group__0__Impl rule__TableIntLookup__Group__1 ;
+    // InternalTableDSL.g:8216:1: rule__TableIntLookup__Group__0 : rule__TableIntLookup__Group__0__Impl rule__TableIntLookup__Group__1 ;
     public final void rule__TableIntLookup__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8652:1: ( rule__TableIntLookup__Group__0__Impl rule__TableIntLookup__Group__1 )
-            // InternalTableDSL.g:8653:2: rule__TableIntLookup__Group__0__Impl rule__TableIntLookup__Group__1
+            // InternalTableDSL.g:8220:1: ( rule__TableIntLookup__Group__0__Impl rule__TableIntLookup__Group__1 )
+            // InternalTableDSL.g:8221:2: rule__TableIntLookup__Group__0__Impl rule__TableIntLookup__Group__1
             {
-            pushFollow(FOLLOW_45);
+            pushFollow(FOLLOW_46);
             rule__TableIntLookup__Group__0__Impl();
 
             state._fsp--;
@@ -30187,23 +28848,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntLookup__Group__0__Impl"
-    // InternalTableDSL.g:8660:1: rule__TableIntLookup__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:8228:1: rule__TableIntLookup__Group__0__Impl : ( () ) ;
     public final void rule__TableIntLookup__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8664:1: ( ( () ) )
-            // InternalTableDSL.g:8665:1: ( () )
+            // InternalTableDSL.g:8232:1: ( ( () ) )
+            // InternalTableDSL.g:8233:1: ( () )
             {
-            // InternalTableDSL.g:8665:1: ( () )
-            // InternalTableDSL.g:8666:2: ()
+            // InternalTableDSL.g:8233:1: ( () )
+            // InternalTableDSL.g:8234:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntLookupAccess().getTableIntLookupAction_0()); 
             }
-            // InternalTableDSL.g:8667:2: ()
-            // InternalTableDSL.g:8667:3: 
+            // InternalTableDSL.g:8235:2: ()
+            // InternalTableDSL.g:8235:3: 
             {
             }
 
@@ -30228,16 +28889,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntLookup__Group__1"
-    // InternalTableDSL.g:8675:1: rule__TableIntLookup__Group__1 : rule__TableIntLookup__Group__1__Impl rule__TableIntLookup__Group__2 ;
+    // InternalTableDSL.g:8243:1: rule__TableIntLookup__Group__1 : rule__TableIntLookup__Group__1__Impl rule__TableIntLookup__Group__2 ;
     public final void rule__TableIntLookup__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8679:1: ( rule__TableIntLookup__Group__1__Impl rule__TableIntLookup__Group__2 )
-            // InternalTableDSL.g:8680:2: rule__TableIntLookup__Group__1__Impl rule__TableIntLookup__Group__2
+            // InternalTableDSL.g:8247:1: ( rule__TableIntLookup__Group__1__Impl rule__TableIntLookup__Group__2 )
+            // InternalTableDSL.g:8248:2: rule__TableIntLookup__Group__1__Impl rule__TableIntLookup__Group__2
             {
-            pushFollow(FOLLOW_43);
+            pushFollow(FOLLOW_44);
             rule__TableIntLookup__Group__1__Impl();
 
             state._fsp--;
@@ -30266,17 +28927,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntLookup__Group__1__Impl"
-    // InternalTableDSL.g:8687:1: rule__TableIntLookup__Group__1__Impl : ( 'integer' ) ;
+    // InternalTableDSL.g:8255:1: rule__TableIntLookup__Group__1__Impl : ( 'integer' ) ;
     public final void rule__TableIntLookup__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8691:1: ( ( 'integer' ) )
-            // InternalTableDSL.g:8692:1: ( 'integer' )
+            // InternalTableDSL.g:8259:1: ( ( 'integer' ) )
+            // InternalTableDSL.g:8260:1: ( 'integer' )
             {
-            // InternalTableDSL.g:8692:1: ( 'integer' )
-            // InternalTableDSL.g:8693:2: 'integer'
+            // InternalTableDSL.g:8260:1: ( 'integer' )
+            // InternalTableDSL.g:8261:2: 'integer'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntLookupAccess().getIntegerKeyword_1()); 
@@ -30307,16 +28968,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntLookup__Group__2"
-    // InternalTableDSL.g:8702:1: rule__TableIntLookup__Group__2 : rule__TableIntLookup__Group__2__Impl rule__TableIntLookup__Group__3 ;
+    // InternalTableDSL.g:8270:1: rule__TableIntLookup__Group__2 : rule__TableIntLookup__Group__2__Impl rule__TableIntLookup__Group__3 ;
     public final void rule__TableIntLookup__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8706:1: ( rule__TableIntLookup__Group__2__Impl rule__TableIntLookup__Group__3 )
-            // InternalTableDSL.g:8707:2: rule__TableIntLookup__Group__2__Impl rule__TableIntLookup__Group__3
+            // InternalTableDSL.g:8274:1: ( rule__TableIntLookup__Group__2__Impl rule__TableIntLookup__Group__3 )
+            // InternalTableDSL.g:8275:2: rule__TableIntLookup__Group__2__Impl rule__TableIntLookup__Group__3
             {
-            pushFollow(FOLLOW_41);
+            pushFollow(FOLLOW_42);
             rule__TableIntLookup__Group__2__Impl();
 
             state._fsp--;
@@ -30345,23 +29006,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntLookup__Group__2__Impl"
-    // InternalTableDSL.g:8714:1: rule__TableIntLookup__Group__2__Impl : ( ( rule__TableIntLookup__LookupValueAssignment_2 ) ) ;
+    // InternalTableDSL.g:8282:1: rule__TableIntLookup__Group__2__Impl : ( ( rule__TableIntLookup__LookupValueAssignment_2 ) ) ;
     public final void rule__TableIntLookup__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8718:1: ( ( ( rule__TableIntLookup__LookupValueAssignment_2 ) ) )
-            // InternalTableDSL.g:8719:1: ( ( rule__TableIntLookup__LookupValueAssignment_2 ) )
+            // InternalTableDSL.g:8286:1: ( ( ( rule__TableIntLookup__LookupValueAssignment_2 ) ) )
+            // InternalTableDSL.g:8287:1: ( ( rule__TableIntLookup__LookupValueAssignment_2 ) )
             {
-            // InternalTableDSL.g:8719:1: ( ( rule__TableIntLookup__LookupValueAssignment_2 ) )
-            // InternalTableDSL.g:8720:2: ( rule__TableIntLookup__LookupValueAssignment_2 )
+            // InternalTableDSL.g:8287:1: ( ( rule__TableIntLookup__LookupValueAssignment_2 ) )
+            // InternalTableDSL.g:8288:2: ( rule__TableIntLookup__LookupValueAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntLookupAccess().getLookupValueAssignment_2()); 
             }
-            // InternalTableDSL.g:8721:2: ( rule__TableIntLookup__LookupValueAssignment_2 )
-            // InternalTableDSL.g:8721:3: rule__TableIntLookup__LookupValueAssignment_2
+            // InternalTableDSL.g:8289:2: ( rule__TableIntLookup__LookupValueAssignment_2 )
+            // InternalTableDSL.g:8289:3: rule__TableIntLookup__LookupValueAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TableIntLookup__LookupValueAssignment_2();
@@ -30396,14 +29057,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntLookup__Group__3"
-    // InternalTableDSL.g:8729:1: rule__TableIntLookup__Group__3 : rule__TableIntLookup__Group__3__Impl ;
+    // InternalTableDSL.g:8297:1: rule__TableIntLookup__Group__3 : rule__TableIntLookup__Group__3__Impl ;
     public final void rule__TableIntLookup__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8733:1: ( rule__TableIntLookup__Group__3__Impl )
-            // InternalTableDSL.g:8734:2: rule__TableIntLookup__Group__3__Impl
+            // InternalTableDSL.g:8301:1: ( rule__TableIntLookup__Group__3__Impl )
+            // InternalTableDSL.g:8302:2: rule__TableIntLookup__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableIntLookup__Group__3__Impl();
@@ -30429,23 +29090,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntLookup__Group__3__Impl"
-    // InternalTableDSL.g:8740:1: rule__TableIntLookup__Group__3__Impl : ( ( rule__TableIntLookup__DiscreteAssignment_3 ) ) ;
+    // InternalTableDSL.g:8308:1: rule__TableIntLookup__Group__3__Impl : ( ( rule__TableIntLookup__DiscreteAssignment_3 ) ) ;
     public final void rule__TableIntLookup__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8744:1: ( ( ( rule__TableIntLookup__DiscreteAssignment_3 ) ) )
-            // InternalTableDSL.g:8745:1: ( ( rule__TableIntLookup__DiscreteAssignment_3 ) )
+            // InternalTableDSL.g:8312:1: ( ( ( rule__TableIntLookup__DiscreteAssignment_3 ) ) )
+            // InternalTableDSL.g:8313:1: ( ( rule__TableIntLookup__DiscreteAssignment_3 ) )
             {
-            // InternalTableDSL.g:8745:1: ( ( rule__TableIntLookup__DiscreteAssignment_3 ) )
-            // InternalTableDSL.g:8746:2: ( rule__TableIntLookup__DiscreteAssignment_3 )
+            // InternalTableDSL.g:8313:1: ( ( rule__TableIntLookup__DiscreteAssignment_3 ) )
+            // InternalTableDSL.g:8314:2: ( rule__TableIntLookup__DiscreteAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntLookupAccess().getDiscreteAssignment_3()); 
             }
-            // InternalTableDSL.g:8747:2: ( rule__TableIntLookup__DiscreteAssignment_3 )
-            // InternalTableDSL.g:8747:3: rule__TableIntLookup__DiscreteAssignment_3
+            // InternalTableDSL.g:8315:2: ( rule__TableIntLookup__DiscreteAssignment_3 )
+            // InternalTableDSL.g:8315:3: rule__TableIntLookup__DiscreteAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__TableIntLookup__DiscreteAssignment_3();
@@ -30480,16 +29141,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberLookup__Group__0"
-    // InternalTableDSL.g:8756:1: rule__TableNumberLookup__Group__0 : rule__TableNumberLookup__Group__0__Impl rule__TableNumberLookup__Group__1 ;
+    // InternalTableDSL.g:8324:1: rule__TableNumberLookup__Group__0 : rule__TableNumberLookup__Group__0__Impl rule__TableNumberLookup__Group__1 ;
     public final void rule__TableNumberLookup__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8760:1: ( rule__TableNumberLookup__Group__0__Impl rule__TableNumberLookup__Group__1 )
-            // InternalTableDSL.g:8761:2: rule__TableNumberLookup__Group__0__Impl rule__TableNumberLookup__Group__1
+            // InternalTableDSL.g:8328:1: ( rule__TableNumberLookup__Group__0__Impl rule__TableNumberLookup__Group__1 )
+            // InternalTableDSL.g:8329:2: rule__TableNumberLookup__Group__0__Impl rule__TableNumberLookup__Group__1
             {
-            pushFollow(FOLLOW_46);
+            pushFollow(FOLLOW_47);
             rule__TableNumberLookup__Group__0__Impl();
 
             state._fsp--;
@@ -30518,23 +29179,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberLookup__Group__0__Impl"
-    // InternalTableDSL.g:8768:1: rule__TableNumberLookup__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:8336:1: rule__TableNumberLookup__Group__0__Impl : ( () ) ;
     public final void rule__TableNumberLookup__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8772:1: ( ( () ) )
-            // InternalTableDSL.g:8773:1: ( () )
+            // InternalTableDSL.g:8340:1: ( ( () ) )
+            // InternalTableDSL.g:8341:1: ( () )
             {
-            // InternalTableDSL.g:8773:1: ( () )
-            // InternalTableDSL.g:8774:2: ()
+            // InternalTableDSL.g:8341:1: ( () )
+            // InternalTableDSL.g:8342:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberLookupAccess().getTableNumberLookupAction_0()); 
             }
-            // InternalTableDSL.g:8775:2: ()
-            // InternalTableDSL.g:8775:3: 
+            // InternalTableDSL.g:8343:2: ()
+            // InternalTableDSL.g:8343:3: 
             {
             }
 
@@ -30559,16 +29220,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberLookup__Group__1"
-    // InternalTableDSL.g:8783:1: rule__TableNumberLookup__Group__1 : rule__TableNumberLookup__Group__1__Impl rule__TableNumberLookup__Group__2 ;
+    // InternalTableDSL.g:8351:1: rule__TableNumberLookup__Group__1 : rule__TableNumberLookup__Group__1__Impl rule__TableNumberLookup__Group__2 ;
     public final void rule__TableNumberLookup__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8787:1: ( rule__TableNumberLookup__Group__1__Impl rule__TableNumberLookup__Group__2 )
-            // InternalTableDSL.g:8788:2: rule__TableNumberLookup__Group__1__Impl rule__TableNumberLookup__Group__2
+            // InternalTableDSL.g:8355:1: ( rule__TableNumberLookup__Group__1__Impl rule__TableNumberLookup__Group__2 )
+            // InternalTableDSL.g:8356:2: rule__TableNumberLookup__Group__1__Impl rule__TableNumberLookup__Group__2
             {
-            pushFollow(FOLLOW_40);
+            pushFollow(FOLLOW_41);
             rule__TableNumberLookup__Group__1__Impl();
 
             state._fsp--;
@@ -30597,17 +29258,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberLookup__Group__1__Impl"
-    // InternalTableDSL.g:8795:1: rule__TableNumberLookup__Group__1__Impl : ( 'number' ) ;
+    // InternalTableDSL.g:8363:1: rule__TableNumberLookup__Group__1__Impl : ( 'number' ) ;
     public final void rule__TableNumberLookup__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8799:1: ( ( 'number' ) )
-            // InternalTableDSL.g:8800:1: ( 'number' )
+            // InternalTableDSL.g:8367:1: ( ( 'number' ) )
+            // InternalTableDSL.g:8368:1: ( 'number' )
             {
-            // InternalTableDSL.g:8800:1: ( 'number' )
-            // InternalTableDSL.g:8801:2: 'number'
+            // InternalTableDSL.g:8368:1: ( 'number' )
+            // InternalTableDSL.g:8369:2: 'number'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberLookupAccess().getNumberKeyword_1()); 
@@ -30638,16 +29299,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberLookup__Group__2"
-    // InternalTableDSL.g:8810:1: rule__TableNumberLookup__Group__2 : rule__TableNumberLookup__Group__2__Impl rule__TableNumberLookup__Group__3 ;
+    // InternalTableDSL.g:8378:1: rule__TableNumberLookup__Group__2 : rule__TableNumberLookup__Group__2__Impl rule__TableNumberLookup__Group__3 ;
     public final void rule__TableNumberLookup__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8814:1: ( rule__TableNumberLookup__Group__2__Impl rule__TableNumberLookup__Group__3 )
-            // InternalTableDSL.g:8815:2: rule__TableNumberLookup__Group__2__Impl rule__TableNumberLookup__Group__3
+            // InternalTableDSL.g:8382:1: ( rule__TableNumberLookup__Group__2__Impl rule__TableNumberLookup__Group__3 )
+            // InternalTableDSL.g:8383:2: rule__TableNumberLookup__Group__2__Impl rule__TableNumberLookup__Group__3
             {
-            pushFollow(FOLLOW_41);
+            pushFollow(FOLLOW_42);
             rule__TableNumberLookup__Group__2__Impl();
 
             state._fsp--;
@@ -30676,23 +29337,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberLookup__Group__2__Impl"
-    // InternalTableDSL.g:8822:1: rule__TableNumberLookup__Group__2__Impl : ( ( rule__TableNumberLookup__LookupValueAssignment_2 ) ) ;
+    // InternalTableDSL.g:8390:1: rule__TableNumberLookup__Group__2__Impl : ( ( rule__TableNumberLookup__LookupValueAssignment_2 ) ) ;
     public final void rule__TableNumberLookup__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8826:1: ( ( ( rule__TableNumberLookup__LookupValueAssignment_2 ) ) )
-            // InternalTableDSL.g:8827:1: ( ( rule__TableNumberLookup__LookupValueAssignment_2 ) )
+            // InternalTableDSL.g:8394:1: ( ( ( rule__TableNumberLookup__LookupValueAssignment_2 ) ) )
+            // InternalTableDSL.g:8395:1: ( ( rule__TableNumberLookup__LookupValueAssignment_2 ) )
             {
-            // InternalTableDSL.g:8827:1: ( ( rule__TableNumberLookup__LookupValueAssignment_2 ) )
-            // InternalTableDSL.g:8828:2: ( rule__TableNumberLookup__LookupValueAssignment_2 )
+            // InternalTableDSL.g:8395:1: ( ( rule__TableNumberLookup__LookupValueAssignment_2 ) )
+            // InternalTableDSL.g:8396:2: ( rule__TableNumberLookup__LookupValueAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberLookupAccess().getLookupValueAssignment_2()); 
             }
-            // InternalTableDSL.g:8829:2: ( rule__TableNumberLookup__LookupValueAssignment_2 )
-            // InternalTableDSL.g:8829:3: rule__TableNumberLookup__LookupValueAssignment_2
+            // InternalTableDSL.g:8397:2: ( rule__TableNumberLookup__LookupValueAssignment_2 )
+            // InternalTableDSL.g:8397:3: rule__TableNumberLookup__LookupValueAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TableNumberLookup__LookupValueAssignment_2();
@@ -30727,14 +29388,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberLookup__Group__3"
-    // InternalTableDSL.g:8837:1: rule__TableNumberLookup__Group__3 : rule__TableNumberLookup__Group__3__Impl ;
+    // InternalTableDSL.g:8405:1: rule__TableNumberLookup__Group__3 : rule__TableNumberLookup__Group__3__Impl ;
     public final void rule__TableNumberLookup__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8841:1: ( rule__TableNumberLookup__Group__3__Impl )
-            // InternalTableDSL.g:8842:2: rule__TableNumberLookup__Group__3__Impl
+            // InternalTableDSL.g:8409:1: ( rule__TableNumberLookup__Group__3__Impl )
+            // InternalTableDSL.g:8410:2: rule__TableNumberLookup__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableNumberLookup__Group__3__Impl();
@@ -30760,23 +29421,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberLookup__Group__3__Impl"
-    // InternalTableDSL.g:8848:1: rule__TableNumberLookup__Group__3__Impl : ( ( rule__TableNumberLookup__DiscreteAssignment_3 ) ) ;
+    // InternalTableDSL.g:8416:1: rule__TableNumberLookup__Group__3__Impl : ( ( rule__TableNumberLookup__DiscreteAssignment_3 ) ) ;
     public final void rule__TableNumberLookup__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8852:1: ( ( ( rule__TableNumberLookup__DiscreteAssignment_3 ) ) )
-            // InternalTableDSL.g:8853:1: ( ( rule__TableNumberLookup__DiscreteAssignment_3 ) )
+            // InternalTableDSL.g:8420:1: ( ( ( rule__TableNumberLookup__DiscreteAssignment_3 ) ) )
+            // InternalTableDSL.g:8421:1: ( ( rule__TableNumberLookup__DiscreteAssignment_3 ) )
             {
-            // InternalTableDSL.g:8853:1: ( ( rule__TableNumberLookup__DiscreteAssignment_3 ) )
-            // InternalTableDSL.g:8854:2: ( rule__TableNumberLookup__DiscreteAssignment_3 )
+            // InternalTableDSL.g:8421:1: ( ( rule__TableNumberLookup__DiscreteAssignment_3 ) )
+            // InternalTableDSL.g:8422:2: ( rule__TableNumberLookup__DiscreteAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberLookupAccess().getDiscreteAssignment_3()); 
             }
-            // InternalTableDSL.g:8855:2: ( rule__TableNumberLookup__DiscreteAssignment_3 )
-            // InternalTableDSL.g:8855:3: rule__TableNumberLookup__DiscreteAssignment_3
+            // InternalTableDSL.g:8423:2: ( rule__TableNumberLookup__DiscreteAssignment_3 )
+            // InternalTableDSL.g:8423:3: rule__TableNumberLookup__DiscreteAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__TableNumberLookup__DiscreteAssignment_3();
@@ -30811,16 +29472,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableStringLookup__Group__0"
-    // InternalTableDSL.g:8864:1: rule__TableStringLookup__Group__0 : rule__TableStringLookup__Group__0__Impl rule__TableStringLookup__Group__1 ;
+    // InternalTableDSL.g:8432:1: rule__TableStringLookup__Group__0 : rule__TableStringLookup__Group__0__Impl rule__TableStringLookup__Group__1 ;
     public final void rule__TableStringLookup__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8868:1: ( rule__TableStringLookup__Group__0__Impl rule__TableStringLookup__Group__1 )
-            // InternalTableDSL.g:8869:2: rule__TableStringLookup__Group__0__Impl rule__TableStringLookup__Group__1
+            // InternalTableDSL.g:8436:1: ( rule__TableStringLookup__Group__0__Impl rule__TableStringLookup__Group__1 )
+            // InternalTableDSL.g:8437:2: rule__TableStringLookup__Group__0__Impl rule__TableStringLookup__Group__1
             {
-            pushFollow(FOLLOW_47);
+            pushFollow(FOLLOW_48);
             rule__TableStringLookup__Group__0__Impl();
 
             state._fsp--;
@@ -30849,23 +29510,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableStringLookup__Group__0__Impl"
-    // InternalTableDSL.g:8876:1: rule__TableStringLookup__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:8444:1: rule__TableStringLookup__Group__0__Impl : ( () ) ;
     public final void rule__TableStringLookup__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8880:1: ( ( () ) )
-            // InternalTableDSL.g:8881:1: ( () )
+            // InternalTableDSL.g:8448:1: ( ( () ) )
+            // InternalTableDSL.g:8449:1: ( () )
             {
-            // InternalTableDSL.g:8881:1: ( () )
-            // InternalTableDSL.g:8882:2: ()
+            // InternalTableDSL.g:8449:1: ( () )
+            // InternalTableDSL.g:8450:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableStringLookupAccess().getTableStringLookupAction_0()); 
             }
-            // InternalTableDSL.g:8883:2: ()
-            // InternalTableDSL.g:8883:3: 
+            // InternalTableDSL.g:8451:2: ()
+            // InternalTableDSL.g:8451:3: 
             {
             }
 
@@ -30890,14 +29551,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableStringLookup__Group__1"
-    // InternalTableDSL.g:8891:1: rule__TableStringLookup__Group__1 : rule__TableStringLookup__Group__1__Impl rule__TableStringLookup__Group__2 ;
+    // InternalTableDSL.g:8459:1: rule__TableStringLookup__Group__1 : rule__TableStringLookup__Group__1__Impl rule__TableStringLookup__Group__2 ;
     public final void rule__TableStringLookup__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8895:1: ( rule__TableStringLookup__Group__1__Impl rule__TableStringLookup__Group__2 )
-            // InternalTableDSL.g:8896:2: rule__TableStringLookup__Group__1__Impl rule__TableStringLookup__Group__2
+            // InternalTableDSL.g:8463:1: ( rule__TableStringLookup__Group__1__Impl rule__TableStringLookup__Group__2 )
+            // InternalTableDSL.g:8464:2: rule__TableStringLookup__Group__1__Impl rule__TableStringLookup__Group__2
             {
             pushFollow(FOLLOW_14);
             rule__TableStringLookup__Group__1__Impl();
@@ -30928,17 +29589,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableStringLookup__Group__1__Impl"
-    // InternalTableDSL.g:8903:1: rule__TableStringLookup__Group__1__Impl : ( 'string' ) ;
+    // InternalTableDSL.g:8471:1: rule__TableStringLookup__Group__1__Impl : ( 'string' ) ;
     public final void rule__TableStringLookup__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8907:1: ( ( 'string' ) )
-            // InternalTableDSL.g:8908:1: ( 'string' )
+            // InternalTableDSL.g:8475:1: ( ( 'string' ) )
+            // InternalTableDSL.g:8476:1: ( 'string' )
             {
-            // InternalTableDSL.g:8908:1: ( 'string' )
-            // InternalTableDSL.g:8909:2: 'string'
+            // InternalTableDSL.g:8476:1: ( 'string' )
+            // InternalTableDSL.g:8477:2: 'string'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableStringLookupAccess().getStringKeyword_1()); 
@@ -30969,16 +29630,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableStringLookup__Group__2"
-    // InternalTableDSL.g:8918:1: rule__TableStringLookup__Group__2 : rule__TableStringLookup__Group__2__Impl rule__TableStringLookup__Group__3 ;
+    // InternalTableDSL.g:8486:1: rule__TableStringLookup__Group__2 : rule__TableStringLookup__Group__2__Impl rule__TableStringLookup__Group__3 ;
     public final void rule__TableStringLookup__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8922:1: ( rule__TableStringLookup__Group__2__Impl rule__TableStringLookup__Group__3 )
-            // InternalTableDSL.g:8923:2: rule__TableStringLookup__Group__2__Impl rule__TableStringLookup__Group__3
+            // InternalTableDSL.g:8490:1: ( rule__TableStringLookup__Group__2__Impl rule__TableStringLookup__Group__3 )
+            // InternalTableDSL.g:8491:2: rule__TableStringLookup__Group__2__Impl rule__TableStringLookup__Group__3
             {
-            pushFollow(FOLLOW_41);
+            pushFollow(FOLLOW_42);
             rule__TableStringLookup__Group__2__Impl();
 
             state._fsp--;
@@ -31007,23 +29668,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableStringLookup__Group__2__Impl"
-    // InternalTableDSL.g:8930:1: rule__TableStringLookup__Group__2__Impl : ( ( rule__TableStringLookup__LookupValueAssignment_2 ) ) ;
+    // InternalTableDSL.g:8498:1: rule__TableStringLookup__Group__2__Impl : ( ( rule__TableStringLookup__LookupValueAssignment_2 ) ) ;
     public final void rule__TableStringLookup__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8934:1: ( ( ( rule__TableStringLookup__LookupValueAssignment_2 ) ) )
-            // InternalTableDSL.g:8935:1: ( ( rule__TableStringLookup__LookupValueAssignment_2 ) )
+            // InternalTableDSL.g:8502:1: ( ( ( rule__TableStringLookup__LookupValueAssignment_2 ) ) )
+            // InternalTableDSL.g:8503:1: ( ( rule__TableStringLookup__LookupValueAssignment_2 ) )
             {
-            // InternalTableDSL.g:8935:1: ( ( rule__TableStringLookup__LookupValueAssignment_2 ) )
-            // InternalTableDSL.g:8936:2: ( rule__TableStringLookup__LookupValueAssignment_2 )
+            // InternalTableDSL.g:8503:1: ( ( rule__TableStringLookup__LookupValueAssignment_2 ) )
+            // InternalTableDSL.g:8504:2: ( rule__TableStringLookup__LookupValueAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableStringLookupAccess().getLookupValueAssignment_2()); 
             }
-            // InternalTableDSL.g:8937:2: ( rule__TableStringLookup__LookupValueAssignment_2 )
-            // InternalTableDSL.g:8937:3: rule__TableStringLookup__LookupValueAssignment_2
+            // InternalTableDSL.g:8505:2: ( rule__TableStringLookup__LookupValueAssignment_2 )
+            // InternalTableDSL.g:8505:3: rule__TableStringLookup__LookupValueAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TableStringLookup__LookupValueAssignment_2();
@@ -31058,14 +29719,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableStringLookup__Group__3"
-    // InternalTableDSL.g:8945:1: rule__TableStringLookup__Group__3 : rule__TableStringLookup__Group__3__Impl ;
+    // InternalTableDSL.g:8513:1: rule__TableStringLookup__Group__3 : rule__TableStringLookup__Group__3__Impl ;
     public final void rule__TableStringLookup__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8949:1: ( rule__TableStringLookup__Group__3__Impl )
-            // InternalTableDSL.g:8950:2: rule__TableStringLookup__Group__3__Impl
+            // InternalTableDSL.g:8517:1: ( rule__TableStringLookup__Group__3__Impl )
+            // InternalTableDSL.g:8518:2: rule__TableStringLookup__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableStringLookup__Group__3__Impl();
@@ -31091,23 +29752,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableStringLookup__Group__3__Impl"
-    // InternalTableDSL.g:8956:1: rule__TableStringLookup__Group__3__Impl : ( ( rule__TableStringLookup__DiscreteAssignment_3 ) ) ;
+    // InternalTableDSL.g:8524:1: rule__TableStringLookup__Group__3__Impl : ( ( rule__TableStringLookup__DiscreteAssignment_3 ) ) ;
     public final void rule__TableStringLookup__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8960:1: ( ( ( rule__TableStringLookup__DiscreteAssignment_3 ) ) )
-            // InternalTableDSL.g:8961:1: ( ( rule__TableStringLookup__DiscreteAssignment_3 ) )
+            // InternalTableDSL.g:8528:1: ( ( ( rule__TableStringLookup__DiscreteAssignment_3 ) ) )
+            // InternalTableDSL.g:8529:1: ( ( rule__TableStringLookup__DiscreteAssignment_3 ) )
             {
-            // InternalTableDSL.g:8961:1: ( ( rule__TableStringLookup__DiscreteAssignment_3 ) )
-            // InternalTableDSL.g:8962:2: ( rule__TableStringLookup__DiscreteAssignment_3 )
+            // InternalTableDSL.g:8529:1: ( ( rule__TableStringLookup__DiscreteAssignment_3 ) )
+            // InternalTableDSL.g:8530:2: ( rule__TableStringLookup__DiscreteAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableStringLookupAccess().getDiscreteAssignment_3()); 
             }
-            // InternalTableDSL.g:8963:2: ( rule__TableStringLookup__DiscreteAssignment_3 )
-            // InternalTableDSL.g:8963:3: rule__TableStringLookup__DiscreteAssignment_3
+            // InternalTableDSL.g:8531:2: ( rule__TableStringLookup__DiscreteAssignment_3 )
+            // InternalTableDSL.g:8531:3: rule__TableStringLookup__DiscreteAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__TableStringLookup__DiscreteAssignment_3();
@@ -31142,16 +29803,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayLookup__Group__0"
-    // InternalTableDSL.g:8972:1: rule__TableDateDayLookup__Group__0 : rule__TableDateDayLookup__Group__0__Impl rule__TableDateDayLookup__Group__1 ;
+    // InternalTableDSL.g:8540:1: rule__TableDateDayLookup__Group__0 : rule__TableDateDayLookup__Group__0__Impl rule__TableDateDayLookup__Group__1 ;
     public final void rule__TableDateDayLookup__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8976:1: ( rule__TableDateDayLookup__Group__0__Impl rule__TableDateDayLookup__Group__1 )
-            // InternalTableDSL.g:8977:2: rule__TableDateDayLookup__Group__0__Impl rule__TableDateDayLookup__Group__1
+            // InternalTableDSL.g:8544:1: ( rule__TableDateDayLookup__Group__0__Impl rule__TableDateDayLookup__Group__1 )
+            // InternalTableDSL.g:8545:2: rule__TableDateDayLookup__Group__0__Impl rule__TableDateDayLookup__Group__1
             {
-            pushFollow(FOLLOW_48);
+            pushFollow(FOLLOW_49);
             rule__TableDateDayLookup__Group__0__Impl();
 
             state._fsp--;
@@ -31180,23 +29841,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayLookup__Group__0__Impl"
-    // InternalTableDSL.g:8984:1: rule__TableDateDayLookup__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:8552:1: rule__TableDateDayLookup__Group__0__Impl : ( () ) ;
     public final void rule__TableDateDayLookup__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:8988:1: ( ( () ) )
-            // InternalTableDSL.g:8989:1: ( () )
+            // InternalTableDSL.g:8556:1: ( ( () ) )
+            // InternalTableDSL.g:8557:1: ( () )
             {
-            // InternalTableDSL.g:8989:1: ( () )
-            // InternalTableDSL.g:8990:2: ()
+            // InternalTableDSL.g:8557:1: ( () )
+            // InternalTableDSL.g:8558:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayLookupAccess().getTableDateDayLookupAction_0()); 
             }
-            // InternalTableDSL.g:8991:2: ()
-            // InternalTableDSL.g:8991:3: 
+            // InternalTableDSL.g:8559:2: ()
+            // InternalTableDSL.g:8559:3: 
             {
             }
 
@@ -31221,16 +29882,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayLookup__Group__1"
-    // InternalTableDSL.g:8999:1: rule__TableDateDayLookup__Group__1 : rule__TableDateDayLookup__Group__1__Impl rule__TableDateDayLookup__Group__2 ;
+    // InternalTableDSL.g:8567:1: rule__TableDateDayLookup__Group__1 : rule__TableDateDayLookup__Group__1__Impl rule__TableDateDayLookup__Group__2 ;
     public final void rule__TableDateDayLookup__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9003:1: ( rule__TableDateDayLookup__Group__1__Impl rule__TableDateDayLookup__Group__2 )
-            // InternalTableDSL.g:9004:2: rule__TableDateDayLookup__Group__1__Impl rule__TableDateDayLookup__Group__2
+            // InternalTableDSL.g:8571:1: ( rule__TableDateDayLookup__Group__1__Impl rule__TableDateDayLookup__Group__2 )
+            // InternalTableDSL.g:8572:2: rule__TableDateDayLookup__Group__1__Impl rule__TableDateDayLookup__Group__2
             {
-            pushFollow(FOLLOW_43);
+            pushFollow(FOLLOW_44);
             rule__TableDateDayLookup__Group__1__Impl();
 
             state._fsp--;
@@ -31259,17 +29920,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayLookup__Group__1__Impl"
-    // InternalTableDSL.g:9011:1: rule__TableDateDayLookup__Group__1__Impl : ( 'daysInPast' ) ;
+    // InternalTableDSL.g:8579:1: rule__TableDateDayLookup__Group__1__Impl : ( 'daysInPast' ) ;
     public final void rule__TableDateDayLookup__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9015:1: ( ( 'daysInPast' ) )
-            // InternalTableDSL.g:9016:1: ( 'daysInPast' )
+            // InternalTableDSL.g:8583:1: ( ( 'daysInPast' ) )
+            // InternalTableDSL.g:8584:1: ( 'daysInPast' )
             {
-            // InternalTableDSL.g:9016:1: ( 'daysInPast' )
-            // InternalTableDSL.g:9017:2: 'daysInPast'
+            // InternalTableDSL.g:8584:1: ( 'daysInPast' )
+            // InternalTableDSL.g:8585:2: 'daysInPast'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayLookupAccess().getDaysInPastKeyword_1()); 
@@ -31300,16 +29961,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayLookup__Group__2"
-    // InternalTableDSL.g:9026:1: rule__TableDateDayLookup__Group__2 : rule__TableDateDayLookup__Group__2__Impl rule__TableDateDayLookup__Group__3 ;
+    // InternalTableDSL.g:8594:1: rule__TableDateDayLookup__Group__2 : rule__TableDateDayLookup__Group__2__Impl rule__TableDateDayLookup__Group__3 ;
     public final void rule__TableDateDayLookup__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9030:1: ( rule__TableDateDayLookup__Group__2__Impl rule__TableDateDayLookup__Group__3 )
-            // InternalTableDSL.g:9031:2: rule__TableDateDayLookup__Group__2__Impl rule__TableDateDayLookup__Group__3
+            // InternalTableDSL.g:8598:1: ( rule__TableDateDayLookup__Group__2__Impl rule__TableDateDayLookup__Group__3 )
+            // InternalTableDSL.g:8599:2: rule__TableDateDayLookup__Group__2__Impl rule__TableDateDayLookup__Group__3
             {
-            pushFollow(FOLLOW_41);
+            pushFollow(FOLLOW_42);
             rule__TableDateDayLookup__Group__2__Impl();
 
             state._fsp--;
@@ -31338,23 +29999,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayLookup__Group__2__Impl"
-    // InternalTableDSL.g:9038:1: rule__TableDateDayLookup__Group__2__Impl : ( ( rule__TableDateDayLookup__LookupValueAssignment_2 ) ) ;
+    // InternalTableDSL.g:8606:1: rule__TableDateDayLookup__Group__2__Impl : ( ( rule__TableDateDayLookup__LookupValueAssignment_2 ) ) ;
     public final void rule__TableDateDayLookup__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9042:1: ( ( ( rule__TableDateDayLookup__LookupValueAssignment_2 ) ) )
-            // InternalTableDSL.g:9043:1: ( ( rule__TableDateDayLookup__LookupValueAssignment_2 ) )
+            // InternalTableDSL.g:8610:1: ( ( ( rule__TableDateDayLookup__LookupValueAssignment_2 ) ) )
+            // InternalTableDSL.g:8611:1: ( ( rule__TableDateDayLookup__LookupValueAssignment_2 ) )
             {
-            // InternalTableDSL.g:9043:1: ( ( rule__TableDateDayLookup__LookupValueAssignment_2 ) )
-            // InternalTableDSL.g:9044:2: ( rule__TableDateDayLookup__LookupValueAssignment_2 )
+            // InternalTableDSL.g:8611:1: ( ( rule__TableDateDayLookup__LookupValueAssignment_2 ) )
+            // InternalTableDSL.g:8612:2: ( rule__TableDateDayLookup__LookupValueAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayLookupAccess().getLookupValueAssignment_2()); 
             }
-            // InternalTableDSL.g:9045:2: ( rule__TableDateDayLookup__LookupValueAssignment_2 )
-            // InternalTableDSL.g:9045:3: rule__TableDateDayLookup__LookupValueAssignment_2
+            // InternalTableDSL.g:8613:2: ( rule__TableDateDayLookup__LookupValueAssignment_2 )
+            // InternalTableDSL.g:8613:3: rule__TableDateDayLookup__LookupValueAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TableDateDayLookup__LookupValueAssignment_2();
@@ -31389,14 +30050,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayLookup__Group__3"
-    // InternalTableDSL.g:9053:1: rule__TableDateDayLookup__Group__3 : rule__TableDateDayLookup__Group__3__Impl ;
+    // InternalTableDSL.g:8621:1: rule__TableDateDayLookup__Group__3 : rule__TableDateDayLookup__Group__3__Impl ;
     public final void rule__TableDateDayLookup__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9057:1: ( rule__TableDateDayLookup__Group__3__Impl )
-            // InternalTableDSL.g:9058:2: rule__TableDateDayLookup__Group__3__Impl
+            // InternalTableDSL.g:8625:1: ( rule__TableDateDayLookup__Group__3__Impl )
+            // InternalTableDSL.g:8626:2: rule__TableDateDayLookup__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableDateDayLookup__Group__3__Impl();
@@ -31422,23 +30083,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayLookup__Group__3__Impl"
-    // InternalTableDSL.g:9064:1: rule__TableDateDayLookup__Group__3__Impl : ( ( rule__TableDateDayLookup__DiscreteAssignment_3 ) ) ;
+    // InternalTableDSL.g:8632:1: rule__TableDateDayLookup__Group__3__Impl : ( ( rule__TableDateDayLookup__DiscreteAssignment_3 ) ) ;
     public final void rule__TableDateDayLookup__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9068:1: ( ( ( rule__TableDateDayLookup__DiscreteAssignment_3 ) ) )
-            // InternalTableDSL.g:9069:1: ( ( rule__TableDateDayLookup__DiscreteAssignment_3 ) )
+            // InternalTableDSL.g:8636:1: ( ( ( rule__TableDateDayLookup__DiscreteAssignment_3 ) ) )
+            // InternalTableDSL.g:8637:1: ( ( rule__TableDateDayLookup__DiscreteAssignment_3 ) )
             {
-            // InternalTableDSL.g:9069:1: ( ( rule__TableDateDayLookup__DiscreteAssignment_3 ) )
-            // InternalTableDSL.g:9070:2: ( rule__TableDateDayLookup__DiscreteAssignment_3 )
+            // InternalTableDSL.g:8637:1: ( ( rule__TableDateDayLookup__DiscreteAssignment_3 ) )
+            // InternalTableDSL.g:8638:2: ( rule__TableDateDayLookup__DiscreteAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayLookupAccess().getDiscreteAssignment_3()); 
             }
-            // InternalTableDSL.g:9071:2: ( rule__TableDateDayLookup__DiscreteAssignment_3 )
-            // InternalTableDSL.g:9071:3: rule__TableDateDayLookup__DiscreteAssignment_3
+            // InternalTableDSL.g:8639:2: ( rule__TableDateDayLookup__DiscreteAssignment_3 )
+            // InternalTableDSL.g:8639:3: rule__TableDateDayLookup__DiscreteAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__TableDateDayLookup__DiscreteAssignment_3();
@@ -31473,14 +30134,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDatamart__Group__0"
-    // InternalTableDSL.g:9080:1: rule__TableDatamart__Group__0 : rule__TableDatamart__Group__0__Impl rule__TableDatamart__Group__1 ;
+    // InternalTableDSL.g:8648:1: rule__TableDatamart__Group__0 : rule__TableDatamart__Group__0__Impl rule__TableDatamart__Group__1 ;
     public final void rule__TableDatamart__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9084:1: ( rule__TableDatamart__Group__0__Impl rule__TableDatamart__Group__1 )
-            // InternalTableDSL.g:9085:2: rule__TableDatamart__Group__0__Impl rule__TableDatamart__Group__1
+            // InternalTableDSL.g:8652:1: ( rule__TableDatamart__Group__0__Impl rule__TableDatamart__Group__1 )
+            // InternalTableDSL.g:8653:2: rule__TableDatamart__Group__0__Impl rule__TableDatamart__Group__1
             {
             pushFollow(FOLLOW_7);
             rule__TableDatamart__Group__0__Impl();
@@ -31511,17 +30172,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDatamart__Group__0__Impl"
-    // InternalTableDSL.g:9092:1: rule__TableDatamart__Group__0__Impl : ( 'datamart' ) ;
+    // InternalTableDSL.g:8660:1: rule__TableDatamart__Group__0__Impl : ( 'datamart' ) ;
     public final void rule__TableDatamart__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9096:1: ( ( 'datamart' ) )
-            // InternalTableDSL.g:9097:1: ( 'datamart' )
+            // InternalTableDSL.g:8664:1: ( ( 'datamart' ) )
+            // InternalTableDSL.g:8665:1: ( 'datamart' )
             {
-            // InternalTableDSL.g:9097:1: ( 'datamart' )
-            // InternalTableDSL.g:9098:2: 'datamart'
+            // InternalTableDSL.g:8665:1: ( 'datamart' )
+            // InternalTableDSL.g:8666:2: 'datamart'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDatamartAccess().getDatamartKeyword_0()); 
@@ -31552,14 +30213,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDatamart__Group__1"
-    // InternalTableDSL.g:9107:1: rule__TableDatamart__Group__1 : rule__TableDatamart__Group__1__Impl rule__TableDatamart__Group__2 ;
+    // InternalTableDSL.g:8675:1: rule__TableDatamart__Group__1 : rule__TableDatamart__Group__1__Impl rule__TableDatamart__Group__2 ;
     public final void rule__TableDatamart__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9111:1: ( rule__TableDatamart__Group__1__Impl rule__TableDatamart__Group__2 )
-            // InternalTableDSL.g:9112:2: rule__TableDatamart__Group__1__Impl rule__TableDatamart__Group__2
+            // InternalTableDSL.g:8679:1: ( rule__TableDatamart__Group__1__Impl rule__TableDatamart__Group__2 )
+            // InternalTableDSL.g:8680:2: rule__TableDatamart__Group__1__Impl rule__TableDatamart__Group__2
             {
             pushFollow(FOLLOW_8);
             rule__TableDatamart__Group__1__Impl();
@@ -31590,23 +30251,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDatamart__Group__1__Impl"
-    // InternalTableDSL.g:9119:1: rule__TableDatamart__Group__1__Impl : ( ( rule__TableDatamart__DatamartRefAssignment_1 ) ) ;
+    // InternalTableDSL.g:8687:1: rule__TableDatamart__Group__1__Impl : ( ( rule__TableDatamart__DatamartRefAssignment_1 ) ) ;
     public final void rule__TableDatamart__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9123:1: ( ( ( rule__TableDatamart__DatamartRefAssignment_1 ) ) )
-            // InternalTableDSL.g:9124:1: ( ( rule__TableDatamart__DatamartRefAssignment_1 ) )
+            // InternalTableDSL.g:8691:1: ( ( ( rule__TableDatamart__DatamartRefAssignment_1 ) ) )
+            // InternalTableDSL.g:8692:1: ( ( rule__TableDatamart__DatamartRefAssignment_1 ) )
             {
-            // InternalTableDSL.g:9124:1: ( ( rule__TableDatamart__DatamartRefAssignment_1 ) )
-            // InternalTableDSL.g:9125:2: ( rule__TableDatamart__DatamartRefAssignment_1 )
+            // InternalTableDSL.g:8692:1: ( ( rule__TableDatamart__DatamartRefAssignment_1 ) )
+            // InternalTableDSL.g:8693:2: ( rule__TableDatamart__DatamartRefAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDatamartAccess().getDatamartRefAssignment_1()); 
             }
-            // InternalTableDSL.g:9126:2: ( rule__TableDatamart__DatamartRefAssignment_1 )
-            // InternalTableDSL.g:9126:3: rule__TableDatamart__DatamartRefAssignment_1
+            // InternalTableDSL.g:8694:2: ( rule__TableDatamart__DatamartRefAssignment_1 )
+            // InternalTableDSL.g:8694:3: rule__TableDatamart__DatamartRefAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__TableDatamart__DatamartRefAssignment_1();
@@ -31641,14 +30302,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDatamart__Group__2"
-    // InternalTableDSL.g:9134:1: rule__TableDatamart__Group__2 : rule__TableDatamart__Group__2__Impl ;
+    // InternalTableDSL.g:8702:1: rule__TableDatamart__Group__2 : rule__TableDatamart__Group__2__Impl ;
     public final void rule__TableDatamart__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9138:1: ( rule__TableDatamart__Group__2__Impl )
-            // InternalTableDSL.g:9139:2: rule__TableDatamart__Group__2__Impl
+            // InternalTableDSL.g:8706:1: ( rule__TableDatamart__Group__2__Impl )
+            // InternalTableDSL.g:8707:2: rule__TableDatamart__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableDatamart__Group__2__Impl();
@@ -31674,31 +30335,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDatamart__Group__2__Impl"
-    // InternalTableDSL.g:9145:1: rule__TableDatamart__Group__2__Impl : ( ( rule__TableDatamart__Group_2__0 )? ) ;
+    // InternalTableDSL.g:8713:1: rule__TableDatamart__Group__2__Impl : ( ( rule__TableDatamart__Group_2__0 )? ) ;
     public final void rule__TableDatamart__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9149:1: ( ( ( rule__TableDatamart__Group_2__0 )? ) )
-            // InternalTableDSL.g:9150:1: ( ( rule__TableDatamart__Group_2__0 )? )
+            // InternalTableDSL.g:8717:1: ( ( ( rule__TableDatamart__Group_2__0 )? ) )
+            // InternalTableDSL.g:8718:1: ( ( rule__TableDatamart__Group_2__0 )? )
             {
-            // InternalTableDSL.g:9150:1: ( ( rule__TableDatamart__Group_2__0 )? )
-            // InternalTableDSL.g:9151:2: ( rule__TableDatamart__Group_2__0 )?
+            // InternalTableDSL.g:8718:1: ( ( rule__TableDatamart__Group_2__0 )? )
+            // InternalTableDSL.g:8719:2: ( rule__TableDatamart__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDatamartAccess().getGroup_2()); 
             }
-            // InternalTableDSL.g:9152:2: ( rule__TableDatamart__Group_2__0 )?
-            int alt72=2;
-            int LA72_0 = input.LA(1);
+            // InternalTableDSL.g:8720:2: ( rule__TableDatamart__Group_2__0 )?
+            int alt71=2;
+            int LA71_0 = input.LA(1);
 
-            if ( (LA72_0==75) ) {
-                alt72=1;
+            if ( (LA71_0==75) ) {
+                alt71=1;
             }
-            switch (alt72) {
+            switch (alt71) {
                 case 1 :
-                    // InternalTableDSL.g:9152:3: rule__TableDatamart__Group_2__0
+                    // InternalTableDSL.g:8720:3: rule__TableDatamart__Group_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableDatamart__Group_2__0();
@@ -31736,16 +30397,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDatamart__Group_2__0"
-    // InternalTableDSL.g:9161:1: rule__TableDatamart__Group_2__0 : rule__TableDatamart__Group_2__0__Impl rule__TableDatamart__Group_2__1 ;
+    // InternalTableDSL.g:8729:1: rule__TableDatamart__Group_2__0 : rule__TableDatamart__Group_2__0__Impl rule__TableDatamart__Group_2__1 ;
     public final void rule__TableDatamart__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9165:1: ( rule__TableDatamart__Group_2__0__Impl rule__TableDatamart__Group_2__1 )
-            // InternalTableDSL.g:9166:2: rule__TableDatamart__Group_2__0__Impl rule__TableDatamart__Group_2__1
+            // InternalTableDSL.g:8733:1: ( rule__TableDatamart__Group_2__0__Impl rule__TableDatamart__Group_2__1 )
+            // InternalTableDSL.g:8734:2: rule__TableDatamart__Group_2__0__Impl rule__TableDatamart__Group_2__1
             {
-            pushFollow(FOLLOW_49);
+            pushFollow(FOLLOW_50);
             rule__TableDatamart__Group_2__0__Impl();
 
             state._fsp--;
@@ -31774,17 +30435,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDatamart__Group_2__0__Impl"
-    // InternalTableDSL.g:9173:1: rule__TableDatamart__Group_2__0__Impl : ( '{' ) ;
+    // InternalTableDSL.g:8741:1: rule__TableDatamart__Group_2__0__Impl : ( '{' ) ;
     public final void rule__TableDatamart__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9177:1: ( ( '{' ) )
-            // InternalTableDSL.g:9178:1: ( '{' )
+            // InternalTableDSL.g:8745:1: ( ( '{' ) )
+            // InternalTableDSL.g:8746:1: ( '{' )
             {
-            // InternalTableDSL.g:9178:1: ( '{' )
-            // InternalTableDSL.g:9179:2: '{'
+            // InternalTableDSL.g:8746:1: ( '{' )
+            // InternalTableDSL.g:8747:2: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDatamartAccess().getLeftCurlyBracketKeyword_2_0()); 
@@ -31815,16 +30476,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDatamart__Group_2__1"
-    // InternalTableDSL.g:9188:1: rule__TableDatamart__Group_2__1 : rule__TableDatamart__Group_2__1__Impl rule__TableDatamart__Group_2__2 ;
+    // InternalTableDSL.g:8756:1: rule__TableDatamart__Group_2__1 : rule__TableDatamart__Group_2__1__Impl rule__TableDatamart__Group_2__2 ;
     public final void rule__TableDatamart__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9192:1: ( rule__TableDatamart__Group_2__1__Impl rule__TableDatamart__Group_2__2 )
-            // InternalTableDSL.g:9193:2: rule__TableDatamart__Group_2__1__Impl rule__TableDatamart__Group_2__2
+            // InternalTableDSL.g:8760:1: ( rule__TableDatamart__Group_2__1__Impl rule__TableDatamart__Group_2__2 )
+            // InternalTableDSL.g:8761:2: rule__TableDatamart__Group_2__1__Impl rule__TableDatamart__Group_2__2
             {
-            pushFollow(FOLLOW_49);
+            pushFollow(FOLLOW_50);
             rule__TableDatamart__Group_2__1__Impl();
 
             state._fsp--;
@@ -31853,37 +30514,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDatamart__Group_2__1__Impl"
-    // InternalTableDSL.g:9200:1: rule__TableDatamart__Group_2__1__Impl : ( ( rule__TableDatamart__ElementsAssignment_2_1 )* ) ;
+    // InternalTableDSL.g:8768:1: rule__TableDatamart__Group_2__1__Impl : ( ( rule__TableDatamart__ElementsAssignment_2_1 )* ) ;
     public final void rule__TableDatamart__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9204:1: ( ( ( rule__TableDatamart__ElementsAssignment_2_1 )* ) )
-            // InternalTableDSL.g:9205:1: ( ( rule__TableDatamart__ElementsAssignment_2_1 )* )
+            // InternalTableDSL.g:8772:1: ( ( ( rule__TableDatamart__ElementsAssignment_2_1 )* ) )
+            // InternalTableDSL.g:8773:1: ( ( rule__TableDatamart__ElementsAssignment_2_1 )* )
             {
-            // InternalTableDSL.g:9205:1: ( ( rule__TableDatamart__ElementsAssignment_2_1 )* )
-            // InternalTableDSL.g:9206:2: ( rule__TableDatamart__ElementsAssignment_2_1 )*
+            // InternalTableDSL.g:8773:1: ( ( rule__TableDatamart__ElementsAssignment_2_1 )* )
+            // InternalTableDSL.g:8774:2: ( rule__TableDatamart__ElementsAssignment_2_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDatamartAccess().getElementsAssignment_2_1()); 
             }
-            // InternalTableDSL.g:9207:2: ( rule__TableDatamart__ElementsAssignment_2_1 )*
-            loop73:
+            // InternalTableDSL.g:8775:2: ( rule__TableDatamart__ElementsAssignment_2_1 )*
+            loop72:
             do {
-                int alt73=2;
-                int LA73_0 = input.LA(1);
+                int alt72=2;
+                int LA72_0 = input.LA(1);
 
-                if ( (LA73_0==108) ) {
-                    alt73=1;
+                if ( (LA72_0==108) ) {
+                    alt72=1;
                 }
 
 
-                switch (alt73) {
+                switch (alt72) {
             	case 1 :
-            	    // InternalTableDSL.g:9207:3: rule__TableDatamart__ElementsAssignment_2_1
+            	    // InternalTableDSL.g:8775:3: rule__TableDatamart__ElementsAssignment_2_1
             	    {
-            	    pushFollow(FOLLOW_50);
+            	    pushFollow(FOLLOW_51);
             	    rule__TableDatamart__ElementsAssignment_2_1();
 
             	    state._fsp--;
@@ -31893,7 +30554,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop73;
+            	    break loop72;
                 }
             } while (true);
 
@@ -31922,14 +30583,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDatamart__Group_2__2"
-    // InternalTableDSL.g:9215:1: rule__TableDatamart__Group_2__2 : rule__TableDatamart__Group_2__2__Impl ;
+    // InternalTableDSL.g:8783:1: rule__TableDatamart__Group_2__2 : rule__TableDatamart__Group_2__2__Impl ;
     public final void rule__TableDatamart__Group_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9219:1: ( rule__TableDatamart__Group_2__2__Impl )
-            // InternalTableDSL.g:9220:2: rule__TableDatamart__Group_2__2__Impl
+            // InternalTableDSL.g:8787:1: ( rule__TableDatamart__Group_2__2__Impl )
+            // InternalTableDSL.g:8788:2: rule__TableDatamart__Group_2__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableDatamart__Group_2__2__Impl();
@@ -31955,17 +30616,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDatamart__Group_2__2__Impl"
-    // InternalTableDSL.g:9226:1: rule__TableDatamart__Group_2__2__Impl : ( '}' ) ;
+    // InternalTableDSL.g:8794:1: rule__TableDatamart__Group_2__2__Impl : ( '}' ) ;
     public final void rule__TableDatamart__Group_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9230:1: ( ( '}' ) )
-            // InternalTableDSL.g:9231:1: ( '}' )
+            // InternalTableDSL.g:8798:1: ( ( '}' ) )
+            // InternalTableDSL.g:8799:1: ( '}' )
             {
-            // InternalTableDSL.g:9231:1: ( '}' )
-            // InternalTableDSL.g:9232:2: '}'
+            // InternalTableDSL.g:8799:1: ( '}' )
+            // InternalTableDSL.g:8800:2: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDatamartAccess().getRightCurlyBracketKeyword_2_2()); 
@@ -31996,16 +30657,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group__0"
-    // InternalTableDSL.g:9242:1: rule__TableAxis__Group__0 : rule__TableAxis__Group__0__Impl rule__TableAxis__Group__1 ;
+    // InternalTableDSL.g:8810:1: rule__TableAxis__Group__0 : rule__TableAxis__Group__0__Impl rule__TableAxis__Group__1 ;
     public final void rule__TableAxis__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9246:1: ( rule__TableAxis__Group__0__Impl rule__TableAxis__Group__1 )
-            // InternalTableDSL.g:9247:2: rule__TableAxis__Group__0__Impl rule__TableAxis__Group__1
+            // InternalTableDSL.g:8814:1: ( rule__TableAxis__Group__0__Impl rule__TableAxis__Group__1 )
+            // InternalTableDSL.g:8815:2: rule__TableAxis__Group__0__Impl rule__TableAxis__Group__1
             {
-            pushFollow(FOLLOW_51);
+            pushFollow(FOLLOW_52);
             rule__TableAxis__Group__0__Impl();
 
             state._fsp--;
@@ -32034,17 +30695,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group__0__Impl"
-    // InternalTableDSL.g:9254:1: rule__TableAxis__Group__0__Impl : ( 'axis' ) ;
+    // InternalTableDSL.g:8822:1: rule__TableAxis__Group__0__Impl : ( 'axis' ) ;
     public final void rule__TableAxis__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9258:1: ( ( 'axis' ) )
-            // InternalTableDSL.g:9259:1: ( 'axis' )
+            // InternalTableDSL.g:8826:1: ( ( 'axis' ) )
+            // InternalTableDSL.g:8827:1: ( 'axis' )
             {
-            // InternalTableDSL.g:9259:1: ( 'axis' )
-            // InternalTableDSL.g:9260:2: 'axis'
+            // InternalTableDSL.g:8827:1: ( 'axis' )
+            // InternalTableDSL.g:8828:2: 'axis'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getAxisKeyword_0()); 
@@ -32075,16 +30736,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group__1"
-    // InternalTableDSL.g:9269:1: rule__TableAxis__Group__1 : rule__TableAxis__Group__1__Impl rule__TableAxis__Group__2 ;
+    // InternalTableDSL.g:8837:1: rule__TableAxis__Group__1 : rule__TableAxis__Group__1__Impl rule__TableAxis__Group__2 ;
     public final void rule__TableAxis__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9273:1: ( rule__TableAxis__Group__1__Impl rule__TableAxis__Group__2 )
-            // InternalTableDSL.g:9274:2: rule__TableAxis__Group__1__Impl rule__TableAxis__Group__2
+            // InternalTableDSL.g:8841:1: ( rule__TableAxis__Group__1__Impl rule__TableAxis__Group__2 )
+            // InternalTableDSL.g:8842:2: rule__TableAxis__Group__1__Impl rule__TableAxis__Group__2
             {
-            pushFollow(FOLLOW_52);
+            pushFollow(FOLLOW_53);
             rule__TableAxis__Group__1__Impl();
 
             state._fsp--;
@@ -32113,23 +30774,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group__1__Impl"
-    // InternalTableDSL.g:9281:1: rule__TableAxis__Group__1__Impl : ( ( rule__TableAxis__AxisAssignment_1 ) ) ;
+    // InternalTableDSL.g:8849:1: rule__TableAxis__Group__1__Impl : ( ( rule__TableAxis__AxisAssignment_1 ) ) ;
     public final void rule__TableAxis__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9285:1: ( ( ( rule__TableAxis__AxisAssignment_1 ) ) )
-            // InternalTableDSL.g:9286:1: ( ( rule__TableAxis__AxisAssignment_1 ) )
+            // InternalTableDSL.g:8853:1: ( ( ( rule__TableAxis__AxisAssignment_1 ) ) )
+            // InternalTableDSL.g:8854:1: ( ( rule__TableAxis__AxisAssignment_1 ) )
             {
-            // InternalTableDSL.g:9286:1: ( ( rule__TableAxis__AxisAssignment_1 ) )
-            // InternalTableDSL.g:9287:2: ( rule__TableAxis__AxisAssignment_1 )
+            // InternalTableDSL.g:8854:1: ( ( rule__TableAxis__AxisAssignment_1 ) )
+            // InternalTableDSL.g:8855:2: ( rule__TableAxis__AxisAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getAxisAssignment_1()); 
             }
-            // InternalTableDSL.g:9288:2: ( rule__TableAxis__AxisAssignment_1 )
-            // InternalTableDSL.g:9288:3: rule__TableAxis__AxisAssignment_1
+            // InternalTableDSL.g:8856:2: ( rule__TableAxis__AxisAssignment_1 )
+            // InternalTableDSL.g:8856:3: rule__TableAxis__AxisAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__TableAxis__AxisAssignment_1();
@@ -32164,16 +30825,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group__2"
-    // InternalTableDSL.g:9296:1: rule__TableAxis__Group__2 : rule__TableAxis__Group__2__Impl rule__TableAxis__Group__3 ;
+    // InternalTableDSL.g:8864:1: rule__TableAxis__Group__2 : rule__TableAxis__Group__2__Impl rule__TableAxis__Group__3 ;
     public final void rule__TableAxis__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9300:1: ( rule__TableAxis__Group__2__Impl rule__TableAxis__Group__3 )
-            // InternalTableDSL.g:9301:2: rule__TableAxis__Group__2__Impl rule__TableAxis__Group__3
+            // InternalTableDSL.g:8868:1: ( rule__TableAxis__Group__2__Impl rule__TableAxis__Group__3 )
+            // InternalTableDSL.g:8869:2: rule__TableAxis__Group__2__Impl rule__TableAxis__Group__3
             {
-            pushFollow(FOLLOW_53);
+            pushFollow(FOLLOW_54);
             rule__TableAxis__Group__2__Impl();
 
             state._fsp--;
@@ -32202,23 +30863,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group__2__Impl"
-    // InternalTableDSL.g:9308:1: rule__TableAxis__Group__2__Impl : ( ( rule__TableAxis__UnorderedGroup_2 ) ) ;
+    // InternalTableDSL.g:8876:1: rule__TableAxis__Group__2__Impl : ( ( rule__TableAxis__UnorderedGroup_2 ) ) ;
     public final void rule__TableAxis__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9312:1: ( ( ( rule__TableAxis__UnorderedGroup_2 ) ) )
-            // InternalTableDSL.g:9313:1: ( ( rule__TableAxis__UnorderedGroup_2 ) )
+            // InternalTableDSL.g:8880:1: ( ( ( rule__TableAxis__UnorderedGroup_2 ) ) )
+            // InternalTableDSL.g:8881:1: ( ( rule__TableAxis__UnorderedGroup_2 ) )
             {
-            // InternalTableDSL.g:9313:1: ( ( rule__TableAxis__UnorderedGroup_2 ) )
-            // InternalTableDSL.g:9314:2: ( rule__TableAxis__UnorderedGroup_2 )
+            // InternalTableDSL.g:8881:1: ( ( rule__TableAxis__UnorderedGroup_2 ) )
+            // InternalTableDSL.g:8882:2: ( rule__TableAxis__UnorderedGroup_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getUnorderedGroup_2()); 
             }
-            // InternalTableDSL.g:9315:2: ( rule__TableAxis__UnorderedGroup_2 )
-            // InternalTableDSL.g:9315:3: rule__TableAxis__UnorderedGroup_2
+            // InternalTableDSL.g:8883:2: ( rule__TableAxis__UnorderedGroup_2 )
+            // InternalTableDSL.g:8883:3: rule__TableAxis__UnorderedGroup_2
             {
             pushFollow(FOLLOW_2);
             rule__TableAxis__UnorderedGroup_2();
@@ -32253,16 +30914,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group__3"
-    // InternalTableDSL.g:9323:1: rule__TableAxis__Group__3 : rule__TableAxis__Group__3__Impl rule__TableAxis__Group__4 ;
+    // InternalTableDSL.g:8891:1: rule__TableAxis__Group__3 : rule__TableAxis__Group__3__Impl rule__TableAxis__Group__4 ;
     public final void rule__TableAxis__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9327:1: ( rule__TableAxis__Group__3__Impl rule__TableAxis__Group__4 )
-            // InternalTableDSL.g:9328:2: rule__TableAxis__Group__3__Impl rule__TableAxis__Group__4
+            // InternalTableDSL.g:8895:1: ( rule__TableAxis__Group__3__Impl rule__TableAxis__Group__4 )
+            // InternalTableDSL.g:8896:2: rule__TableAxis__Group__3__Impl rule__TableAxis__Group__4
             {
-            pushFollow(FOLLOW_53);
+            pushFollow(FOLLOW_54);
             rule__TableAxis__Group__3__Impl();
 
             state._fsp--;
@@ -32291,31 +30952,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group__3__Impl"
-    // InternalTableDSL.g:9335:1: rule__TableAxis__Group__3__Impl : ( ( rule__TableAxis__Group_3__0 )? ) ;
+    // InternalTableDSL.g:8903:1: rule__TableAxis__Group__3__Impl : ( ( rule__TableAxis__Group_3__0 )? ) ;
     public final void rule__TableAxis__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9339:1: ( ( ( rule__TableAxis__Group_3__0 )? ) )
-            // InternalTableDSL.g:9340:1: ( ( rule__TableAxis__Group_3__0 )? )
+            // InternalTableDSL.g:8907:1: ( ( ( rule__TableAxis__Group_3__0 )? ) )
+            // InternalTableDSL.g:8908:1: ( ( rule__TableAxis__Group_3__0 )? )
             {
-            // InternalTableDSL.g:9340:1: ( ( rule__TableAxis__Group_3__0 )? )
-            // InternalTableDSL.g:9341:2: ( rule__TableAxis__Group_3__0 )?
+            // InternalTableDSL.g:8908:1: ( ( rule__TableAxis__Group_3__0 )? )
+            // InternalTableDSL.g:8909:2: ( rule__TableAxis__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getGroup_3()); 
             }
-            // InternalTableDSL.g:9342:2: ( rule__TableAxis__Group_3__0 )?
-            int alt74=2;
-            int LA74_0 = input.LA(1);
+            // InternalTableDSL.g:8910:2: ( rule__TableAxis__Group_3__0 )?
+            int alt73=2;
+            int LA73_0 = input.LA(1);
 
-            if ( (LA74_0==175) ) {
-                alt74=1;
+            if ( (LA73_0==174) ) {
+                alt73=1;
             }
-            switch (alt74) {
+            switch (alt73) {
                 case 1 :
-                    // InternalTableDSL.g:9342:3: rule__TableAxis__Group_3__0
+                    // InternalTableDSL.g:8910:3: rule__TableAxis__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableAxis__Group_3__0();
@@ -32353,14 +31014,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group__4"
-    // InternalTableDSL.g:9350:1: rule__TableAxis__Group__4 : rule__TableAxis__Group__4__Impl ;
+    // InternalTableDSL.g:8918:1: rule__TableAxis__Group__4 : rule__TableAxis__Group__4__Impl ;
     public final void rule__TableAxis__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9354:1: ( rule__TableAxis__Group__4__Impl )
-            // InternalTableDSL.g:9355:2: rule__TableAxis__Group__4__Impl
+            // InternalTableDSL.g:8922:1: ( rule__TableAxis__Group__4__Impl )
+            // InternalTableDSL.g:8923:2: rule__TableAxis__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableAxis__Group__4__Impl();
@@ -32386,31 +31047,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group__4__Impl"
-    // InternalTableDSL.g:9361:1: rule__TableAxis__Group__4__Impl : ( ( rule__TableAxis__Group_4__0 )? ) ;
+    // InternalTableDSL.g:8929:1: rule__TableAxis__Group__4__Impl : ( ( rule__TableAxis__Group_4__0 )? ) ;
     public final void rule__TableAxis__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9365:1: ( ( ( rule__TableAxis__Group_4__0 )? ) )
-            // InternalTableDSL.g:9366:1: ( ( rule__TableAxis__Group_4__0 )? )
+            // InternalTableDSL.g:8933:1: ( ( ( rule__TableAxis__Group_4__0 )? ) )
+            // InternalTableDSL.g:8934:1: ( ( rule__TableAxis__Group_4__0 )? )
             {
-            // InternalTableDSL.g:9366:1: ( ( rule__TableAxis__Group_4__0 )? )
-            // InternalTableDSL.g:9367:2: ( rule__TableAxis__Group_4__0 )?
+            // InternalTableDSL.g:8934:1: ( ( rule__TableAxis__Group_4__0 )? )
+            // InternalTableDSL.g:8935:2: ( rule__TableAxis__Group_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getGroup_4()); 
             }
-            // InternalTableDSL.g:9368:2: ( rule__TableAxis__Group_4__0 )?
-            int alt75=2;
-            int LA75_0 = input.LA(1);
+            // InternalTableDSL.g:8936:2: ( rule__TableAxis__Group_4__0 )?
+            int alt74=2;
+            int LA74_0 = input.LA(1);
 
-            if ( (LA75_0==176) ) {
-                alt75=1;
+            if ( (LA74_0==175) ) {
+                alt74=1;
             }
-            switch (alt75) {
+            switch (alt74) {
                 case 1 :
-                    // InternalTableDSL.g:9368:3: rule__TableAxis__Group_4__0
+                    // InternalTableDSL.g:8936:3: rule__TableAxis__Group_4__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableAxis__Group_4__0();
@@ -32448,16 +31109,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_2_0__0"
-    // InternalTableDSL.g:9377:1: rule__TableAxis__Group_2_0__0 : rule__TableAxis__Group_2_0__0__Impl rule__TableAxis__Group_2_0__1 ;
+    // InternalTableDSL.g:8945:1: rule__TableAxis__Group_2_0__0 : rule__TableAxis__Group_2_0__0__Impl rule__TableAxis__Group_2_0__1 ;
     public final void rule__TableAxis__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9381:1: ( rule__TableAxis__Group_2_0__0__Impl rule__TableAxis__Group_2_0__1 )
-            // InternalTableDSL.g:9382:2: rule__TableAxis__Group_2_0__0__Impl rule__TableAxis__Group_2_0__1
+            // InternalTableDSL.g:8949:1: ( rule__TableAxis__Group_2_0__0__Impl rule__TableAxis__Group_2_0__1 )
+            // InternalTableDSL.g:8950:2: rule__TableAxis__Group_2_0__0__Impl rule__TableAxis__Group_2_0__1
             {
-            pushFollow(FOLLOW_20);
+            pushFollow(FOLLOW_38);
             rule__TableAxis__Group_2_0__0__Impl();
 
             state._fsp--;
@@ -32486,23 +31147,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_2_0__0__Impl"
-    // InternalTableDSL.g:9389:1: rule__TableAxis__Group_2_0__0__Impl : ( ( rule__TableAxis__HasRowHeightAssignment_2_0_0 ) ) ;
+    // InternalTableDSL.g:8957:1: rule__TableAxis__Group_2_0__0__Impl : ( ( rule__TableAxis__HasRowHeightAssignment_2_0_0 ) ) ;
     public final void rule__TableAxis__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9393:1: ( ( ( rule__TableAxis__HasRowHeightAssignment_2_0_0 ) ) )
-            // InternalTableDSL.g:9394:1: ( ( rule__TableAxis__HasRowHeightAssignment_2_0_0 ) )
+            // InternalTableDSL.g:8961:1: ( ( ( rule__TableAxis__HasRowHeightAssignment_2_0_0 ) ) )
+            // InternalTableDSL.g:8962:1: ( ( rule__TableAxis__HasRowHeightAssignment_2_0_0 ) )
             {
-            // InternalTableDSL.g:9394:1: ( ( rule__TableAxis__HasRowHeightAssignment_2_0_0 ) )
-            // InternalTableDSL.g:9395:2: ( rule__TableAxis__HasRowHeightAssignment_2_0_0 )
+            // InternalTableDSL.g:8962:1: ( ( rule__TableAxis__HasRowHeightAssignment_2_0_0 ) )
+            // InternalTableDSL.g:8963:2: ( rule__TableAxis__HasRowHeightAssignment_2_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getHasRowHeightAssignment_2_0_0()); 
             }
-            // InternalTableDSL.g:9396:2: ( rule__TableAxis__HasRowHeightAssignment_2_0_0 )
-            // InternalTableDSL.g:9396:3: rule__TableAxis__HasRowHeightAssignment_2_0_0
+            // InternalTableDSL.g:8964:2: ( rule__TableAxis__HasRowHeightAssignment_2_0_0 )
+            // InternalTableDSL.g:8964:3: rule__TableAxis__HasRowHeightAssignment_2_0_0
             {
             pushFollow(FOLLOW_2);
             rule__TableAxis__HasRowHeightAssignment_2_0_0();
@@ -32537,14 +31198,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_2_0__1"
-    // InternalTableDSL.g:9404:1: rule__TableAxis__Group_2_0__1 : rule__TableAxis__Group_2_0__1__Impl ;
+    // InternalTableDSL.g:8972:1: rule__TableAxis__Group_2_0__1 : rule__TableAxis__Group_2_0__1__Impl ;
     public final void rule__TableAxis__Group_2_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9408:1: ( rule__TableAxis__Group_2_0__1__Impl )
-            // InternalTableDSL.g:9409:2: rule__TableAxis__Group_2_0__1__Impl
+            // InternalTableDSL.g:8976:1: ( rule__TableAxis__Group_2_0__1__Impl )
+            // InternalTableDSL.g:8977:2: rule__TableAxis__Group_2_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableAxis__Group_2_0__1__Impl();
@@ -32570,23 +31231,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_2_0__1__Impl"
-    // InternalTableDSL.g:9415:1: rule__TableAxis__Group_2_0__1__Impl : ( ( rule__TableAxis__RowHeightAssignment_2_0_1 ) ) ;
+    // InternalTableDSL.g:8983:1: rule__TableAxis__Group_2_0__1__Impl : ( ( rule__TableAxis__RowHeightAssignment_2_0_1 ) ) ;
     public final void rule__TableAxis__Group_2_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9419:1: ( ( ( rule__TableAxis__RowHeightAssignment_2_0_1 ) ) )
-            // InternalTableDSL.g:9420:1: ( ( rule__TableAxis__RowHeightAssignment_2_0_1 ) )
+            // InternalTableDSL.g:8987:1: ( ( ( rule__TableAxis__RowHeightAssignment_2_0_1 ) ) )
+            // InternalTableDSL.g:8988:1: ( ( rule__TableAxis__RowHeightAssignment_2_0_1 ) )
             {
-            // InternalTableDSL.g:9420:1: ( ( rule__TableAxis__RowHeightAssignment_2_0_1 ) )
-            // InternalTableDSL.g:9421:2: ( rule__TableAxis__RowHeightAssignment_2_0_1 )
+            // InternalTableDSL.g:8988:1: ( ( rule__TableAxis__RowHeightAssignment_2_0_1 ) )
+            // InternalTableDSL.g:8989:2: ( rule__TableAxis__RowHeightAssignment_2_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getRowHeightAssignment_2_0_1()); 
             }
-            // InternalTableDSL.g:9422:2: ( rule__TableAxis__RowHeightAssignment_2_0_1 )
-            // InternalTableDSL.g:9422:3: rule__TableAxis__RowHeightAssignment_2_0_1
+            // InternalTableDSL.g:8990:2: ( rule__TableAxis__RowHeightAssignment_2_0_1 )
+            // InternalTableDSL.g:8990:3: rule__TableAxis__RowHeightAssignment_2_0_1
             {
             pushFollow(FOLLOW_2);
             rule__TableAxis__RowHeightAssignment_2_0_1();
@@ -32621,14 +31282,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_3__0"
-    // InternalTableDSL.g:9431:1: rule__TableAxis__Group_3__0 : rule__TableAxis__Group_3__0__Impl rule__TableAxis__Group_3__1 ;
+    // InternalTableDSL.g:8999:1: rule__TableAxis__Group_3__0 : rule__TableAxis__Group_3__0__Impl rule__TableAxis__Group_3__1 ;
     public final void rule__TableAxis__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9435:1: ( rule__TableAxis__Group_3__0__Impl rule__TableAxis__Group_3__1 )
-            // InternalTableDSL.g:9436:2: rule__TableAxis__Group_3__0__Impl rule__TableAxis__Group_3__1
+            // InternalTableDSL.g:9003:1: ( rule__TableAxis__Group_3__0__Impl rule__TableAxis__Group_3__1 )
+            // InternalTableDSL.g:9004:2: rule__TableAxis__Group_3__0__Impl rule__TableAxis__Group_3__1
             {
             pushFollow(FOLLOW_8);
             rule__TableAxis__Group_3__0__Impl();
@@ -32659,23 +31320,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_3__0__Impl"
-    // InternalTableDSL.g:9443:1: rule__TableAxis__Group_3__0__Impl : ( ( rule__TableAxis__HasDetailsAssignment_3_0 ) ) ;
+    // InternalTableDSL.g:9011:1: rule__TableAxis__Group_3__0__Impl : ( ( rule__TableAxis__HasDetailsAssignment_3_0 ) ) ;
     public final void rule__TableAxis__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9447:1: ( ( ( rule__TableAxis__HasDetailsAssignment_3_0 ) ) )
-            // InternalTableDSL.g:9448:1: ( ( rule__TableAxis__HasDetailsAssignment_3_0 ) )
+            // InternalTableDSL.g:9015:1: ( ( ( rule__TableAxis__HasDetailsAssignment_3_0 ) ) )
+            // InternalTableDSL.g:9016:1: ( ( rule__TableAxis__HasDetailsAssignment_3_0 ) )
             {
-            // InternalTableDSL.g:9448:1: ( ( rule__TableAxis__HasDetailsAssignment_3_0 ) )
-            // InternalTableDSL.g:9449:2: ( rule__TableAxis__HasDetailsAssignment_3_0 )
+            // InternalTableDSL.g:9016:1: ( ( rule__TableAxis__HasDetailsAssignment_3_0 ) )
+            // InternalTableDSL.g:9017:2: ( rule__TableAxis__HasDetailsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getHasDetailsAssignment_3_0()); 
             }
-            // InternalTableDSL.g:9450:2: ( rule__TableAxis__HasDetailsAssignment_3_0 )
-            // InternalTableDSL.g:9450:3: rule__TableAxis__HasDetailsAssignment_3_0
+            // InternalTableDSL.g:9018:2: ( rule__TableAxis__HasDetailsAssignment_3_0 )
+            // InternalTableDSL.g:9018:3: rule__TableAxis__HasDetailsAssignment_3_0
             {
             pushFollow(FOLLOW_2);
             rule__TableAxis__HasDetailsAssignment_3_0();
@@ -32710,16 +31371,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_3__1"
-    // InternalTableDSL.g:9458:1: rule__TableAxis__Group_3__1 : rule__TableAxis__Group_3__1__Impl rule__TableAxis__Group_3__2 ;
+    // InternalTableDSL.g:9026:1: rule__TableAxis__Group_3__1 : rule__TableAxis__Group_3__1__Impl rule__TableAxis__Group_3__2 ;
     public final void rule__TableAxis__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9462:1: ( rule__TableAxis__Group_3__1__Impl rule__TableAxis__Group_3__2 )
-            // InternalTableDSL.g:9463:2: rule__TableAxis__Group_3__1__Impl rule__TableAxis__Group_3__2
+            // InternalTableDSL.g:9030:1: ( rule__TableAxis__Group_3__1__Impl rule__TableAxis__Group_3__2 )
+            // InternalTableDSL.g:9031:2: rule__TableAxis__Group_3__1__Impl rule__TableAxis__Group_3__2
             {
-            pushFollow(FOLLOW_54);
+            pushFollow(FOLLOW_55);
             rule__TableAxis__Group_3__1__Impl();
 
             state._fsp--;
@@ -32748,17 +31409,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_3__1__Impl"
-    // InternalTableDSL.g:9470:1: rule__TableAxis__Group_3__1__Impl : ( '{' ) ;
+    // InternalTableDSL.g:9038:1: rule__TableAxis__Group_3__1__Impl : ( '{' ) ;
     public final void rule__TableAxis__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9474:1: ( ( '{' ) )
-            // InternalTableDSL.g:9475:1: ( '{' )
+            // InternalTableDSL.g:9042:1: ( ( '{' ) )
+            // InternalTableDSL.g:9043:1: ( '{' )
             {
-            // InternalTableDSL.g:9475:1: ( '{' )
-            // InternalTableDSL.g:9476:2: '{'
+            // InternalTableDSL.g:9043:1: ( '{' )
+            // InternalTableDSL.g:9044:2: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getLeftCurlyBracketKeyword_3_1()); 
@@ -32789,16 +31450,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_3__2"
-    // InternalTableDSL.g:9485:1: rule__TableAxis__Group_3__2 : rule__TableAxis__Group_3__2__Impl rule__TableAxis__Group_3__3 ;
+    // InternalTableDSL.g:9053:1: rule__TableAxis__Group_3__2 : rule__TableAxis__Group_3__2__Impl rule__TableAxis__Group_3__3 ;
     public final void rule__TableAxis__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9489:1: ( rule__TableAxis__Group_3__2__Impl rule__TableAxis__Group_3__3 )
-            // InternalTableDSL.g:9490:2: rule__TableAxis__Group_3__2__Impl rule__TableAxis__Group_3__3
+            // InternalTableDSL.g:9057:1: ( rule__TableAxis__Group_3__2__Impl rule__TableAxis__Group_3__3 )
+            // InternalTableDSL.g:9058:2: rule__TableAxis__Group_3__2__Impl rule__TableAxis__Group_3__3
             {
-            pushFollow(FOLLOW_54);
+            pushFollow(FOLLOW_55);
             rule__TableAxis__Group_3__2__Impl();
 
             state._fsp--;
@@ -32827,37 +31488,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_3__2__Impl"
-    // InternalTableDSL.g:9497:1: rule__TableAxis__Group_3__2__Impl : ( ( rule__TableAxis__ValuesAssignment_3_2 )* ) ;
+    // InternalTableDSL.g:9065:1: rule__TableAxis__Group_3__2__Impl : ( ( rule__TableAxis__ValuesAssignment_3_2 )* ) ;
     public final void rule__TableAxis__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9501:1: ( ( ( rule__TableAxis__ValuesAssignment_3_2 )* ) )
-            // InternalTableDSL.g:9502:1: ( ( rule__TableAxis__ValuesAssignment_3_2 )* )
+            // InternalTableDSL.g:9069:1: ( ( ( rule__TableAxis__ValuesAssignment_3_2 )* ) )
+            // InternalTableDSL.g:9070:1: ( ( rule__TableAxis__ValuesAssignment_3_2 )* )
             {
-            // InternalTableDSL.g:9502:1: ( ( rule__TableAxis__ValuesAssignment_3_2 )* )
-            // InternalTableDSL.g:9503:2: ( rule__TableAxis__ValuesAssignment_3_2 )*
+            // InternalTableDSL.g:9070:1: ( ( rule__TableAxis__ValuesAssignment_3_2 )* )
+            // InternalTableDSL.g:9071:2: ( rule__TableAxis__ValuesAssignment_3_2 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getValuesAssignment_3_2()); 
             }
-            // InternalTableDSL.g:9504:2: ( rule__TableAxis__ValuesAssignment_3_2 )*
-            loop76:
+            // InternalTableDSL.g:9072:2: ( rule__TableAxis__ValuesAssignment_3_2 )*
+            loop75:
             do {
-                int alt76=2;
-                int LA76_0 = input.LA(1);
+                int alt75=2;
+                int LA75_0 = input.LA(1);
 
-                if ( (LA76_0==85) ) {
-                    alt76=1;
+                if ( (LA75_0==85) ) {
+                    alt75=1;
                 }
 
 
-                switch (alt76) {
+                switch (alt75) {
             	case 1 :
-            	    // InternalTableDSL.g:9504:3: rule__TableAxis__ValuesAssignment_3_2
+            	    // InternalTableDSL.g:9072:3: rule__TableAxis__ValuesAssignment_3_2
             	    {
-            	    pushFollow(FOLLOW_55);
+            	    pushFollow(FOLLOW_56);
             	    rule__TableAxis__ValuesAssignment_3_2();
 
             	    state._fsp--;
@@ -32867,7 +31528,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop76;
+            	    break loop75;
                 }
             } while (true);
 
@@ -32896,14 +31557,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_3__3"
-    // InternalTableDSL.g:9512:1: rule__TableAxis__Group_3__3 : rule__TableAxis__Group_3__3__Impl ;
+    // InternalTableDSL.g:9080:1: rule__TableAxis__Group_3__3 : rule__TableAxis__Group_3__3__Impl ;
     public final void rule__TableAxis__Group_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9516:1: ( rule__TableAxis__Group_3__3__Impl )
-            // InternalTableDSL.g:9517:2: rule__TableAxis__Group_3__3__Impl
+            // InternalTableDSL.g:9084:1: ( rule__TableAxis__Group_3__3__Impl )
+            // InternalTableDSL.g:9085:2: rule__TableAxis__Group_3__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableAxis__Group_3__3__Impl();
@@ -32929,17 +31590,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_3__3__Impl"
-    // InternalTableDSL.g:9523:1: rule__TableAxis__Group_3__3__Impl : ( '}' ) ;
+    // InternalTableDSL.g:9091:1: rule__TableAxis__Group_3__3__Impl : ( '}' ) ;
     public final void rule__TableAxis__Group_3__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9527:1: ( ( '}' ) )
-            // InternalTableDSL.g:9528:1: ( '}' )
+            // InternalTableDSL.g:9095:1: ( ( '}' ) )
+            // InternalTableDSL.g:9096:1: ( '}' )
             {
-            // InternalTableDSL.g:9528:1: ( '}' )
-            // InternalTableDSL.g:9529:2: '}'
+            // InternalTableDSL.g:9096:1: ( '}' )
+            // InternalTableDSL.g:9097:2: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getRightCurlyBracketKeyword_3_3()); 
@@ -32970,14 +31631,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_4__0"
-    // InternalTableDSL.g:9539:1: rule__TableAxis__Group_4__0 : rule__TableAxis__Group_4__0__Impl rule__TableAxis__Group_4__1 ;
+    // InternalTableDSL.g:9107:1: rule__TableAxis__Group_4__0 : rule__TableAxis__Group_4__0__Impl rule__TableAxis__Group_4__1 ;
     public final void rule__TableAxis__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9543:1: ( rule__TableAxis__Group_4__0__Impl rule__TableAxis__Group_4__1 )
-            // InternalTableDSL.g:9544:2: rule__TableAxis__Group_4__0__Impl rule__TableAxis__Group_4__1
+            // InternalTableDSL.g:9111:1: ( rule__TableAxis__Group_4__0__Impl rule__TableAxis__Group_4__1 )
+            // InternalTableDSL.g:9112:2: rule__TableAxis__Group_4__0__Impl rule__TableAxis__Group_4__1
             {
             pushFollow(FOLLOW_8);
             rule__TableAxis__Group_4__0__Impl();
@@ -33008,23 +31669,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_4__0__Impl"
-    // InternalTableDSL.g:9551:1: rule__TableAxis__Group_4__0__Impl : ( ( rule__TableAxis__HasEventsAssignment_4_0 ) ) ;
+    // InternalTableDSL.g:9119:1: rule__TableAxis__Group_4__0__Impl : ( ( rule__TableAxis__HasEventsAssignment_4_0 ) ) ;
     public final void rule__TableAxis__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9555:1: ( ( ( rule__TableAxis__HasEventsAssignment_4_0 ) ) )
-            // InternalTableDSL.g:9556:1: ( ( rule__TableAxis__HasEventsAssignment_4_0 ) )
+            // InternalTableDSL.g:9123:1: ( ( ( rule__TableAxis__HasEventsAssignment_4_0 ) ) )
+            // InternalTableDSL.g:9124:1: ( ( rule__TableAxis__HasEventsAssignment_4_0 ) )
             {
-            // InternalTableDSL.g:9556:1: ( ( rule__TableAxis__HasEventsAssignment_4_0 ) )
-            // InternalTableDSL.g:9557:2: ( rule__TableAxis__HasEventsAssignment_4_0 )
+            // InternalTableDSL.g:9124:1: ( ( rule__TableAxis__HasEventsAssignment_4_0 ) )
+            // InternalTableDSL.g:9125:2: ( rule__TableAxis__HasEventsAssignment_4_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getHasEventsAssignment_4_0()); 
             }
-            // InternalTableDSL.g:9558:2: ( rule__TableAxis__HasEventsAssignment_4_0 )
-            // InternalTableDSL.g:9558:3: rule__TableAxis__HasEventsAssignment_4_0
+            // InternalTableDSL.g:9126:2: ( rule__TableAxis__HasEventsAssignment_4_0 )
+            // InternalTableDSL.g:9126:3: rule__TableAxis__HasEventsAssignment_4_0
             {
             pushFollow(FOLLOW_2);
             rule__TableAxis__HasEventsAssignment_4_0();
@@ -33059,16 +31720,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_4__1"
-    // InternalTableDSL.g:9566:1: rule__TableAxis__Group_4__1 : rule__TableAxis__Group_4__1__Impl rule__TableAxis__Group_4__2 ;
+    // InternalTableDSL.g:9134:1: rule__TableAxis__Group_4__1 : rule__TableAxis__Group_4__1__Impl rule__TableAxis__Group_4__2 ;
     public final void rule__TableAxis__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9570:1: ( rule__TableAxis__Group_4__1__Impl rule__TableAxis__Group_4__2 )
-            // InternalTableDSL.g:9571:2: rule__TableAxis__Group_4__1__Impl rule__TableAxis__Group_4__2
+            // InternalTableDSL.g:9138:1: ( rule__TableAxis__Group_4__1__Impl rule__TableAxis__Group_4__2 )
+            // InternalTableDSL.g:9139:2: rule__TableAxis__Group_4__1__Impl rule__TableAxis__Group_4__2
             {
-            pushFollow(FOLLOW_56);
+            pushFollow(FOLLOW_57);
             rule__TableAxis__Group_4__1__Impl();
 
             state._fsp--;
@@ -33097,17 +31758,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_4__1__Impl"
-    // InternalTableDSL.g:9578:1: rule__TableAxis__Group_4__1__Impl : ( '{' ) ;
+    // InternalTableDSL.g:9146:1: rule__TableAxis__Group_4__1__Impl : ( '{' ) ;
     public final void rule__TableAxis__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9582:1: ( ( '{' ) )
-            // InternalTableDSL.g:9583:1: ( '{' )
+            // InternalTableDSL.g:9150:1: ( ( '{' ) )
+            // InternalTableDSL.g:9151:1: ( '{' )
             {
-            // InternalTableDSL.g:9583:1: ( '{' )
-            // InternalTableDSL.g:9584:2: '{'
+            // InternalTableDSL.g:9151:1: ( '{' )
+            // InternalTableDSL.g:9152:2: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getLeftCurlyBracketKeyword_4_1()); 
@@ -33138,16 +31799,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_4__2"
-    // InternalTableDSL.g:9593:1: rule__TableAxis__Group_4__2 : rule__TableAxis__Group_4__2__Impl rule__TableAxis__Group_4__3 ;
+    // InternalTableDSL.g:9161:1: rule__TableAxis__Group_4__2 : rule__TableAxis__Group_4__2__Impl rule__TableAxis__Group_4__3 ;
     public final void rule__TableAxis__Group_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9597:1: ( rule__TableAxis__Group_4__2__Impl rule__TableAxis__Group_4__3 )
-            // InternalTableDSL.g:9598:2: rule__TableAxis__Group_4__2__Impl rule__TableAxis__Group_4__3
+            // InternalTableDSL.g:9165:1: ( rule__TableAxis__Group_4__2__Impl rule__TableAxis__Group_4__3 )
+            // InternalTableDSL.g:9166:2: rule__TableAxis__Group_4__2__Impl rule__TableAxis__Group_4__3
             {
-            pushFollow(FOLLOW_56);
+            pushFollow(FOLLOW_57);
             rule__TableAxis__Group_4__2__Impl();
 
             state._fsp--;
@@ -33176,37 +31837,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_4__2__Impl"
-    // InternalTableDSL.g:9605:1: rule__TableAxis__Group_4__2__Impl : ( ( rule__TableAxis__EventsAssignment_4_2 )* ) ;
+    // InternalTableDSL.g:9173:1: rule__TableAxis__Group_4__2__Impl : ( ( rule__TableAxis__EventsAssignment_4_2 )* ) ;
     public final void rule__TableAxis__Group_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9609:1: ( ( ( rule__TableAxis__EventsAssignment_4_2 )* ) )
-            // InternalTableDSL.g:9610:1: ( ( rule__TableAxis__EventsAssignment_4_2 )* )
+            // InternalTableDSL.g:9177:1: ( ( ( rule__TableAxis__EventsAssignment_4_2 )* ) )
+            // InternalTableDSL.g:9178:1: ( ( rule__TableAxis__EventsAssignment_4_2 )* )
             {
-            // InternalTableDSL.g:9610:1: ( ( rule__TableAxis__EventsAssignment_4_2 )* )
-            // InternalTableDSL.g:9611:2: ( rule__TableAxis__EventsAssignment_4_2 )*
+            // InternalTableDSL.g:9178:1: ( ( rule__TableAxis__EventsAssignment_4_2 )* )
+            // InternalTableDSL.g:9179:2: ( rule__TableAxis__EventsAssignment_4_2 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getEventsAssignment_4_2()); 
             }
-            // InternalTableDSL.g:9612:2: ( rule__TableAxis__EventsAssignment_4_2 )*
-            loop77:
+            // InternalTableDSL.g:9180:2: ( rule__TableAxis__EventsAssignment_4_2 )*
+            loop76:
             do {
-                int alt77=2;
-                int LA77_0 = input.LA(1);
+                int alt76=2;
+                int LA76_0 = input.LA(1);
 
-                if ( ((LA77_0>=92 && LA77_0<=100)) ) {
-                    alt77=1;
+                if ( ((LA76_0>=92 && LA76_0<=100)) ) {
+                    alt76=1;
                 }
 
 
-                switch (alt77) {
+                switch (alt76) {
             	case 1 :
-            	    // InternalTableDSL.g:9612:3: rule__TableAxis__EventsAssignment_4_2
+            	    // InternalTableDSL.g:9180:3: rule__TableAxis__EventsAssignment_4_2
             	    {
-            	    pushFollow(FOLLOW_57);
+            	    pushFollow(FOLLOW_58);
             	    rule__TableAxis__EventsAssignment_4_2();
 
             	    state._fsp--;
@@ -33216,7 +31877,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop77;
+            	    break loop76;
                 }
             } while (true);
 
@@ -33245,14 +31906,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_4__3"
-    // InternalTableDSL.g:9620:1: rule__TableAxis__Group_4__3 : rule__TableAxis__Group_4__3__Impl ;
+    // InternalTableDSL.g:9188:1: rule__TableAxis__Group_4__3 : rule__TableAxis__Group_4__3__Impl ;
     public final void rule__TableAxis__Group_4__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9624:1: ( rule__TableAxis__Group_4__3__Impl )
-            // InternalTableDSL.g:9625:2: rule__TableAxis__Group_4__3__Impl
+            // InternalTableDSL.g:9192:1: ( rule__TableAxis__Group_4__3__Impl )
+            // InternalTableDSL.g:9193:2: rule__TableAxis__Group_4__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableAxis__Group_4__3__Impl();
@@ -33278,17 +31939,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__Group_4__3__Impl"
-    // InternalTableDSL.g:9631:1: rule__TableAxis__Group_4__3__Impl : ( '}' ) ;
+    // InternalTableDSL.g:9199:1: rule__TableAxis__Group_4__3__Impl : ( '}' ) ;
     public final void rule__TableAxis__Group_4__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9635:1: ( ( '}' ) )
-            // InternalTableDSL.g:9636:1: ( '}' )
+            // InternalTableDSL.g:9203:1: ( ( '}' ) )
+            // InternalTableDSL.g:9204:1: ( '}' )
             {
-            // InternalTableDSL.g:9636:1: ( '}' )
-            // InternalTableDSL.g:9637:2: '}'
+            // InternalTableDSL.g:9204:1: ( '}' )
+            // InternalTableDSL.g:9205:2: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getRightCurlyBracketKeyword_4_3()); 
@@ -33319,14 +31980,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTextColor__Group__0"
-    // InternalTableDSL.g:9647:1: rule__TableTextColor__Group__0 : rule__TableTextColor__Group__0__Impl rule__TableTextColor__Group__1 ;
+    // InternalTableDSL.g:9215:1: rule__TableTextColor__Group__0 : rule__TableTextColor__Group__0__Impl rule__TableTextColor__Group__1 ;
     public final void rule__TableTextColor__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9651:1: ( rule__TableTextColor__Group__0__Impl rule__TableTextColor__Group__1 )
-            // InternalTableDSL.g:9652:2: rule__TableTextColor__Group__0__Impl rule__TableTextColor__Group__1
+            // InternalTableDSL.g:9219:1: ( rule__TableTextColor__Group__0__Impl rule__TableTextColor__Group__1 )
+            // InternalTableDSL.g:9220:2: rule__TableTextColor__Group__0__Impl rule__TableTextColor__Group__1
             {
             pushFollow(FOLLOW_14);
             rule__TableTextColor__Group__0__Impl();
@@ -33357,17 +32018,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTextColor__Group__0__Impl"
-    // InternalTableDSL.g:9659:1: rule__TableTextColor__Group__0__Impl : ( 'textcolor' ) ;
+    // InternalTableDSL.g:9227:1: rule__TableTextColor__Group__0__Impl : ( 'textcolor' ) ;
     public final void rule__TableTextColor__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9663:1: ( ( 'textcolor' ) )
-            // InternalTableDSL.g:9664:1: ( 'textcolor' )
+            // InternalTableDSL.g:9231:1: ( ( 'textcolor' ) )
+            // InternalTableDSL.g:9232:1: ( 'textcolor' )
             {
-            // InternalTableDSL.g:9664:1: ( 'textcolor' )
-            // InternalTableDSL.g:9665:2: 'textcolor'
+            // InternalTableDSL.g:9232:1: ( 'textcolor' )
+            // InternalTableDSL.g:9233:2: 'textcolor'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTextColorAccess().getTextcolorKeyword_0()); 
@@ -33398,14 +32059,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTextColor__Group__1"
-    // InternalTableDSL.g:9674:1: rule__TableTextColor__Group__1 : rule__TableTextColor__Group__1__Impl ;
+    // InternalTableDSL.g:9242:1: rule__TableTextColor__Group__1 : rule__TableTextColor__Group__1__Impl ;
     public final void rule__TableTextColor__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9678:1: ( rule__TableTextColor__Group__1__Impl )
-            // InternalTableDSL.g:9679:2: rule__TableTextColor__Group__1__Impl
+            // InternalTableDSL.g:9246:1: ( rule__TableTextColor__Group__1__Impl )
+            // InternalTableDSL.g:9247:2: rule__TableTextColor__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableTextColor__Group__1__Impl();
@@ -33431,23 +32092,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTextColor__Group__1__Impl"
-    // InternalTableDSL.g:9685:1: rule__TableTextColor__Group__1__Impl : ( ( rule__TableTextColor__RgbAssignment_1 ) ) ;
+    // InternalTableDSL.g:9253:1: rule__TableTextColor__Group__1__Impl : ( ( rule__TableTextColor__RgbAssignment_1 ) ) ;
     public final void rule__TableTextColor__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9689:1: ( ( ( rule__TableTextColor__RgbAssignment_1 ) ) )
-            // InternalTableDSL.g:9690:1: ( ( rule__TableTextColor__RgbAssignment_1 ) )
+            // InternalTableDSL.g:9257:1: ( ( ( rule__TableTextColor__RgbAssignment_1 ) ) )
+            // InternalTableDSL.g:9258:1: ( ( rule__TableTextColor__RgbAssignment_1 ) )
             {
-            // InternalTableDSL.g:9690:1: ( ( rule__TableTextColor__RgbAssignment_1 ) )
-            // InternalTableDSL.g:9691:2: ( rule__TableTextColor__RgbAssignment_1 )
+            // InternalTableDSL.g:9258:1: ( ( rule__TableTextColor__RgbAssignment_1 ) )
+            // InternalTableDSL.g:9259:2: ( rule__TableTextColor__RgbAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTextColorAccess().getRgbAssignment_1()); 
             }
-            // InternalTableDSL.g:9692:2: ( rule__TableTextColor__RgbAssignment_1 )
-            // InternalTableDSL.g:9692:3: rule__TableTextColor__RgbAssignment_1
+            // InternalTableDSL.g:9260:2: ( rule__TableTextColor__RgbAssignment_1 )
+            // InternalTableDSL.g:9260:3: rule__TableTextColor__RgbAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__TableTextColor__RgbAssignment_1();
@@ -33482,14 +32143,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableCellColor__Group__0"
-    // InternalTableDSL.g:9701:1: rule__TableCellColor__Group__0 : rule__TableCellColor__Group__0__Impl rule__TableCellColor__Group__1 ;
+    // InternalTableDSL.g:9269:1: rule__TableCellColor__Group__0 : rule__TableCellColor__Group__0__Impl rule__TableCellColor__Group__1 ;
     public final void rule__TableCellColor__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9705:1: ( rule__TableCellColor__Group__0__Impl rule__TableCellColor__Group__1 )
-            // InternalTableDSL.g:9706:2: rule__TableCellColor__Group__0__Impl rule__TableCellColor__Group__1
+            // InternalTableDSL.g:9273:1: ( rule__TableCellColor__Group__0__Impl rule__TableCellColor__Group__1 )
+            // InternalTableDSL.g:9274:2: rule__TableCellColor__Group__0__Impl rule__TableCellColor__Group__1
             {
             pushFollow(FOLLOW_14);
             rule__TableCellColor__Group__0__Impl();
@@ -33520,17 +32181,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableCellColor__Group__0__Impl"
-    // InternalTableDSL.g:9713:1: rule__TableCellColor__Group__0__Impl : ( 'cellcolor' ) ;
+    // InternalTableDSL.g:9281:1: rule__TableCellColor__Group__0__Impl : ( 'cellcolor' ) ;
     public final void rule__TableCellColor__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9717:1: ( ( 'cellcolor' ) )
-            // InternalTableDSL.g:9718:1: ( 'cellcolor' )
+            // InternalTableDSL.g:9285:1: ( ( 'cellcolor' ) )
+            // InternalTableDSL.g:9286:1: ( 'cellcolor' )
             {
-            // InternalTableDSL.g:9718:1: ( 'cellcolor' )
-            // InternalTableDSL.g:9719:2: 'cellcolor'
+            // InternalTableDSL.g:9286:1: ( 'cellcolor' )
+            // InternalTableDSL.g:9287:2: 'cellcolor'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableCellColorAccess().getCellcolorKeyword_0()); 
@@ -33561,14 +32222,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableCellColor__Group__1"
-    // InternalTableDSL.g:9728:1: rule__TableCellColor__Group__1 : rule__TableCellColor__Group__1__Impl ;
+    // InternalTableDSL.g:9296:1: rule__TableCellColor__Group__1 : rule__TableCellColor__Group__1__Impl ;
     public final void rule__TableCellColor__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9732:1: ( rule__TableCellColor__Group__1__Impl )
-            // InternalTableDSL.g:9733:2: rule__TableCellColor__Group__1__Impl
+            // InternalTableDSL.g:9300:1: ( rule__TableCellColor__Group__1__Impl )
+            // InternalTableDSL.g:9301:2: rule__TableCellColor__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableCellColor__Group__1__Impl();
@@ -33594,23 +32255,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableCellColor__Group__1__Impl"
-    // InternalTableDSL.g:9739:1: rule__TableCellColor__Group__1__Impl : ( ( rule__TableCellColor__RgbAssignment_1 ) ) ;
+    // InternalTableDSL.g:9307:1: rule__TableCellColor__Group__1__Impl : ( ( rule__TableCellColor__RgbAssignment_1 ) ) ;
     public final void rule__TableCellColor__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9743:1: ( ( ( rule__TableCellColor__RgbAssignment_1 ) ) )
-            // InternalTableDSL.g:9744:1: ( ( rule__TableCellColor__RgbAssignment_1 ) )
+            // InternalTableDSL.g:9311:1: ( ( ( rule__TableCellColor__RgbAssignment_1 ) ) )
+            // InternalTableDSL.g:9312:1: ( ( rule__TableCellColor__RgbAssignment_1 ) )
             {
-            // InternalTableDSL.g:9744:1: ( ( rule__TableCellColor__RgbAssignment_1 ) )
-            // InternalTableDSL.g:9745:2: ( rule__TableCellColor__RgbAssignment_1 )
+            // InternalTableDSL.g:9312:1: ( ( rule__TableCellColor__RgbAssignment_1 ) )
+            // InternalTableDSL.g:9313:2: ( rule__TableCellColor__RgbAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableCellColorAccess().getRgbAssignment_1()); 
             }
-            // InternalTableDSL.g:9746:2: ( rule__TableCellColor__RgbAssignment_1 )
-            // InternalTableDSL.g:9746:3: rule__TableCellColor__RgbAssignment_1
+            // InternalTableDSL.g:9314:2: ( rule__TableCellColor__RgbAssignment_1 )
+            // InternalTableDSL.g:9314:3: rule__TableCellColor__RgbAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__TableCellColor__RgbAssignment_1();
@@ -33645,14 +32306,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIcon__Group__0"
-    // InternalTableDSL.g:9755:1: rule__TableIcon__Group__0 : rule__TableIcon__Group__0__Impl rule__TableIcon__Group__1 ;
+    // InternalTableDSL.g:9323:1: rule__TableIcon__Group__0 : rule__TableIcon__Group__0__Impl rule__TableIcon__Group__1 ;
     public final void rule__TableIcon__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9759:1: ( rule__TableIcon__Group__0__Impl rule__TableIcon__Group__1 )
-            // InternalTableDSL.g:9760:2: rule__TableIcon__Group__0__Impl rule__TableIcon__Group__1
+            // InternalTableDSL.g:9327:1: ( rule__TableIcon__Group__0__Impl rule__TableIcon__Group__1 )
+            // InternalTableDSL.g:9328:2: rule__TableIcon__Group__0__Impl rule__TableIcon__Group__1
             {
             pushFollow(FOLLOW_14);
             rule__TableIcon__Group__0__Impl();
@@ -33683,17 +32344,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIcon__Group__0__Impl"
-    // InternalTableDSL.g:9767:1: rule__TableIcon__Group__0__Impl : ( 'icon' ) ;
+    // InternalTableDSL.g:9335:1: rule__TableIcon__Group__0__Impl : ( 'icon' ) ;
     public final void rule__TableIcon__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9771:1: ( ( 'icon' ) )
-            // InternalTableDSL.g:9772:1: ( 'icon' )
+            // InternalTableDSL.g:9339:1: ( ( 'icon' ) )
+            // InternalTableDSL.g:9340:1: ( 'icon' )
             {
-            // InternalTableDSL.g:9772:1: ( 'icon' )
-            // InternalTableDSL.g:9773:2: 'icon'
+            // InternalTableDSL.g:9340:1: ( 'icon' )
+            // InternalTableDSL.g:9341:2: 'icon'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIconAccess().getIconKeyword_0()); 
@@ -33724,14 +32385,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIcon__Group__1"
-    // InternalTableDSL.g:9782:1: rule__TableIcon__Group__1 : rule__TableIcon__Group__1__Impl ;
+    // InternalTableDSL.g:9350:1: rule__TableIcon__Group__1 : rule__TableIcon__Group__1__Impl ;
     public final void rule__TableIcon__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9786:1: ( rule__TableIcon__Group__1__Impl )
-            // InternalTableDSL.g:9787:2: rule__TableIcon__Group__1__Impl
+            // InternalTableDSL.g:9354:1: ( rule__TableIcon__Group__1__Impl )
+            // InternalTableDSL.g:9355:2: rule__TableIcon__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableIcon__Group__1__Impl();
@@ -33757,23 +32418,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIcon__Group__1__Impl"
-    // InternalTableDSL.g:9793:1: rule__TableIcon__Group__1__Impl : ( ( rule__TableIcon__IconAssignment_1 ) ) ;
+    // InternalTableDSL.g:9361:1: rule__TableIcon__Group__1__Impl : ( ( rule__TableIcon__IconAssignment_1 ) ) ;
     public final void rule__TableIcon__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9797:1: ( ( ( rule__TableIcon__IconAssignment_1 ) ) )
-            // InternalTableDSL.g:9798:1: ( ( rule__TableIcon__IconAssignment_1 ) )
+            // InternalTableDSL.g:9365:1: ( ( ( rule__TableIcon__IconAssignment_1 ) ) )
+            // InternalTableDSL.g:9366:1: ( ( rule__TableIcon__IconAssignment_1 ) )
             {
-            // InternalTableDSL.g:9798:1: ( ( rule__TableIcon__IconAssignment_1 ) )
-            // InternalTableDSL.g:9799:2: ( rule__TableIcon__IconAssignment_1 )
+            // InternalTableDSL.g:9366:1: ( ( rule__TableIcon__IconAssignment_1 ) )
+            // InternalTableDSL.g:9367:2: ( rule__TableIcon__IconAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIconAccess().getIconAssignment_1()); 
             }
-            // InternalTableDSL.g:9800:2: ( rule__TableIcon__IconAssignment_1 )
-            // InternalTableDSL.g:9800:3: rule__TableIcon__IconAssignment_1
+            // InternalTableDSL.g:9368:2: ( rule__TableIcon__IconAssignment_1 )
+            // InternalTableDSL.g:9368:3: rule__TableIcon__IconAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__TableIcon__IconAssignment_1();
@@ -33808,16 +32469,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTrend__Group__0"
-    // InternalTableDSL.g:9809:1: rule__TableTrend__Group__0 : rule__TableTrend__Group__0__Impl rule__TableTrend__Group__1 ;
+    // InternalTableDSL.g:9377:1: rule__TableTrend__Group__0 : rule__TableTrend__Group__0__Impl rule__TableTrend__Group__1 ;
     public final void rule__TableTrend__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9813:1: ( rule__TableTrend__Group__0__Impl rule__TableTrend__Group__1 )
-            // InternalTableDSL.g:9814:2: rule__TableTrend__Group__0__Impl rule__TableTrend__Group__1
+            // InternalTableDSL.g:9381:1: ( rule__TableTrend__Group__0__Impl rule__TableTrend__Group__1 )
+            // InternalTableDSL.g:9382:2: rule__TableTrend__Group__0__Impl rule__TableTrend__Group__1
             {
-            pushFollow(FOLLOW_58);
+            pushFollow(FOLLOW_59);
             rule__TableTrend__Group__0__Impl();
 
             state._fsp--;
@@ -33846,17 +32507,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTrend__Group__0__Impl"
-    // InternalTableDSL.g:9821:1: rule__TableTrend__Group__0__Impl : ( 'trend' ) ;
+    // InternalTableDSL.g:9389:1: rule__TableTrend__Group__0__Impl : ( 'trend' ) ;
     public final void rule__TableTrend__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9825:1: ( ( 'trend' ) )
-            // InternalTableDSL.g:9826:1: ( 'trend' )
+            // InternalTableDSL.g:9393:1: ( ( 'trend' ) )
+            // InternalTableDSL.g:9394:1: ( 'trend' )
             {
-            // InternalTableDSL.g:9826:1: ( 'trend' )
-            // InternalTableDSL.g:9827:2: 'trend'
+            // InternalTableDSL.g:9394:1: ( 'trend' )
+            // InternalTableDSL.g:9395:2: 'trend'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTrendAccess().getTrendKeyword_0()); 
@@ -33887,14 +32548,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTrend__Group__1"
-    // InternalTableDSL.g:9836:1: rule__TableTrend__Group__1 : rule__TableTrend__Group__1__Impl ;
+    // InternalTableDSL.g:9404:1: rule__TableTrend__Group__1 : rule__TableTrend__Group__1__Impl ;
     public final void rule__TableTrend__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9840:1: ( rule__TableTrend__Group__1__Impl )
-            // InternalTableDSL.g:9841:2: rule__TableTrend__Group__1__Impl
+            // InternalTableDSL.g:9408:1: ( rule__TableTrend__Group__1__Impl )
+            // InternalTableDSL.g:9409:2: rule__TableTrend__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableTrend__Group__1__Impl();
@@ -33920,23 +32581,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTrend__Group__1__Impl"
-    // InternalTableDSL.g:9847:1: rule__TableTrend__Group__1__Impl : ( ( rule__TableTrend__IconAssignment_1 ) ) ;
+    // InternalTableDSL.g:9415:1: rule__TableTrend__Group__1__Impl : ( ( rule__TableTrend__IconAssignment_1 ) ) ;
     public final void rule__TableTrend__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9851:1: ( ( ( rule__TableTrend__IconAssignment_1 ) ) )
-            // InternalTableDSL.g:9852:1: ( ( rule__TableTrend__IconAssignment_1 ) )
+            // InternalTableDSL.g:9419:1: ( ( ( rule__TableTrend__IconAssignment_1 ) ) )
+            // InternalTableDSL.g:9420:1: ( ( rule__TableTrend__IconAssignment_1 ) )
             {
-            // InternalTableDSL.g:9852:1: ( ( rule__TableTrend__IconAssignment_1 ) )
-            // InternalTableDSL.g:9853:2: ( rule__TableTrend__IconAssignment_1 )
+            // InternalTableDSL.g:9420:1: ( ( rule__TableTrend__IconAssignment_1 ) )
+            // InternalTableDSL.g:9421:2: ( rule__TableTrend__IconAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTrendAccess().getIconAssignment_1()); 
             }
-            // InternalTableDSL.g:9854:2: ( rule__TableTrend__IconAssignment_1 )
-            // InternalTableDSL.g:9854:3: rule__TableTrend__IconAssignment_1
+            // InternalTableDSL.g:9422:2: ( rule__TableTrend__IconAssignment_1 )
+            // InternalTableDSL.g:9422:3: rule__TableTrend__IconAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__TableTrend__IconAssignment_1();
@@ -33971,14 +32632,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTooltip__Group__0"
-    // InternalTableDSL.g:9863:1: rule__TableTooltip__Group__0 : rule__TableTooltip__Group__0__Impl rule__TableTooltip__Group__1 ;
+    // InternalTableDSL.g:9431:1: rule__TableTooltip__Group__0 : rule__TableTooltip__Group__0__Impl rule__TableTooltip__Group__1 ;
     public final void rule__TableTooltip__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9867:1: ( rule__TableTooltip__Group__0__Impl rule__TableTooltip__Group__1 )
-            // InternalTableDSL.g:9868:2: rule__TableTooltip__Group__0__Impl rule__TableTooltip__Group__1
+            // InternalTableDSL.g:9435:1: ( rule__TableTooltip__Group__0__Impl rule__TableTooltip__Group__1 )
+            // InternalTableDSL.g:9436:2: rule__TableTooltip__Group__0__Impl rule__TableTooltip__Group__1
             {
             pushFollow(FOLLOW_14);
             rule__TableTooltip__Group__0__Impl();
@@ -34009,17 +32670,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTooltip__Group__0__Impl"
-    // InternalTableDSL.g:9875:1: rule__TableTooltip__Group__0__Impl : ( 'tooltip' ) ;
+    // InternalTableDSL.g:9443:1: rule__TableTooltip__Group__0__Impl : ( 'tooltip' ) ;
     public final void rule__TableTooltip__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9879:1: ( ( 'tooltip' ) )
-            // InternalTableDSL.g:9880:1: ( 'tooltip' )
+            // InternalTableDSL.g:9447:1: ( ( 'tooltip' ) )
+            // InternalTableDSL.g:9448:1: ( 'tooltip' )
             {
-            // InternalTableDSL.g:9880:1: ( 'tooltip' )
-            // InternalTableDSL.g:9881:2: 'tooltip'
+            // InternalTableDSL.g:9448:1: ( 'tooltip' )
+            // InternalTableDSL.g:9449:2: 'tooltip'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTooltipAccess().getTooltipKeyword_0()); 
@@ -34050,14 +32711,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTooltip__Group__1"
-    // InternalTableDSL.g:9890:1: rule__TableTooltip__Group__1 : rule__TableTooltip__Group__1__Impl ;
+    // InternalTableDSL.g:9458:1: rule__TableTooltip__Group__1 : rule__TableTooltip__Group__1__Impl ;
     public final void rule__TableTooltip__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9894:1: ( rule__TableTooltip__Group__1__Impl )
-            // InternalTableDSL.g:9895:2: rule__TableTooltip__Group__1__Impl
+            // InternalTableDSL.g:9462:1: ( rule__TableTooltip__Group__1__Impl )
+            // InternalTableDSL.g:9463:2: rule__TableTooltip__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableTooltip__Group__1__Impl();
@@ -34083,23 +32744,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTooltip__Group__1__Impl"
-    // InternalTableDSL.g:9901:1: rule__TableTooltip__Group__1__Impl : ( ( rule__TableTooltip__TooltipAssignment_1 ) ) ;
+    // InternalTableDSL.g:9469:1: rule__TableTooltip__Group__1__Impl : ( ( rule__TableTooltip__TooltipAssignment_1 ) ) ;
     public final void rule__TableTooltip__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9905:1: ( ( ( rule__TableTooltip__TooltipAssignment_1 ) ) )
-            // InternalTableDSL.g:9906:1: ( ( rule__TableTooltip__TooltipAssignment_1 ) )
+            // InternalTableDSL.g:9473:1: ( ( ( rule__TableTooltip__TooltipAssignment_1 ) ) )
+            // InternalTableDSL.g:9474:1: ( ( rule__TableTooltip__TooltipAssignment_1 ) )
             {
-            // InternalTableDSL.g:9906:1: ( ( rule__TableTooltip__TooltipAssignment_1 ) )
-            // InternalTableDSL.g:9907:2: ( rule__TableTooltip__TooltipAssignment_1 )
+            // InternalTableDSL.g:9474:1: ( ( rule__TableTooltip__TooltipAssignment_1 ) )
+            // InternalTableDSL.g:9475:2: ( rule__TableTooltip__TooltipAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTooltipAccess().getTooltipAssignment_1()); 
             }
-            // InternalTableDSL.g:9908:2: ( rule__TableTooltip__TooltipAssignment_1 )
-            // InternalTableDSL.g:9908:3: rule__TableTooltip__TooltipAssignment_1
+            // InternalTableDSL.g:9476:2: ( rule__TableTooltip__TooltipAssignment_1 )
+            // InternalTableDSL.g:9476:3: rule__TableTooltip__TooltipAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__TableTooltip__TooltipAssignment_1();
@@ -34134,16 +32795,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableGrid__Group__0"
-    // InternalTableDSL.g:9917:1: rule__TableGrid__Group__0 : rule__TableGrid__Group__0__Impl rule__TableGrid__Group__1 ;
+    // InternalTableDSL.g:9485:1: rule__TableGrid__Group__0 : rule__TableGrid__Group__0__Impl rule__TableGrid__Group__1 ;
     public final void rule__TableGrid__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9921:1: ( rule__TableGrid__Group__0__Impl rule__TableGrid__Group__1 )
-            // InternalTableDSL.g:9922:2: rule__TableGrid__Group__0__Impl rule__TableGrid__Group__1
+            // InternalTableDSL.g:9489:1: ( rule__TableGrid__Group__0__Impl rule__TableGrid__Group__1 )
+            // InternalTableDSL.g:9490:2: rule__TableGrid__Group__0__Impl rule__TableGrid__Group__1
             {
-            pushFollow(FOLLOW_59);
+            pushFollow(FOLLOW_13);
             rule__TableGrid__Group__0__Impl();
 
             state._fsp--;
@@ -34172,23 +32833,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableGrid__Group__0__Impl"
-    // InternalTableDSL.g:9929:1: rule__TableGrid__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:9497:1: rule__TableGrid__Group__0__Impl : ( () ) ;
     public final void rule__TableGrid__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9933:1: ( ( () ) )
-            // InternalTableDSL.g:9934:1: ( () )
+            // InternalTableDSL.g:9501:1: ( ( () ) )
+            // InternalTableDSL.g:9502:1: ( () )
             {
-            // InternalTableDSL.g:9934:1: ( () )
-            // InternalTableDSL.g:9935:2: ()
+            // InternalTableDSL.g:9502:1: ( () )
+            // InternalTableDSL.g:9503:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableGridAccess().getTableGridAction_0()); 
             }
-            // InternalTableDSL.g:9936:2: ()
-            // InternalTableDSL.g:9936:3: 
+            // InternalTableDSL.g:9504:2: ()
+            // InternalTableDSL.g:9504:3: 
             {
             }
 
@@ -34213,16 +32874,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableGrid__Group__1"
-    // InternalTableDSL.g:9944:1: rule__TableGrid__Group__1 : rule__TableGrid__Group__1__Impl rule__TableGrid__Group__2 ;
+    // InternalTableDSL.g:9512:1: rule__TableGrid__Group__1 : rule__TableGrid__Group__1__Impl rule__TableGrid__Group__2 ;
     public final void rule__TableGrid__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9948:1: ( rule__TableGrid__Group__1__Impl rule__TableGrid__Group__2 )
-            // InternalTableDSL.g:9949:2: rule__TableGrid__Group__1__Impl rule__TableGrid__Group__2
+            // InternalTableDSL.g:9516:1: ( rule__TableGrid__Group__1__Impl rule__TableGrid__Group__2 )
+            // InternalTableDSL.g:9517:2: rule__TableGrid__Group__1__Impl rule__TableGrid__Group__2
             {
-            pushFollow(FOLLOW_60);
+            pushFollow(FOLLOW_18);
             rule__TableGrid__Group__1__Impl();
 
             state._fsp--;
@@ -34251,24 +32912,24 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableGrid__Group__1__Impl"
-    // InternalTableDSL.g:9956:1: rule__TableGrid__Group__1__Impl : ( 'grid' ) ;
+    // InternalTableDSL.g:9524:1: rule__TableGrid__Group__1__Impl : ( 'editable' ) ;
     public final void rule__TableGrid__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9960:1: ( ( 'grid' ) )
-            // InternalTableDSL.g:9961:1: ( 'grid' )
+            // InternalTableDSL.g:9528:1: ( ( 'editable' ) )
+            // InternalTableDSL.g:9529:1: ( 'editable' )
             {
-            // InternalTableDSL.g:9961:1: ( 'grid' )
-            // InternalTableDSL.g:9962:2: 'grid'
+            // InternalTableDSL.g:9529:1: ( 'editable' )
+            // InternalTableDSL.g:9530:2: 'editable'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getGridKeyword_1()); 
+               before(grammarAccess.getTableGridAccess().getEditableKeyword_1()); 
             }
             match(input,113,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getGridKeyword_1()); 
+               after(grammarAccess.getTableGridAccess().getEditableKeyword_1()); 
             }
 
             }
@@ -34292,16 +32953,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableGrid__Group__2"
-    // InternalTableDSL.g:9971:1: rule__TableGrid__Group__2 : rule__TableGrid__Group__2__Impl rule__TableGrid__Group__3 ;
+    // InternalTableDSL.g:9539:1: rule__TableGrid__Group__2 : rule__TableGrid__Group__2__Impl rule__TableGrid__Group__3 ;
     public final void rule__TableGrid__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9975:1: ( rule__TableGrid__Group__2__Impl rule__TableGrid__Group__3 )
-            // InternalTableDSL.g:9976:2: rule__TableGrid__Group__2__Impl rule__TableGrid__Group__3
+            // InternalTableDSL.g:9543:1: ( rule__TableGrid__Group__2__Impl rule__TableGrid__Group__3 )
+            // InternalTableDSL.g:9544:2: rule__TableGrid__Group__2__Impl rule__TableGrid__Group__3
             {
-            pushFollow(FOLLOW_61);
+            pushFollow(FOLLOW_60);
             rule__TableGrid__Group__2__Impl();
 
             state._fsp--;
@@ -34330,34 +32991,24 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableGrid__Group__2__Impl"
-    // InternalTableDSL.g:9983:1: rule__TableGrid__Group__2__Impl : ( ( rule__TableGrid__UnorderedGroup_2 ) ) ;
+    // InternalTableDSL.g:9551:1: rule__TableGrid__Group__2__Impl : ( 'using' ) ;
     public final void rule__TableGrid__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:9987:1: ( ( ( rule__TableGrid__UnorderedGroup_2 ) ) )
-            // InternalTableDSL.g:9988:1: ( ( rule__TableGrid__UnorderedGroup_2 ) )
+            // InternalTableDSL.g:9555:1: ( ( 'using' ) )
+            // InternalTableDSL.g:9556:1: ( 'using' )
             {
-            // InternalTableDSL.g:9988:1: ( ( rule__TableGrid__UnorderedGroup_2 ) )
-            // InternalTableDSL.g:9989:2: ( rule__TableGrid__UnorderedGroup_2 )
+            // InternalTableDSL.g:9556:1: ( 'using' )
+            // InternalTableDSL.g:9557:2: 'using'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getUnorderedGroup_2()); 
+               before(grammarAccess.getTableGridAccess().getUsingKeyword_2()); 
             }
-            // InternalTableDSL.g:9990:2: ( rule__TableGrid__UnorderedGroup_2 )
-            // InternalTableDSL.g:9990:3: rule__TableGrid__UnorderedGroup_2
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__UnorderedGroup_2();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
+            match(input,82,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getUnorderedGroup_2()); 
+               after(grammarAccess.getTableGridAccess().getUsingKeyword_2()); 
             }
 
             }
@@ -34381,22 +33032,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableGrid__Group__3"
-    // InternalTableDSL.g:9998:1: rule__TableGrid__Group__3 : rule__TableGrid__Group__3__Impl rule__TableGrid__Group__4 ;
+    // InternalTableDSL.g:9566:1: rule__TableGrid__Group__3 : rule__TableGrid__Group__3__Impl ;
     public final void rule__TableGrid__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10002:1: ( rule__TableGrid__Group__3__Impl rule__TableGrid__Group__4 )
-            // InternalTableDSL.g:10003:2: rule__TableGrid__Group__3__Impl rule__TableGrid__Group__4
+            // InternalTableDSL.g:9570:1: ( rule__TableGrid__Group__3__Impl )
+            // InternalTableDSL.g:9571:2: rule__TableGrid__Group__3__Impl
             {
-            pushFollow(FOLLOW_18);
-            rule__TableGrid__Group__3__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__TableGrid__Group__4();
+            rule__TableGrid__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -34419,26 +33065,26 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableGrid__Group__3__Impl"
-    // InternalTableDSL.g:10010:1: rule__TableGrid__Group__3__Impl : ( ( rule__TableGrid__UnorderedGroup_3 ) ) ;
+    // InternalTableDSL.g:9577:1: rule__TableGrid__Group__3__Impl : ( ( rule__TableGrid__SourceAssignment_3 ) ) ;
     public final void rule__TableGrid__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10014:1: ( ( ( rule__TableGrid__UnorderedGroup_3 ) ) )
-            // InternalTableDSL.g:10015:1: ( ( rule__TableGrid__UnorderedGroup_3 ) )
+            // InternalTableDSL.g:9581:1: ( ( ( rule__TableGrid__SourceAssignment_3 ) ) )
+            // InternalTableDSL.g:9582:1: ( ( rule__TableGrid__SourceAssignment_3 ) )
             {
-            // InternalTableDSL.g:10015:1: ( ( rule__TableGrid__UnorderedGroup_3 ) )
-            // InternalTableDSL.g:10016:2: ( rule__TableGrid__UnorderedGroup_3 )
+            // InternalTableDSL.g:9582:1: ( ( rule__TableGrid__SourceAssignment_3 ) )
+            // InternalTableDSL.g:9583:2: ( rule__TableGrid__SourceAssignment_3 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getUnorderedGroup_3()); 
+               before(grammarAccess.getTableGridAccess().getSourceAssignment_3()); 
             }
-            // InternalTableDSL.g:10017:2: ( rule__TableGrid__UnorderedGroup_3 )
-            // InternalTableDSL.g:10017:3: rule__TableGrid__UnorderedGroup_3
+            // InternalTableDSL.g:9584:2: ( rule__TableGrid__SourceAssignment_3 )
+            // InternalTableDSL.g:9584:3: rule__TableGrid__SourceAssignment_3
             {
             pushFollow(FOLLOW_2);
-            rule__TableGrid__UnorderedGroup_3();
+            rule__TableGrid__SourceAssignment_3();
 
             state._fsp--;
             if (state.failed) return ;
@@ -34446,7 +33092,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getUnorderedGroup_3()); 
+               after(grammarAccess.getTableGridAccess().getSourceAssignment_3()); 
             }
 
             }
@@ -34469,774 +33115,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     // $ANTLR end "rule__TableGrid__Group__3__Impl"
 
 
-    // $ANTLR start "rule__TableGrid__Group__4"
-    // InternalTableDSL.g:10025:1: rule__TableGrid__Group__4 : rule__TableGrid__Group__4__Impl ;
-    public final void rule__TableGrid__Group__4() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10029:1: ( rule__TableGrid__Group__4__Impl )
-            // InternalTableDSL.g:10030:2: rule__TableGrid__Group__4__Impl
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__Group__4__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group__4"
-
-
-    // $ANTLR start "rule__TableGrid__Group__4__Impl"
-    // InternalTableDSL.g:10036:1: rule__TableGrid__Group__4__Impl : ( ( rule__TableGrid__Group_4__0 )? ) ;
-    public final void rule__TableGrid__Group__4__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10040:1: ( ( ( rule__TableGrid__Group_4__0 )? ) )
-            // InternalTableDSL.g:10041:1: ( ( rule__TableGrid__Group_4__0 )? )
-            {
-            // InternalTableDSL.g:10041:1: ( ( rule__TableGrid__Group_4__0 )? )
-            // InternalTableDSL.g:10042:2: ( rule__TableGrid__Group_4__0 )?
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getGroup_4()); 
-            }
-            // InternalTableDSL.g:10043:2: ( rule__TableGrid__Group_4__0 )?
-            int alt78=2;
-            int LA78_0 = input.LA(1);
-
-            if ( (LA78_0==82) ) {
-                alt78=1;
-            }
-            switch (alt78) {
-                case 1 :
-                    // InternalTableDSL.g:10043:3: rule__TableGrid__Group_4__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableGrid__Group_4__0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getGroup_4()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group__4__Impl"
-
-
-    // $ANTLR start "rule__TableGrid__Group_2_1__0"
-    // InternalTableDSL.g:10052:1: rule__TableGrid__Group_2_1__0 : rule__TableGrid__Group_2_1__0__Impl rule__TableGrid__Group_2_1__1 ;
-    public final void rule__TableGrid__Group_2_1__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10056:1: ( rule__TableGrid__Group_2_1__0__Impl rule__TableGrid__Group_2_1__1 )
-            // InternalTableDSL.g:10057:2: rule__TableGrid__Group_2_1__0__Impl rule__TableGrid__Group_2_1__1
-            {
-            pushFollow(FOLLOW_19);
-            rule__TableGrid__Group_2_1__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__Group_2_1__1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_2_1__0"
-
-
-    // $ANTLR start "rule__TableGrid__Group_2_1__0__Impl"
-    // InternalTableDSL.g:10064:1: rule__TableGrid__Group_2_1__0__Impl : ( 'rowheader' ) ;
-    public final void rule__TableGrid__Group_2_1__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10068:1: ( ( 'rowheader' ) )
-            // InternalTableDSL.g:10069:1: ( 'rowheader' )
-            {
-            // InternalTableDSL.g:10069:1: ( 'rowheader' )
-            // InternalTableDSL.g:10070:2: 'rowheader'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getRowheaderKeyword_2_1_0()); 
-            }
-            match(input,114,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getRowheaderKeyword_2_1_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_2_1__0__Impl"
-
-
-    // $ANTLR start "rule__TableGrid__Group_2_1__1"
-    // InternalTableDSL.g:10079:1: rule__TableGrid__Group_2_1__1 : rule__TableGrid__Group_2_1__1__Impl ;
-    public final void rule__TableGrid__Group_2_1__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10083:1: ( rule__TableGrid__Group_2_1__1__Impl )
-            // InternalTableDSL.g:10084:2: rule__TableGrid__Group_2_1__1__Impl
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__Group_2_1__1__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_2_1__1"
-
-
-    // $ANTLR start "rule__TableGrid__Group_2_1__1__Impl"
-    // InternalTableDSL.g:10090:1: rule__TableGrid__Group_2_1__1__Impl : ( ( rule__TableGrid__HeaderModeAssignment_2_1_1 ) ) ;
-    public final void rule__TableGrid__Group_2_1__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10094:1: ( ( ( rule__TableGrid__HeaderModeAssignment_2_1_1 ) ) )
-            // InternalTableDSL.g:10095:1: ( ( rule__TableGrid__HeaderModeAssignment_2_1_1 ) )
-            {
-            // InternalTableDSL.g:10095:1: ( ( rule__TableGrid__HeaderModeAssignment_2_1_1 ) )
-            // InternalTableDSL.g:10096:2: ( rule__TableGrid__HeaderModeAssignment_2_1_1 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getHeaderModeAssignment_2_1_1()); 
-            }
-            // InternalTableDSL.g:10097:2: ( rule__TableGrid__HeaderModeAssignment_2_1_1 )
-            // InternalTableDSL.g:10097:3: rule__TableGrid__HeaderModeAssignment_2_1_1
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__HeaderModeAssignment_2_1_1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getHeaderModeAssignment_2_1_1()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_2_1__1__Impl"
-
-
-    // $ANTLR start "rule__TableGrid__Group_3_0__0"
-    // InternalTableDSL.g:10106:1: rule__TableGrid__Group_3_0__0 : rule__TableGrid__Group_3_0__0__Impl rule__TableGrid__Group_3_0__1 ;
-    public final void rule__TableGrid__Group_3_0__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10110:1: ( rule__TableGrid__Group_3_0__0__Impl rule__TableGrid__Group_3_0__1 )
-            // InternalTableDSL.g:10111:2: rule__TableGrid__Group_3_0__0__Impl rule__TableGrid__Group_3_0__1
-            {
-            pushFollow(FOLLOW_20);
-            rule__TableGrid__Group_3_0__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__Group_3_0__1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_3_0__0"
-
-
-    // $ANTLR start "rule__TableGrid__Group_3_0__0__Impl"
-    // InternalTableDSL.g:10118:1: rule__TableGrid__Group_3_0__0__Impl : ( ( rule__TableGrid__PollingAssignment_3_0_0 ) ) ;
-    public final void rule__TableGrid__Group_3_0__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10122:1: ( ( ( rule__TableGrid__PollingAssignment_3_0_0 ) ) )
-            // InternalTableDSL.g:10123:1: ( ( rule__TableGrid__PollingAssignment_3_0_0 ) )
-            {
-            // InternalTableDSL.g:10123:1: ( ( rule__TableGrid__PollingAssignment_3_0_0 ) )
-            // InternalTableDSL.g:10124:2: ( rule__TableGrid__PollingAssignment_3_0_0 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getPollingAssignment_3_0_0()); 
-            }
-            // InternalTableDSL.g:10125:2: ( rule__TableGrid__PollingAssignment_3_0_0 )
-            // InternalTableDSL.g:10125:3: rule__TableGrid__PollingAssignment_3_0_0
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__PollingAssignment_3_0_0();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getPollingAssignment_3_0_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_3_0__0__Impl"
-
-
-    // $ANTLR start "rule__TableGrid__Group_3_0__1"
-    // InternalTableDSL.g:10133:1: rule__TableGrid__Group_3_0__1 : rule__TableGrid__Group_3_0__1__Impl ;
-    public final void rule__TableGrid__Group_3_0__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10137:1: ( rule__TableGrid__Group_3_0__1__Impl )
-            // InternalTableDSL.g:10138:2: rule__TableGrid__Group_3_0__1__Impl
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__Group_3_0__1__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_3_0__1"
-
-
-    // $ANTLR start "rule__TableGrid__Group_3_0__1__Impl"
-    // InternalTableDSL.g:10144:1: rule__TableGrid__Group_3_0__1__Impl : ( ( rule__TableGrid__PollingTimeAssignment_3_0_1 ) ) ;
-    public final void rule__TableGrid__Group_3_0__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10148:1: ( ( ( rule__TableGrid__PollingTimeAssignment_3_0_1 ) ) )
-            // InternalTableDSL.g:10149:1: ( ( rule__TableGrid__PollingTimeAssignment_3_0_1 ) )
-            {
-            // InternalTableDSL.g:10149:1: ( ( rule__TableGrid__PollingTimeAssignment_3_0_1 ) )
-            // InternalTableDSL.g:10150:2: ( rule__TableGrid__PollingTimeAssignment_3_0_1 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getPollingTimeAssignment_3_0_1()); 
-            }
-            // InternalTableDSL.g:10151:2: ( rule__TableGrid__PollingTimeAssignment_3_0_1 )
-            // InternalTableDSL.g:10151:3: rule__TableGrid__PollingTimeAssignment_3_0_1
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__PollingTimeAssignment_3_0_1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getPollingTimeAssignment_3_0_1()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_3_0__1__Impl"
-
-
-    // $ANTLR start "rule__TableGrid__Group_3_3__0"
-    // InternalTableDSL.g:10160:1: rule__TableGrid__Group_3_3__0 : rule__TableGrid__Group_3_3__0__Impl rule__TableGrid__Group_3_3__1 ;
-    public final void rule__TableGrid__Group_3_3__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10164:1: ( rule__TableGrid__Group_3_3__0__Impl rule__TableGrid__Group_3_3__1 )
-            // InternalTableDSL.g:10165:2: rule__TableGrid__Group_3_3__0__Impl rule__TableGrid__Group_3_3__1
-            {
-            pushFollow(FOLLOW_7);
-            rule__TableGrid__Group_3_3__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__Group_3_3__1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_3_3__0"
-
-
-    // $ANTLR start "rule__TableGrid__Group_3_3__0__Impl"
-    // InternalTableDSL.g:10172:1: rule__TableGrid__Group_3_3__0__Impl : ( 'toolbar' ) ;
-    public final void rule__TableGrid__Group_3_3__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10176:1: ( ( 'toolbar' ) )
-            // InternalTableDSL.g:10177:1: ( 'toolbar' )
-            {
-            // InternalTableDSL.g:10177:1: ( 'toolbar' )
-            // InternalTableDSL.g:10178:2: 'toolbar'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getToolbarKeyword_3_3_0()); 
-            }
-            match(input,81,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getToolbarKeyword_3_3_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_3_3__0__Impl"
-
-
-    // $ANTLR start "rule__TableGrid__Group_3_3__1"
-    // InternalTableDSL.g:10187:1: rule__TableGrid__Group_3_3__1 : rule__TableGrid__Group_3_3__1__Impl ;
-    public final void rule__TableGrid__Group_3_3__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10191:1: ( rule__TableGrid__Group_3_3__1__Impl )
-            // InternalTableDSL.g:10192:2: rule__TableGrid__Group_3_3__1__Impl
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__Group_3_3__1__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_3_3__1"
-
-
-    // $ANTLR start "rule__TableGrid__Group_3_3__1__Impl"
-    // InternalTableDSL.g:10198:1: rule__TableGrid__Group_3_3__1__Impl : ( ( rule__TableGrid__ToolbarAssignment_3_3_1 ) ) ;
-    public final void rule__TableGrid__Group_3_3__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10202:1: ( ( ( rule__TableGrid__ToolbarAssignment_3_3_1 ) ) )
-            // InternalTableDSL.g:10203:1: ( ( rule__TableGrid__ToolbarAssignment_3_3_1 ) )
-            {
-            // InternalTableDSL.g:10203:1: ( ( rule__TableGrid__ToolbarAssignment_3_3_1 ) )
-            // InternalTableDSL.g:10204:2: ( rule__TableGrid__ToolbarAssignment_3_3_1 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getToolbarAssignment_3_3_1()); 
-            }
-            // InternalTableDSL.g:10205:2: ( rule__TableGrid__ToolbarAssignment_3_3_1 )
-            // InternalTableDSL.g:10205:3: rule__TableGrid__ToolbarAssignment_3_3_1
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__ToolbarAssignment_3_3_1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getToolbarAssignment_3_3_1()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_3_3__1__Impl"
-
-
-    // $ANTLR start "rule__TableGrid__Group_4__0"
-    // InternalTableDSL.g:10214:1: rule__TableGrid__Group_4__0 : rule__TableGrid__Group_4__0__Impl rule__TableGrid__Group_4__1 ;
-    public final void rule__TableGrid__Group_4__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10218:1: ( rule__TableGrid__Group_4__0__Impl rule__TableGrid__Group_4__1 )
-            // InternalTableDSL.g:10219:2: rule__TableGrid__Group_4__0__Impl rule__TableGrid__Group_4__1
-            {
-            pushFollow(FOLLOW_62);
-            rule__TableGrid__Group_4__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__Group_4__1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_4__0"
-
-
-    // $ANTLR start "rule__TableGrid__Group_4__0__Impl"
-    // InternalTableDSL.g:10226:1: rule__TableGrid__Group_4__0__Impl : ( 'using' ) ;
-    public final void rule__TableGrid__Group_4__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10230:1: ( ( 'using' ) )
-            // InternalTableDSL.g:10231:1: ( 'using' )
-            {
-            // InternalTableDSL.g:10231:1: ( 'using' )
-            // InternalTableDSL.g:10232:2: 'using'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getUsingKeyword_4_0()); 
-            }
-            match(input,82,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getUsingKeyword_4_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_4__0__Impl"
-
-
-    // $ANTLR start "rule__TableGrid__Group_4__1"
-    // InternalTableDSL.g:10241:1: rule__TableGrid__Group_4__1 : rule__TableGrid__Group_4__1__Impl ;
-    public final void rule__TableGrid__Group_4__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10245:1: ( rule__TableGrid__Group_4__1__Impl )
-            // InternalTableDSL.g:10246:2: rule__TableGrid__Group_4__1__Impl
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__Group_4__1__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_4__1"
-
-
-    // $ANTLR start "rule__TableGrid__Group_4__1__Impl"
-    // InternalTableDSL.g:10252:1: rule__TableGrid__Group_4__1__Impl : ( ( rule__TableGrid__SourceAssignment_4_1 ) ) ;
-    public final void rule__TableGrid__Group_4__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:10256:1: ( ( ( rule__TableGrid__SourceAssignment_4_1 ) ) )
-            // InternalTableDSL.g:10257:1: ( ( rule__TableGrid__SourceAssignment_4_1 ) )
-            {
-            // InternalTableDSL.g:10257:1: ( ( rule__TableGrid__SourceAssignment_4_1 ) )
-            // InternalTableDSL.g:10258:2: ( rule__TableGrid__SourceAssignment_4_1 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getSourceAssignment_4_1()); 
-            }
-            // InternalTableDSL.g:10259:2: ( rule__TableGrid__SourceAssignment_4_1 )
-            // InternalTableDSL.g:10259:3: rule__TableGrid__SourceAssignment_4_1
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__SourceAssignment_4_1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getSourceAssignment_4_1()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__Group_4__1__Impl"
-
-
     // $ANTLR start "rule__Property__Group__0"
-    // InternalTableDSL.g:10268:1: rule__Property__Group__0 : rule__Property__Group__0__Impl rule__Property__Group__1 ;
+    // InternalTableDSL.g:9593:1: rule__Property__Group__0 : rule__Property__Group__0__Impl rule__Property__Group__1 ;
     public final void rule__Property__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10272:1: ( rule__Property__Group__0__Impl rule__Property__Group__1 )
-            // InternalTableDSL.g:10273:2: rule__Property__Group__0__Impl rule__Property__Group__1
+            // InternalTableDSL.g:9597:1: ( rule__Property__Group__0__Impl rule__Property__Group__1 )
+            // InternalTableDSL.g:9598:2: rule__Property__Group__0__Impl rule__Property__Group__1
             {
-            pushFollow(FOLLOW_63);
+            pushFollow(FOLLOW_61);
             rule__Property__Group__0__Impl();
 
             state._fsp--;
@@ -35265,31 +33154,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Property__Group__0__Impl"
-    // InternalTableDSL.g:10280:1: rule__Property__Group__0__Impl : ( ( rule__Property__EditableAssignment_0 )? ) ;
+    // InternalTableDSL.g:9605:1: rule__Property__Group__0__Impl : ( ( rule__Property__EditableAssignment_0 )? ) ;
     public final void rule__Property__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10284:1: ( ( ( rule__Property__EditableAssignment_0 )? ) )
-            // InternalTableDSL.g:10285:1: ( ( rule__Property__EditableAssignment_0 )? )
+            // InternalTableDSL.g:9609:1: ( ( ( rule__Property__EditableAssignment_0 )? ) )
+            // InternalTableDSL.g:9610:1: ( ( rule__Property__EditableAssignment_0 )? )
             {
-            // InternalTableDSL.g:10285:1: ( ( rule__Property__EditableAssignment_0 )? )
-            // InternalTableDSL.g:10286:2: ( rule__Property__EditableAssignment_0 )?
+            // InternalTableDSL.g:9610:1: ( ( rule__Property__EditableAssignment_0 )? )
+            // InternalTableDSL.g:9611:2: ( rule__Property__EditableAssignment_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyAccess().getEditableAssignment_0()); 
             }
-            // InternalTableDSL.g:10287:2: ( rule__Property__EditableAssignment_0 )?
-            int alt79=2;
-            int LA79_0 = input.LA(1);
+            // InternalTableDSL.g:9612:2: ( rule__Property__EditableAssignment_0 )?
+            int alt77=2;
+            int LA77_0 = input.LA(1);
 
-            if ( (LA79_0==178) ) {
-                alt79=1;
+            if ( (LA77_0==113) ) {
+                alt77=1;
             }
-            switch (alt79) {
+            switch (alt77) {
                 case 1 :
-                    // InternalTableDSL.g:10287:3: rule__Property__EditableAssignment_0
+                    // InternalTableDSL.g:9612:3: rule__Property__EditableAssignment_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Property__EditableAssignment_0();
@@ -35327,14 +33216,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Property__Group__1"
-    // InternalTableDSL.g:10295:1: rule__Property__Group__1 : rule__Property__Group__1__Impl rule__Property__Group__2 ;
+    // InternalTableDSL.g:9620:1: rule__Property__Group__1 : rule__Property__Group__1__Impl rule__Property__Group__2 ;
     public final void rule__Property__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10299:1: ( rule__Property__Group__1__Impl rule__Property__Group__2 )
-            // InternalTableDSL.g:10300:2: rule__Property__Group__1__Impl rule__Property__Group__2
+            // InternalTableDSL.g:9624:1: ( rule__Property__Group__1__Impl rule__Property__Group__2 )
+            // InternalTableDSL.g:9625:2: rule__Property__Group__1__Impl rule__Property__Group__2
             {
             pushFollow(FOLLOW_7);
             rule__Property__Group__1__Impl();
@@ -35365,22 +33254,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Property__Group__1__Impl"
-    // InternalTableDSL.g:10307:1: rule__Property__Group__1__Impl : ( 'prop' ) ;
+    // InternalTableDSL.g:9632:1: rule__Property__Group__1__Impl : ( 'prop' ) ;
     public final void rule__Property__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10311:1: ( ( 'prop' ) )
-            // InternalTableDSL.g:10312:1: ( 'prop' )
+            // InternalTableDSL.g:9636:1: ( ( 'prop' ) )
+            // InternalTableDSL.g:9637:1: ( 'prop' )
             {
-            // InternalTableDSL.g:10312:1: ( 'prop' )
-            // InternalTableDSL.g:10313:2: 'prop'
+            // InternalTableDSL.g:9637:1: ( 'prop' )
+            // InternalTableDSL.g:9638:2: 'prop'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyAccess().getPropKeyword_1()); 
             }
-            match(input,115,FOLLOW_2); if (state.failed) return ;
+            match(input,114,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPropertyAccess().getPropKeyword_1()); 
             }
@@ -35406,16 +33295,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Property__Group__2"
-    // InternalTableDSL.g:10322:1: rule__Property__Group__2 : rule__Property__Group__2__Impl rule__Property__Group__3 ;
+    // InternalTableDSL.g:9647:1: rule__Property__Group__2 : rule__Property__Group__2__Impl rule__Property__Group__3 ;
     public final void rule__Property__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10326:1: ( rule__Property__Group__2__Impl rule__Property__Group__3 )
-            // InternalTableDSL.g:10327:2: rule__Property__Group__2__Impl rule__Property__Group__3
+            // InternalTableDSL.g:9651:1: ( rule__Property__Group__2__Impl rule__Property__Group__3 )
+            // InternalTableDSL.g:9652:2: rule__Property__Group__2__Impl rule__Property__Group__3
             {
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_62);
             rule__Property__Group__2__Impl();
 
             state._fsp--;
@@ -35444,23 +33333,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Property__Group__2__Impl"
-    // InternalTableDSL.g:10334:1: rule__Property__Group__2__Impl : ( ( rule__Property__PathAssignment_2 ) ) ;
+    // InternalTableDSL.g:9659:1: rule__Property__Group__2__Impl : ( ( rule__Property__PathAssignment_2 ) ) ;
     public final void rule__Property__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10338:1: ( ( ( rule__Property__PathAssignment_2 ) ) )
-            // InternalTableDSL.g:10339:1: ( ( rule__Property__PathAssignment_2 ) )
+            // InternalTableDSL.g:9663:1: ( ( ( rule__Property__PathAssignment_2 ) ) )
+            // InternalTableDSL.g:9664:1: ( ( rule__Property__PathAssignment_2 ) )
             {
-            // InternalTableDSL.g:10339:1: ( ( rule__Property__PathAssignment_2 ) )
-            // InternalTableDSL.g:10340:2: ( rule__Property__PathAssignment_2 )
+            // InternalTableDSL.g:9664:1: ( ( rule__Property__PathAssignment_2 ) )
+            // InternalTableDSL.g:9665:2: ( rule__Property__PathAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyAccess().getPathAssignment_2()); 
             }
-            // InternalTableDSL.g:10341:2: ( rule__Property__PathAssignment_2 )
-            // InternalTableDSL.g:10341:3: rule__Property__PathAssignment_2
+            // InternalTableDSL.g:9666:2: ( rule__Property__PathAssignment_2 )
+            // InternalTableDSL.g:9666:3: rule__Property__PathAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__Property__PathAssignment_2();
@@ -35495,16 +33384,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Property__Group__3"
-    // InternalTableDSL.g:10349:1: rule__Property__Group__3 : rule__Property__Group__3__Impl rule__Property__Group__4 ;
+    // InternalTableDSL.g:9674:1: rule__Property__Group__3 : rule__Property__Group__3__Impl rule__Property__Group__4 ;
     public final void rule__Property__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10353:1: ( rule__Property__Group__3__Impl rule__Property__Group__4 )
-            // InternalTableDSL.g:10354:2: rule__Property__Group__3__Impl rule__Property__Group__4
+            // InternalTableDSL.g:9678:1: ( rule__Property__Group__3__Impl rule__Property__Group__4 )
+            // InternalTableDSL.g:9679:2: rule__Property__Group__3__Impl rule__Property__Group__4
             {
-            pushFollow(FOLLOW_65);
+            pushFollow(FOLLOW_63);
             rule__Property__Group__3__Impl();
 
             state._fsp--;
@@ -35533,22 +33422,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Property__Group__3__Impl"
-    // InternalTableDSL.g:10361:1: rule__Property__Group__3__Impl : ( 'style' ) ;
+    // InternalTableDSL.g:9686:1: rule__Property__Group__3__Impl : ( 'style' ) ;
     public final void rule__Property__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10365:1: ( ( 'style' ) )
-            // InternalTableDSL.g:10366:1: ( 'style' )
+            // InternalTableDSL.g:9690:1: ( ( 'style' ) )
+            // InternalTableDSL.g:9691:1: ( 'style' )
             {
-            // InternalTableDSL.g:10366:1: ( 'style' )
-            // InternalTableDSL.g:10367:2: 'style'
+            // InternalTableDSL.g:9691:1: ( 'style' )
+            // InternalTableDSL.g:9692:2: 'style'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyAccess().getStyleKeyword_3()); 
             }
-            match(input,116,FOLLOW_2); if (state.failed) return ;
+            match(input,115,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPropertyAccess().getStyleKeyword_3()); 
             }
@@ -35574,14 +33463,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Property__Group__4"
-    // InternalTableDSL.g:10376:1: rule__Property__Group__4 : rule__Property__Group__4__Impl ;
+    // InternalTableDSL.g:9701:1: rule__Property__Group__4 : rule__Property__Group__4__Impl ;
     public final void rule__Property__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10380:1: ( rule__Property__Group__4__Impl )
-            // InternalTableDSL.g:10381:2: rule__Property__Group__4__Impl
+            // InternalTableDSL.g:9705:1: ( rule__Property__Group__4__Impl )
+            // InternalTableDSL.g:9706:2: rule__Property__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Property__Group__4__Impl();
@@ -35607,23 +33496,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Property__Group__4__Impl"
-    // InternalTableDSL.g:10387:1: rule__Property__Group__4__Impl : ( ( rule__Property__StyleAssignment_4 ) ) ;
+    // InternalTableDSL.g:9712:1: rule__Property__Group__4__Impl : ( ( rule__Property__StyleAssignment_4 ) ) ;
     public final void rule__Property__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10391:1: ( ( ( rule__Property__StyleAssignment_4 ) ) )
-            // InternalTableDSL.g:10392:1: ( ( rule__Property__StyleAssignment_4 ) )
+            // InternalTableDSL.g:9716:1: ( ( ( rule__Property__StyleAssignment_4 ) ) )
+            // InternalTableDSL.g:9717:1: ( ( rule__Property__StyleAssignment_4 ) )
             {
-            // InternalTableDSL.g:10392:1: ( ( rule__Property__StyleAssignment_4 ) )
-            // InternalTableDSL.g:10393:2: ( rule__Property__StyleAssignment_4 )
+            // InternalTableDSL.g:9717:1: ( ( rule__Property__StyleAssignment_4 ) )
+            // InternalTableDSL.g:9718:2: ( rule__Property__StyleAssignment_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyAccess().getStyleAssignment_4()); 
             }
-            // InternalTableDSL.g:10394:2: ( rule__Property__StyleAssignment_4 )
-            // InternalTableDSL.g:10394:3: rule__Property__StyleAssignment_4
+            // InternalTableDSL.g:9719:2: ( rule__Property__StyleAssignment_4 )
+            // InternalTableDSL.g:9719:3: rule__Property__StyleAssignment_4
             {
             pushFollow(FOLLOW_2);
             rule__Property__StyleAssignment_4();
@@ -35658,14 +33547,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDtoDatasource__Group__0"
-    // InternalTableDSL.g:10403:1: rule__TableDtoDatasource__Group__0 : rule__TableDtoDatasource__Group__0__Impl rule__TableDtoDatasource__Group__1 ;
+    // InternalTableDSL.g:9728:1: rule__TableDtoDatasource__Group__0 : rule__TableDtoDatasource__Group__0__Impl rule__TableDtoDatasource__Group__1 ;
     public final void rule__TableDtoDatasource__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10407:1: ( rule__TableDtoDatasource__Group__0__Impl rule__TableDtoDatasource__Group__1 )
-            // InternalTableDSL.g:10408:2: rule__TableDtoDatasource__Group__0__Impl rule__TableDtoDatasource__Group__1
+            // InternalTableDSL.g:9732:1: ( rule__TableDtoDatasource__Group__0__Impl rule__TableDtoDatasource__Group__1 )
+            // InternalTableDSL.g:9733:2: rule__TableDtoDatasource__Group__0__Impl rule__TableDtoDatasource__Group__1
             {
             pushFollow(FOLLOW_7);
             rule__TableDtoDatasource__Group__0__Impl();
@@ -35696,22 +33585,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDtoDatasource__Group__0__Impl"
-    // InternalTableDSL.g:10415:1: rule__TableDtoDatasource__Group__0__Impl : ( 'dto' ) ;
+    // InternalTableDSL.g:9740:1: rule__TableDtoDatasource__Group__0__Impl : ( 'dto' ) ;
     public final void rule__TableDtoDatasource__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10419:1: ( ( 'dto' ) )
-            // InternalTableDSL.g:10420:1: ( 'dto' )
+            // InternalTableDSL.g:9744:1: ( ( 'dto' ) )
+            // InternalTableDSL.g:9745:1: ( 'dto' )
             {
-            // InternalTableDSL.g:10420:1: ( 'dto' )
-            // InternalTableDSL.g:10421:2: 'dto'
+            // InternalTableDSL.g:9745:1: ( 'dto' )
+            // InternalTableDSL.g:9746:2: 'dto'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDtoDatasourceAccess().getDtoKeyword_0()); 
             }
-            match(input,117,FOLLOW_2); if (state.failed) return ;
+            match(input,116,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTableDtoDatasourceAccess().getDtoKeyword_0()); 
             }
@@ -35737,14 +33626,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDtoDatasource__Group__1"
-    // InternalTableDSL.g:10430:1: rule__TableDtoDatasource__Group__1 : rule__TableDtoDatasource__Group__1__Impl rule__TableDtoDatasource__Group__2 ;
+    // InternalTableDSL.g:9755:1: rule__TableDtoDatasource__Group__1 : rule__TableDtoDatasource__Group__1__Impl rule__TableDtoDatasource__Group__2 ;
     public final void rule__TableDtoDatasource__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10434:1: ( rule__TableDtoDatasource__Group__1__Impl rule__TableDtoDatasource__Group__2 )
-            // InternalTableDSL.g:10435:2: rule__TableDtoDatasource__Group__1__Impl rule__TableDtoDatasource__Group__2
+            // InternalTableDSL.g:9759:1: ( rule__TableDtoDatasource__Group__1__Impl rule__TableDtoDatasource__Group__2 )
+            // InternalTableDSL.g:9760:2: rule__TableDtoDatasource__Group__1__Impl rule__TableDtoDatasource__Group__2
             {
             pushFollow(FOLLOW_8);
             rule__TableDtoDatasource__Group__1__Impl();
@@ -35775,23 +33664,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDtoDatasource__Group__1__Impl"
-    // InternalTableDSL.g:10442:1: rule__TableDtoDatasource__Group__1__Impl : ( ( rule__TableDtoDatasource__DtoSourceAssignment_1 ) ) ;
+    // InternalTableDSL.g:9767:1: rule__TableDtoDatasource__Group__1__Impl : ( ( rule__TableDtoDatasource__DtoSourceAssignment_1 ) ) ;
     public final void rule__TableDtoDatasource__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10446:1: ( ( ( rule__TableDtoDatasource__DtoSourceAssignment_1 ) ) )
-            // InternalTableDSL.g:10447:1: ( ( rule__TableDtoDatasource__DtoSourceAssignment_1 ) )
+            // InternalTableDSL.g:9771:1: ( ( ( rule__TableDtoDatasource__DtoSourceAssignment_1 ) ) )
+            // InternalTableDSL.g:9772:1: ( ( rule__TableDtoDatasource__DtoSourceAssignment_1 ) )
             {
-            // InternalTableDSL.g:10447:1: ( ( rule__TableDtoDatasource__DtoSourceAssignment_1 ) )
-            // InternalTableDSL.g:10448:2: ( rule__TableDtoDatasource__DtoSourceAssignment_1 )
+            // InternalTableDSL.g:9772:1: ( ( rule__TableDtoDatasource__DtoSourceAssignment_1 ) )
+            // InternalTableDSL.g:9773:2: ( rule__TableDtoDatasource__DtoSourceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDtoDatasourceAccess().getDtoSourceAssignment_1()); 
             }
-            // InternalTableDSL.g:10449:2: ( rule__TableDtoDatasource__DtoSourceAssignment_1 )
-            // InternalTableDSL.g:10449:3: rule__TableDtoDatasource__DtoSourceAssignment_1
+            // InternalTableDSL.g:9774:2: ( rule__TableDtoDatasource__DtoSourceAssignment_1 )
+            // InternalTableDSL.g:9774:3: rule__TableDtoDatasource__DtoSourceAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__TableDtoDatasource__DtoSourceAssignment_1();
@@ -35826,14 +33715,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDtoDatasource__Group__2"
-    // InternalTableDSL.g:10457:1: rule__TableDtoDatasource__Group__2 : rule__TableDtoDatasource__Group__2__Impl ;
+    // InternalTableDSL.g:9782:1: rule__TableDtoDatasource__Group__2 : rule__TableDtoDatasource__Group__2__Impl ;
     public final void rule__TableDtoDatasource__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10461:1: ( rule__TableDtoDatasource__Group__2__Impl )
-            // InternalTableDSL.g:10462:2: rule__TableDtoDatasource__Group__2__Impl
+            // InternalTableDSL.g:9786:1: ( rule__TableDtoDatasource__Group__2__Impl )
+            // InternalTableDSL.g:9787:2: rule__TableDtoDatasource__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableDtoDatasource__Group__2__Impl();
@@ -35859,31 +33748,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDtoDatasource__Group__2__Impl"
-    // InternalTableDSL.g:10468:1: rule__TableDtoDatasource__Group__2__Impl : ( ( rule__TableDtoDatasource__Group_2__0 )? ) ;
+    // InternalTableDSL.g:9793:1: rule__TableDtoDatasource__Group__2__Impl : ( ( rule__TableDtoDatasource__Group_2__0 )? ) ;
     public final void rule__TableDtoDatasource__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10472:1: ( ( ( rule__TableDtoDatasource__Group_2__0 )? ) )
-            // InternalTableDSL.g:10473:1: ( ( rule__TableDtoDatasource__Group_2__0 )? )
+            // InternalTableDSL.g:9797:1: ( ( ( rule__TableDtoDatasource__Group_2__0 )? ) )
+            // InternalTableDSL.g:9798:1: ( ( rule__TableDtoDatasource__Group_2__0 )? )
             {
-            // InternalTableDSL.g:10473:1: ( ( rule__TableDtoDatasource__Group_2__0 )? )
-            // InternalTableDSL.g:10474:2: ( rule__TableDtoDatasource__Group_2__0 )?
+            // InternalTableDSL.g:9798:1: ( ( rule__TableDtoDatasource__Group_2__0 )? )
+            // InternalTableDSL.g:9799:2: ( rule__TableDtoDatasource__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDtoDatasourceAccess().getGroup_2()); 
             }
-            // InternalTableDSL.g:10475:2: ( rule__TableDtoDatasource__Group_2__0 )?
-            int alt80=2;
-            int LA80_0 = input.LA(1);
+            // InternalTableDSL.g:9800:2: ( rule__TableDtoDatasource__Group_2__0 )?
+            int alt78=2;
+            int LA78_0 = input.LA(1);
 
-            if ( (LA80_0==75) ) {
-                alt80=1;
+            if ( (LA78_0==75) ) {
+                alt78=1;
             }
-            switch (alt80) {
+            switch (alt78) {
                 case 1 :
-                    // InternalTableDSL.g:10475:3: rule__TableDtoDatasource__Group_2__0
+                    // InternalTableDSL.g:9800:3: rule__TableDtoDatasource__Group_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableDtoDatasource__Group_2__0();
@@ -35921,16 +33810,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDtoDatasource__Group_2__0"
-    // InternalTableDSL.g:10484:1: rule__TableDtoDatasource__Group_2__0 : rule__TableDtoDatasource__Group_2__0__Impl rule__TableDtoDatasource__Group_2__1 ;
+    // InternalTableDSL.g:9809:1: rule__TableDtoDatasource__Group_2__0 : rule__TableDtoDatasource__Group_2__0__Impl rule__TableDtoDatasource__Group_2__1 ;
     public final void rule__TableDtoDatasource__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10488:1: ( rule__TableDtoDatasource__Group_2__0__Impl rule__TableDtoDatasource__Group_2__1 )
-            // InternalTableDSL.g:10489:2: rule__TableDtoDatasource__Group_2__0__Impl rule__TableDtoDatasource__Group_2__1
+            // InternalTableDSL.g:9813:1: ( rule__TableDtoDatasource__Group_2__0__Impl rule__TableDtoDatasource__Group_2__1 )
+            // InternalTableDSL.g:9814:2: rule__TableDtoDatasource__Group_2__0__Impl rule__TableDtoDatasource__Group_2__1
             {
-            pushFollow(FOLLOW_66);
+            pushFollow(FOLLOW_64);
             rule__TableDtoDatasource__Group_2__0__Impl();
 
             state._fsp--;
@@ -35959,17 +33848,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDtoDatasource__Group_2__0__Impl"
-    // InternalTableDSL.g:10496:1: rule__TableDtoDatasource__Group_2__0__Impl : ( '{' ) ;
+    // InternalTableDSL.g:9821:1: rule__TableDtoDatasource__Group_2__0__Impl : ( '{' ) ;
     public final void rule__TableDtoDatasource__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10500:1: ( ( '{' ) )
-            // InternalTableDSL.g:10501:1: ( '{' )
+            // InternalTableDSL.g:9825:1: ( ( '{' ) )
+            // InternalTableDSL.g:9826:1: ( '{' )
             {
-            // InternalTableDSL.g:10501:1: ( '{' )
-            // InternalTableDSL.g:10502:2: '{'
+            // InternalTableDSL.g:9826:1: ( '{' )
+            // InternalTableDSL.g:9827:2: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDtoDatasourceAccess().getLeftCurlyBracketKeyword_2_0()); 
@@ -36000,16 +33889,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDtoDatasource__Group_2__1"
-    // InternalTableDSL.g:10511:1: rule__TableDtoDatasource__Group_2__1 : rule__TableDtoDatasource__Group_2__1__Impl rule__TableDtoDatasource__Group_2__2 ;
+    // InternalTableDSL.g:9836:1: rule__TableDtoDatasource__Group_2__1 : rule__TableDtoDatasource__Group_2__1__Impl rule__TableDtoDatasource__Group_2__2 ;
     public final void rule__TableDtoDatasource__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10515:1: ( rule__TableDtoDatasource__Group_2__1__Impl rule__TableDtoDatasource__Group_2__2 )
-            // InternalTableDSL.g:10516:2: rule__TableDtoDatasource__Group_2__1__Impl rule__TableDtoDatasource__Group_2__2
+            // InternalTableDSL.g:9840:1: ( rule__TableDtoDatasource__Group_2__1__Impl rule__TableDtoDatasource__Group_2__2 )
+            // InternalTableDSL.g:9841:2: rule__TableDtoDatasource__Group_2__1__Impl rule__TableDtoDatasource__Group_2__2
             {
-            pushFollow(FOLLOW_66);
+            pushFollow(FOLLOW_64);
             rule__TableDtoDatasource__Group_2__1__Impl();
 
             state._fsp--;
@@ -36038,37 +33927,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDtoDatasource__Group_2__1__Impl"
-    // InternalTableDSL.g:10523:1: rule__TableDtoDatasource__Group_2__1__Impl : ( ( rule__TableDtoDatasource__PropertiesAssignment_2_1 )* ) ;
+    // InternalTableDSL.g:9848:1: rule__TableDtoDatasource__Group_2__1__Impl : ( ( rule__TableDtoDatasource__PropertiesAssignment_2_1 )* ) ;
     public final void rule__TableDtoDatasource__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10527:1: ( ( ( rule__TableDtoDatasource__PropertiesAssignment_2_1 )* ) )
-            // InternalTableDSL.g:10528:1: ( ( rule__TableDtoDatasource__PropertiesAssignment_2_1 )* )
+            // InternalTableDSL.g:9852:1: ( ( ( rule__TableDtoDatasource__PropertiesAssignment_2_1 )* ) )
+            // InternalTableDSL.g:9853:1: ( ( rule__TableDtoDatasource__PropertiesAssignment_2_1 )* )
             {
-            // InternalTableDSL.g:10528:1: ( ( rule__TableDtoDatasource__PropertiesAssignment_2_1 )* )
-            // InternalTableDSL.g:10529:2: ( rule__TableDtoDatasource__PropertiesAssignment_2_1 )*
+            // InternalTableDSL.g:9853:1: ( ( rule__TableDtoDatasource__PropertiesAssignment_2_1 )* )
+            // InternalTableDSL.g:9854:2: ( rule__TableDtoDatasource__PropertiesAssignment_2_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDtoDatasourceAccess().getPropertiesAssignment_2_1()); 
             }
-            // InternalTableDSL.g:10530:2: ( rule__TableDtoDatasource__PropertiesAssignment_2_1 )*
-            loop81:
+            // InternalTableDSL.g:9855:2: ( rule__TableDtoDatasource__PropertiesAssignment_2_1 )*
+            loop79:
             do {
-                int alt81=2;
-                int LA81_0 = input.LA(1);
+                int alt79=2;
+                int LA79_0 = input.LA(1);
 
-                if ( (LA81_0==115||LA81_0==178) ) {
-                    alt81=1;
+                if ( ((LA79_0>=113 && LA79_0<=114)) ) {
+                    alt79=1;
                 }
 
 
-                switch (alt81) {
+                switch (alt79) {
             	case 1 :
-            	    // InternalTableDSL.g:10530:3: rule__TableDtoDatasource__PropertiesAssignment_2_1
+            	    // InternalTableDSL.g:9855:3: rule__TableDtoDatasource__PropertiesAssignment_2_1
             	    {
-            	    pushFollow(FOLLOW_67);
+            	    pushFollow(FOLLOW_65);
             	    rule__TableDtoDatasource__PropertiesAssignment_2_1();
 
             	    state._fsp--;
@@ -36078,7 +33967,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop81;
+            	    break loop79;
                 }
             } while (true);
 
@@ -36107,14 +33996,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDtoDatasource__Group_2__2"
-    // InternalTableDSL.g:10538:1: rule__TableDtoDatasource__Group_2__2 : rule__TableDtoDatasource__Group_2__2__Impl ;
+    // InternalTableDSL.g:9863:1: rule__TableDtoDatasource__Group_2__2 : rule__TableDtoDatasource__Group_2__2__Impl ;
     public final void rule__TableDtoDatasource__Group_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10542:1: ( rule__TableDtoDatasource__Group_2__2__Impl )
-            // InternalTableDSL.g:10543:2: rule__TableDtoDatasource__Group_2__2__Impl
+            // InternalTableDSL.g:9867:1: ( rule__TableDtoDatasource__Group_2__2__Impl )
+            // InternalTableDSL.g:9868:2: rule__TableDtoDatasource__Group_2__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableDtoDatasource__Group_2__2__Impl();
@@ -36140,17 +34029,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDtoDatasource__Group_2__2__Impl"
-    // InternalTableDSL.g:10549:1: rule__TableDtoDatasource__Group_2__2__Impl : ( '}' ) ;
+    // InternalTableDSL.g:9874:1: rule__TableDtoDatasource__Group_2__2__Impl : ( '}' ) ;
     public final void rule__TableDtoDatasource__Group_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10553:1: ( ( '}' ) )
-            // InternalTableDSL.g:10554:1: ( '}' )
+            // InternalTableDSL.g:9878:1: ( ( '}' ) )
+            // InternalTableDSL.g:9879:1: ( '}' )
             {
-            // InternalTableDSL.g:10554:1: ( '}' )
-            // InternalTableDSL.g:10555:2: '}'
+            // InternalTableDSL.g:9879:1: ( '}' )
+            // InternalTableDSL.g:9880:2: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDtoDatasourceAccess().getRightCurlyBracketKeyword_2_2()); 
@@ -36181,14 +34070,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedField__Group__0"
-    // InternalTableDSL.g:10565:1: rule__NestedField__Group__0 : rule__NestedField__Group__0__Impl rule__NestedField__Group__1 ;
+    // InternalTableDSL.g:9890:1: rule__NestedField__Group__0 : rule__NestedField__Group__0__Impl rule__NestedField__Group__1 ;
     public final void rule__NestedField__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10569:1: ( rule__NestedField__Group__0__Impl rule__NestedField__Group__1 )
-            // InternalTableDSL.g:10570:2: rule__NestedField__Group__0__Impl rule__NestedField__Group__1
+            // InternalTableDSL.g:9894:1: ( rule__NestedField__Group__0__Impl rule__NestedField__Group__1 )
+            // InternalTableDSL.g:9895:2: rule__NestedField__Group__0__Impl rule__NestedField__Group__1
             {
             pushFollow(FOLLOW_7);
             rule__NestedField__Group__0__Impl();
@@ -36219,23 +34108,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedField__Group__0__Impl"
-    // InternalTableDSL.g:10577:1: rule__NestedField__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:9902:1: rule__NestedField__Group__0__Impl : ( () ) ;
     public final void rule__NestedField__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10581:1: ( ( () ) )
-            // InternalTableDSL.g:10582:1: ( () )
+            // InternalTableDSL.g:9906:1: ( ( () ) )
+            // InternalTableDSL.g:9907:1: ( () )
             {
-            // InternalTableDSL.g:10582:1: ( () )
-            // InternalTableDSL.g:10583:2: ()
+            // InternalTableDSL.g:9907:1: ( () )
+            // InternalTableDSL.g:9908:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedFieldAccess().getCxGridNestedFieldAction_0()); 
             }
-            // InternalTableDSL.g:10584:2: ()
-            // InternalTableDSL.g:10584:3: 
+            // InternalTableDSL.g:9909:2: ()
+            // InternalTableDSL.g:9909:3: 
             {
             }
 
@@ -36260,16 +34149,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedField__Group__1"
-    // InternalTableDSL.g:10592:1: rule__NestedField__Group__1 : rule__NestedField__Group__1__Impl rule__NestedField__Group__2 ;
+    // InternalTableDSL.g:9917:1: rule__NestedField__Group__1 : rule__NestedField__Group__1__Impl rule__NestedField__Group__2 ;
     public final void rule__NestedField__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10596:1: ( rule__NestedField__Group__1__Impl rule__NestedField__Group__2 )
-            // InternalTableDSL.g:10597:2: rule__NestedField__Group__1__Impl rule__NestedField__Group__2
+            // InternalTableDSL.g:9921:1: ( rule__NestedField__Group__1__Impl rule__NestedField__Group__2 )
+            // InternalTableDSL.g:9922:2: rule__NestedField__Group__1__Impl rule__NestedField__Group__2
             {
-            pushFollow(FOLLOW_68);
+            pushFollow(FOLLOW_66);
             rule__NestedField__Group__1__Impl();
 
             state._fsp--;
@@ -36298,23 +34187,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedField__Group__1__Impl"
-    // InternalTableDSL.g:10604:1: rule__NestedField__Group__1__Impl : ( ( rule__NestedField__FieldAssignment_1 ) ) ;
+    // InternalTableDSL.g:9929:1: rule__NestedField__Group__1__Impl : ( ( rule__NestedField__FieldAssignment_1 ) ) ;
     public final void rule__NestedField__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10608:1: ( ( ( rule__NestedField__FieldAssignment_1 ) ) )
-            // InternalTableDSL.g:10609:1: ( ( rule__NestedField__FieldAssignment_1 ) )
+            // InternalTableDSL.g:9933:1: ( ( ( rule__NestedField__FieldAssignment_1 ) ) )
+            // InternalTableDSL.g:9934:1: ( ( rule__NestedField__FieldAssignment_1 ) )
             {
-            // InternalTableDSL.g:10609:1: ( ( rule__NestedField__FieldAssignment_1 ) )
-            // InternalTableDSL.g:10610:2: ( rule__NestedField__FieldAssignment_1 )
+            // InternalTableDSL.g:9934:1: ( ( rule__NestedField__FieldAssignment_1 ) )
+            // InternalTableDSL.g:9935:2: ( rule__NestedField__FieldAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedFieldAccess().getFieldAssignment_1()); 
             }
-            // InternalTableDSL.g:10611:2: ( rule__NestedField__FieldAssignment_1 )
-            // InternalTableDSL.g:10611:3: rule__NestedField__FieldAssignment_1
+            // InternalTableDSL.g:9936:2: ( rule__NestedField__FieldAssignment_1 )
+            // InternalTableDSL.g:9936:3: rule__NestedField__FieldAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__NestedField__FieldAssignment_1();
@@ -36349,14 +34238,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedField__Group__2"
-    // InternalTableDSL.g:10619:1: rule__NestedField__Group__2 : rule__NestedField__Group__2__Impl ;
+    // InternalTableDSL.g:9944:1: rule__NestedField__Group__2 : rule__NestedField__Group__2__Impl ;
     public final void rule__NestedField__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10623:1: ( rule__NestedField__Group__2__Impl )
-            // InternalTableDSL.g:10624:2: rule__NestedField__Group__2__Impl
+            // InternalTableDSL.g:9948:1: ( rule__NestedField__Group__2__Impl )
+            // InternalTableDSL.g:9949:2: rule__NestedField__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__NestedField__Group__2__Impl();
@@ -36382,31 +34271,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedField__Group__2__Impl"
-    // InternalTableDSL.g:10630:1: rule__NestedField__Group__2__Impl : ( ( rule__NestedField__PathAssignment_2 )? ) ;
+    // InternalTableDSL.g:9955:1: rule__NestedField__Group__2__Impl : ( ( rule__NestedField__PathAssignment_2 )? ) ;
     public final void rule__NestedField__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10634:1: ( ( ( rule__NestedField__PathAssignment_2 )? ) )
-            // InternalTableDSL.g:10635:1: ( ( rule__NestedField__PathAssignment_2 )? )
+            // InternalTableDSL.g:9959:1: ( ( ( rule__NestedField__PathAssignment_2 )? ) )
+            // InternalTableDSL.g:9960:1: ( ( rule__NestedField__PathAssignment_2 )? )
             {
-            // InternalTableDSL.g:10635:1: ( ( rule__NestedField__PathAssignment_2 )? )
-            // InternalTableDSL.g:10636:2: ( rule__NestedField__PathAssignment_2 )?
+            // InternalTableDSL.g:9960:1: ( ( rule__NestedField__PathAssignment_2 )? )
+            // InternalTableDSL.g:9961:2: ( rule__NestedField__PathAssignment_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedFieldAccess().getPathAssignment_2()); 
             }
-            // InternalTableDSL.g:10637:2: ( rule__NestedField__PathAssignment_2 )?
-            int alt82=2;
-            int LA82_0 = input.LA(1);
+            // InternalTableDSL.g:9962:2: ( rule__NestedField__PathAssignment_2 )?
+            int alt80=2;
+            int LA80_0 = input.LA(1);
 
-            if ( (LA82_0==46) ) {
-                alt82=1;
+            if ( (LA80_0==46) ) {
+                alt80=1;
             }
-            switch (alt82) {
+            switch (alt80) {
                 case 1 :
-                    // InternalTableDSL.g:10637:3: rule__NestedField__PathAssignment_2
+                    // InternalTableDSL.g:9962:3: rule__NestedField__PathAssignment_2
                     {
                     pushFollow(FOLLOW_2);
                     rule__NestedField__PathAssignment_2();
@@ -36444,16 +34333,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedPath__Group__0"
-    // InternalTableDSL.g:10646:1: rule__NestedPath__Group__0 : rule__NestedPath__Group__0__Impl rule__NestedPath__Group__1 ;
+    // InternalTableDSL.g:9971:1: rule__NestedPath__Group__0 : rule__NestedPath__Group__0__Impl rule__NestedPath__Group__1 ;
     public final void rule__NestedPath__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10650:1: ( rule__NestedPath__Group__0__Impl rule__NestedPath__Group__1 )
-            // InternalTableDSL.g:10651:2: rule__NestedPath__Group__0__Impl rule__NestedPath__Group__1
+            // InternalTableDSL.g:9975:1: ( rule__NestedPath__Group__0__Impl rule__NestedPath__Group__1 )
+            // InternalTableDSL.g:9976:2: rule__NestedPath__Group__0__Impl rule__NestedPath__Group__1
             {
-            pushFollow(FOLLOW_68);
+            pushFollow(FOLLOW_66);
             rule__NestedPath__Group__0__Impl();
 
             state._fsp--;
@@ -36482,23 +34371,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedPath__Group__0__Impl"
-    // InternalTableDSL.g:10658:1: rule__NestedPath__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:9983:1: rule__NestedPath__Group__0__Impl : ( () ) ;
     public final void rule__NestedPath__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10662:1: ( ( () ) )
-            // InternalTableDSL.g:10663:1: ( () )
+            // InternalTableDSL.g:9987:1: ( ( () ) )
+            // InternalTableDSL.g:9988:1: ( () )
             {
-            // InternalTableDSL.g:10663:1: ( () )
-            // InternalTableDSL.g:10664:2: ()
+            // InternalTableDSL.g:9988:1: ( () )
+            // InternalTableDSL.g:9989:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedPathAccess().getCxGridNestedPathAction_0()); 
             }
-            // InternalTableDSL.g:10665:2: ()
-            // InternalTableDSL.g:10665:3: 
+            // InternalTableDSL.g:9990:2: ()
+            // InternalTableDSL.g:9990:3: 
             {
             }
 
@@ -36523,14 +34412,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedPath__Group__1"
-    // InternalTableDSL.g:10673:1: rule__NestedPath__Group__1 : rule__NestedPath__Group__1__Impl rule__NestedPath__Group__2 ;
+    // InternalTableDSL.g:9998:1: rule__NestedPath__Group__1 : rule__NestedPath__Group__1__Impl rule__NestedPath__Group__2 ;
     public final void rule__NestedPath__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10677:1: ( rule__NestedPath__Group__1__Impl rule__NestedPath__Group__2 )
-            // InternalTableDSL.g:10678:2: rule__NestedPath__Group__1__Impl rule__NestedPath__Group__2
+            // InternalTableDSL.g:10002:1: ( rule__NestedPath__Group__1__Impl rule__NestedPath__Group__2 )
+            // InternalTableDSL.g:10003:2: rule__NestedPath__Group__1__Impl rule__NestedPath__Group__2
             {
             pushFollow(FOLLOW_7);
             rule__NestedPath__Group__1__Impl();
@@ -36561,17 +34450,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedPath__Group__1__Impl"
-    // InternalTableDSL.g:10685:1: rule__NestedPath__Group__1__Impl : ( '.' ) ;
+    // InternalTableDSL.g:10010:1: rule__NestedPath__Group__1__Impl : ( '.' ) ;
     public final void rule__NestedPath__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10689:1: ( ( '.' ) )
-            // InternalTableDSL.g:10690:1: ( '.' )
+            // InternalTableDSL.g:10014:1: ( ( '.' ) )
+            // InternalTableDSL.g:10015:1: ( '.' )
             {
-            // InternalTableDSL.g:10690:1: ( '.' )
-            // InternalTableDSL.g:10691:2: '.'
+            // InternalTableDSL.g:10015:1: ( '.' )
+            // InternalTableDSL.g:10016:2: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedPathAccess().getFullStopKeyword_1()); 
@@ -36602,16 +34491,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedPath__Group__2"
-    // InternalTableDSL.g:10700:1: rule__NestedPath__Group__2 : rule__NestedPath__Group__2__Impl rule__NestedPath__Group__3 ;
+    // InternalTableDSL.g:10025:1: rule__NestedPath__Group__2 : rule__NestedPath__Group__2__Impl rule__NestedPath__Group__3 ;
     public final void rule__NestedPath__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10704:1: ( rule__NestedPath__Group__2__Impl rule__NestedPath__Group__3 )
-            // InternalTableDSL.g:10705:2: rule__NestedPath__Group__2__Impl rule__NestedPath__Group__3
+            // InternalTableDSL.g:10029:1: ( rule__NestedPath__Group__2__Impl rule__NestedPath__Group__3 )
+            // InternalTableDSL.g:10030:2: rule__NestedPath__Group__2__Impl rule__NestedPath__Group__3
             {
-            pushFollow(FOLLOW_68);
+            pushFollow(FOLLOW_66);
             rule__NestedPath__Group__2__Impl();
 
             state._fsp--;
@@ -36640,23 +34529,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedPath__Group__2__Impl"
-    // InternalTableDSL.g:10712:1: rule__NestedPath__Group__2__Impl : ( ( rule__NestedPath__FieldAssignment_2 ) ) ;
+    // InternalTableDSL.g:10037:1: rule__NestedPath__Group__2__Impl : ( ( rule__NestedPath__FieldAssignment_2 ) ) ;
     public final void rule__NestedPath__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10716:1: ( ( ( rule__NestedPath__FieldAssignment_2 ) ) )
-            // InternalTableDSL.g:10717:1: ( ( rule__NestedPath__FieldAssignment_2 ) )
+            // InternalTableDSL.g:10041:1: ( ( ( rule__NestedPath__FieldAssignment_2 ) ) )
+            // InternalTableDSL.g:10042:1: ( ( rule__NestedPath__FieldAssignment_2 ) )
             {
-            // InternalTableDSL.g:10717:1: ( ( rule__NestedPath__FieldAssignment_2 ) )
-            // InternalTableDSL.g:10718:2: ( rule__NestedPath__FieldAssignment_2 )
+            // InternalTableDSL.g:10042:1: ( ( rule__NestedPath__FieldAssignment_2 ) )
+            // InternalTableDSL.g:10043:2: ( rule__NestedPath__FieldAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedPathAccess().getFieldAssignment_2()); 
             }
-            // InternalTableDSL.g:10719:2: ( rule__NestedPath__FieldAssignment_2 )
-            // InternalTableDSL.g:10719:3: rule__NestedPath__FieldAssignment_2
+            // InternalTableDSL.g:10044:2: ( rule__NestedPath__FieldAssignment_2 )
+            // InternalTableDSL.g:10044:3: rule__NestedPath__FieldAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__NestedPath__FieldAssignment_2();
@@ -36691,14 +34580,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedPath__Group__3"
-    // InternalTableDSL.g:10727:1: rule__NestedPath__Group__3 : rule__NestedPath__Group__3__Impl ;
+    // InternalTableDSL.g:10052:1: rule__NestedPath__Group__3 : rule__NestedPath__Group__3__Impl ;
     public final void rule__NestedPath__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10731:1: ( rule__NestedPath__Group__3__Impl )
-            // InternalTableDSL.g:10732:2: rule__NestedPath__Group__3__Impl
+            // InternalTableDSL.g:10056:1: ( rule__NestedPath__Group__3__Impl )
+            // InternalTableDSL.g:10057:2: rule__NestedPath__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__NestedPath__Group__3__Impl();
@@ -36724,31 +34613,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedPath__Group__3__Impl"
-    // InternalTableDSL.g:10738:1: rule__NestedPath__Group__3__Impl : ( ( rule__NestedPath__PathAssignment_3 )? ) ;
+    // InternalTableDSL.g:10063:1: rule__NestedPath__Group__3__Impl : ( ( rule__NestedPath__PathAssignment_3 )? ) ;
     public final void rule__NestedPath__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10742:1: ( ( ( rule__NestedPath__PathAssignment_3 )? ) )
-            // InternalTableDSL.g:10743:1: ( ( rule__NestedPath__PathAssignment_3 )? )
+            // InternalTableDSL.g:10067:1: ( ( ( rule__NestedPath__PathAssignment_3 )? ) )
+            // InternalTableDSL.g:10068:1: ( ( rule__NestedPath__PathAssignment_3 )? )
             {
-            // InternalTableDSL.g:10743:1: ( ( rule__NestedPath__PathAssignment_3 )? )
-            // InternalTableDSL.g:10744:2: ( rule__NestedPath__PathAssignment_3 )?
+            // InternalTableDSL.g:10068:1: ( ( rule__NestedPath__PathAssignment_3 )? )
+            // InternalTableDSL.g:10069:2: ( rule__NestedPath__PathAssignment_3 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedPathAccess().getPathAssignment_3()); 
             }
-            // InternalTableDSL.g:10745:2: ( rule__NestedPath__PathAssignment_3 )?
-            int alt83=2;
-            int LA83_0 = input.LA(1);
+            // InternalTableDSL.g:10070:2: ( rule__NestedPath__PathAssignment_3 )?
+            int alt81=2;
+            int LA81_0 = input.LA(1);
 
-            if ( (LA83_0==46) ) {
-                alt83=1;
+            if ( (LA81_0==46) ) {
+                alt81=1;
             }
-            switch (alt83) {
+            switch (alt81) {
                 case 1 :
-                    // InternalTableDSL.g:10745:3: rule__NestedPath__PathAssignment_3
+                    // InternalTableDSL.g:10070:3: rule__NestedPath__PathAssignment_3
                     {
                     pushFollow(FOLLOW_2);
                     rule__NestedPath__PathAssignment_3();
@@ -36786,16 +34675,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyButtonStyle__Group__0"
-    // InternalTableDSL.g:10754:1: rule__PropertyButtonStyle__Group__0 : rule__PropertyButtonStyle__Group__0__Impl rule__PropertyButtonStyle__Group__1 ;
+    // InternalTableDSL.g:10079:1: rule__PropertyButtonStyle__Group__0 : rule__PropertyButtonStyle__Group__0__Impl rule__PropertyButtonStyle__Group__1 ;
     public final void rule__PropertyButtonStyle__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10758:1: ( rule__PropertyButtonStyle__Group__0__Impl rule__PropertyButtonStyle__Group__1 )
-            // InternalTableDSL.g:10759:2: rule__PropertyButtonStyle__Group__0__Impl rule__PropertyButtonStyle__Group__1
+            // InternalTableDSL.g:10083:1: ( rule__PropertyButtonStyle__Group__0__Impl rule__PropertyButtonStyle__Group__1 )
+            // InternalTableDSL.g:10084:2: rule__PropertyButtonStyle__Group__0__Impl rule__PropertyButtonStyle__Group__1
             {
-            pushFollow(FOLLOW_69);
+            pushFollow(FOLLOW_67);
             rule__PropertyButtonStyle__Group__0__Impl();
 
             state._fsp--;
@@ -36824,23 +34713,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyButtonStyle__Group__0__Impl"
-    // InternalTableDSL.g:10766:1: rule__PropertyButtonStyle__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:10091:1: rule__PropertyButtonStyle__Group__0__Impl : ( () ) ;
     public final void rule__PropertyButtonStyle__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10770:1: ( ( () ) )
-            // InternalTableDSL.g:10771:1: ( () )
+            // InternalTableDSL.g:10095:1: ( ( () ) )
+            // InternalTableDSL.g:10096:1: ( () )
             {
-            // InternalTableDSL.g:10771:1: ( () )
-            // InternalTableDSL.g:10772:2: ()
+            // InternalTableDSL.g:10096:1: ( () )
+            // InternalTableDSL.g:10097:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyButtonStyleAccess().getCxGridPropButtonStyleAction_0()); 
             }
-            // InternalTableDSL.g:10773:2: ()
-            // InternalTableDSL.g:10773:3: 
+            // InternalTableDSL.g:10098:2: ()
+            // InternalTableDSL.g:10098:3: 
             {
             }
 
@@ -36865,16 +34754,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyButtonStyle__Group__1"
-    // InternalTableDSL.g:10781:1: rule__PropertyButtonStyle__Group__1 : rule__PropertyButtonStyle__Group__1__Impl rule__PropertyButtonStyle__Group__2 ;
+    // InternalTableDSL.g:10106:1: rule__PropertyButtonStyle__Group__1 : rule__PropertyButtonStyle__Group__1__Impl rule__PropertyButtonStyle__Group__2 ;
     public final void rule__PropertyButtonStyle__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10785:1: ( rule__PropertyButtonStyle__Group__1__Impl rule__PropertyButtonStyle__Group__2 )
-            // InternalTableDSL.g:10786:2: rule__PropertyButtonStyle__Group__1__Impl rule__PropertyButtonStyle__Group__2
+            // InternalTableDSL.g:10110:1: ( rule__PropertyButtonStyle__Group__1__Impl rule__PropertyButtonStyle__Group__2 )
+            // InternalTableDSL.g:10111:2: rule__PropertyButtonStyle__Group__1__Impl rule__PropertyButtonStyle__Group__2
             {
-            pushFollow(FOLLOW_70);
+            pushFollow(FOLLOW_68);
             rule__PropertyButtonStyle__Group__1__Impl();
 
             state._fsp--;
@@ -36903,22 +34792,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyButtonStyle__Group__1__Impl"
-    // InternalTableDSL.g:10793:1: rule__PropertyButtonStyle__Group__1__Impl : ( 'buttonStyle' ) ;
+    // InternalTableDSL.g:10118:1: rule__PropertyButtonStyle__Group__1__Impl : ( 'buttonStyle' ) ;
     public final void rule__PropertyButtonStyle__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10797:1: ( ( 'buttonStyle' ) )
-            // InternalTableDSL.g:10798:1: ( 'buttonStyle' )
+            // InternalTableDSL.g:10122:1: ( ( 'buttonStyle' ) )
+            // InternalTableDSL.g:10123:1: ( 'buttonStyle' )
             {
-            // InternalTableDSL.g:10798:1: ( 'buttonStyle' )
-            // InternalTableDSL.g:10799:2: 'buttonStyle'
+            // InternalTableDSL.g:10123:1: ( 'buttonStyle' )
+            // InternalTableDSL.g:10124:2: 'buttonStyle'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyButtonStyleAccess().getButtonStyleKeyword_1()); 
             }
-            match(input,118,FOLLOW_2); if (state.failed) return ;
+            match(input,117,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPropertyButtonStyleAccess().getButtonStyleKeyword_1()); 
             }
@@ -36944,14 +34833,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyButtonStyle__Group__2"
-    // InternalTableDSL.g:10808:1: rule__PropertyButtonStyle__Group__2 : rule__PropertyButtonStyle__Group__2__Impl rule__PropertyButtonStyle__Group__3 ;
+    // InternalTableDSL.g:10133:1: rule__PropertyButtonStyle__Group__2 : rule__PropertyButtonStyle__Group__2__Impl rule__PropertyButtonStyle__Group__3 ;
     public final void rule__PropertyButtonStyle__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10812:1: ( rule__PropertyButtonStyle__Group__2__Impl rule__PropertyButtonStyle__Group__3 )
-            // InternalTableDSL.g:10813:2: rule__PropertyButtonStyle__Group__2__Impl rule__PropertyButtonStyle__Group__3
+            // InternalTableDSL.g:10137:1: ( rule__PropertyButtonStyle__Group__2__Impl rule__PropertyButtonStyle__Group__3 )
+            // InternalTableDSL.g:10138:2: rule__PropertyButtonStyle__Group__2__Impl rule__PropertyButtonStyle__Group__3
             {
             pushFollow(FOLLOW_14);
             rule__PropertyButtonStyle__Group__2__Impl();
@@ -36982,22 +34871,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyButtonStyle__Group__2__Impl"
-    // InternalTableDSL.g:10820:1: rule__PropertyButtonStyle__Group__2__Impl : ( 'eventTopic' ) ;
+    // InternalTableDSL.g:10145:1: rule__PropertyButtonStyle__Group__2__Impl : ( 'eventTopic' ) ;
     public final void rule__PropertyButtonStyle__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10824:1: ( ( 'eventTopic' ) )
-            // InternalTableDSL.g:10825:1: ( 'eventTopic' )
+            // InternalTableDSL.g:10149:1: ( ( 'eventTopic' ) )
+            // InternalTableDSL.g:10150:1: ( 'eventTopic' )
             {
-            // InternalTableDSL.g:10825:1: ( 'eventTopic' )
-            // InternalTableDSL.g:10826:2: 'eventTopic'
+            // InternalTableDSL.g:10150:1: ( 'eventTopic' )
+            // InternalTableDSL.g:10151:2: 'eventTopic'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyButtonStyleAccess().getEventTopicKeyword_2()); 
             }
-            match(input,119,FOLLOW_2); if (state.failed) return ;
+            match(input,118,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPropertyButtonStyleAccess().getEventTopicKeyword_2()); 
             }
@@ -37023,14 +34912,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyButtonStyle__Group__3"
-    // InternalTableDSL.g:10835:1: rule__PropertyButtonStyle__Group__3 : rule__PropertyButtonStyle__Group__3__Impl ;
+    // InternalTableDSL.g:10160:1: rule__PropertyButtonStyle__Group__3 : rule__PropertyButtonStyle__Group__3__Impl ;
     public final void rule__PropertyButtonStyle__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10839:1: ( rule__PropertyButtonStyle__Group__3__Impl )
-            // InternalTableDSL.g:10840:2: rule__PropertyButtonStyle__Group__3__Impl
+            // InternalTableDSL.g:10164:1: ( rule__PropertyButtonStyle__Group__3__Impl )
+            // InternalTableDSL.g:10165:2: rule__PropertyButtonStyle__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PropertyButtonStyle__Group__3__Impl();
@@ -37056,23 +34945,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyButtonStyle__Group__3__Impl"
-    // InternalTableDSL.g:10846:1: rule__PropertyButtonStyle__Group__3__Impl : ( ( rule__PropertyButtonStyle__EventTopicAssignment_3 ) ) ;
+    // InternalTableDSL.g:10171:1: rule__PropertyButtonStyle__Group__3__Impl : ( ( rule__PropertyButtonStyle__EventTopicAssignment_3 ) ) ;
     public final void rule__PropertyButtonStyle__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10850:1: ( ( ( rule__PropertyButtonStyle__EventTopicAssignment_3 ) ) )
-            // InternalTableDSL.g:10851:1: ( ( rule__PropertyButtonStyle__EventTopicAssignment_3 ) )
+            // InternalTableDSL.g:10175:1: ( ( ( rule__PropertyButtonStyle__EventTopicAssignment_3 ) ) )
+            // InternalTableDSL.g:10176:1: ( ( rule__PropertyButtonStyle__EventTopicAssignment_3 ) )
             {
-            // InternalTableDSL.g:10851:1: ( ( rule__PropertyButtonStyle__EventTopicAssignment_3 ) )
-            // InternalTableDSL.g:10852:2: ( rule__PropertyButtonStyle__EventTopicAssignment_3 )
+            // InternalTableDSL.g:10176:1: ( ( rule__PropertyButtonStyle__EventTopicAssignment_3 ) )
+            // InternalTableDSL.g:10177:2: ( rule__PropertyButtonStyle__EventTopicAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyButtonStyleAccess().getEventTopicAssignment_3()); 
             }
-            // InternalTableDSL.g:10853:2: ( rule__PropertyButtonStyle__EventTopicAssignment_3 )
-            // InternalTableDSL.g:10853:3: rule__PropertyButtonStyle__EventTopicAssignment_3
+            // InternalTableDSL.g:10178:2: ( rule__PropertyButtonStyle__EventTopicAssignment_3 )
+            // InternalTableDSL.g:10178:3: rule__PropertyButtonStyle__EventTopicAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__PropertyButtonStyle__EventTopicAssignment_3();
@@ -37107,16 +34996,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyHtmlStyle__Group__0"
-    // InternalTableDSL.g:10862:1: rule__PropertyHtmlStyle__Group__0 : rule__PropertyHtmlStyle__Group__0__Impl rule__PropertyHtmlStyle__Group__1 ;
+    // InternalTableDSL.g:10187:1: rule__PropertyHtmlStyle__Group__0 : rule__PropertyHtmlStyle__Group__0__Impl rule__PropertyHtmlStyle__Group__1 ;
     public final void rule__PropertyHtmlStyle__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10866:1: ( rule__PropertyHtmlStyle__Group__0__Impl rule__PropertyHtmlStyle__Group__1 )
-            // InternalTableDSL.g:10867:2: rule__PropertyHtmlStyle__Group__0__Impl rule__PropertyHtmlStyle__Group__1
+            // InternalTableDSL.g:10191:1: ( rule__PropertyHtmlStyle__Group__0__Impl rule__PropertyHtmlStyle__Group__1 )
+            // InternalTableDSL.g:10192:2: rule__PropertyHtmlStyle__Group__0__Impl rule__PropertyHtmlStyle__Group__1
             {
-            pushFollow(FOLLOW_71);
+            pushFollow(FOLLOW_69);
             rule__PropertyHtmlStyle__Group__0__Impl();
 
             state._fsp--;
@@ -37145,23 +35034,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyHtmlStyle__Group__0__Impl"
-    // InternalTableDSL.g:10874:1: rule__PropertyHtmlStyle__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:10199:1: rule__PropertyHtmlStyle__Group__0__Impl : ( () ) ;
     public final void rule__PropertyHtmlStyle__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10878:1: ( ( () ) )
-            // InternalTableDSL.g:10879:1: ( () )
+            // InternalTableDSL.g:10203:1: ( ( () ) )
+            // InternalTableDSL.g:10204:1: ( () )
             {
-            // InternalTableDSL.g:10879:1: ( () )
-            // InternalTableDSL.g:10880:2: ()
+            // InternalTableDSL.g:10204:1: ( () )
+            // InternalTableDSL.g:10205:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyHtmlStyleAccess().getCxGridPropHtmlStyleAction_0()); 
             }
-            // InternalTableDSL.g:10881:2: ()
-            // InternalTableDSL.g:10881:3: 
+            // InternalTableDSL.g:10206:2: ()
+            // InternalTableDSL.g:10206:3: 
             {
             }
 
@@ -37186,14 +35075,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyHtmlStyle__Group__1"
-    // InternalTableDSL.g:10889:1: rule__PropertyHtmlStyle__Group__1 : rule__PropertyHtmlStyle__Group__1__Impl ;
+    // InternalTableDSL.g:10214:1: rule__PropertyHtmlStyle__Group__1 : rule__PropertyHtmlStyle__Group__1__Impl ;
     public final void rule__PropertyHtmlStyle__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10893:1: ( rule__PropertyHtmlStyle__Group__1__Impl )
-            // InternalTableDSL.g:10894:2: rule__PropertyHtmlStyle__Group__1__Impl
+            // InternalTableDSL.g:10218:1: ( rule__PropertyHtmlStyle__Group__1__Impl )
+            // InternalTableDSL.g:10219:2: rule__PropertyHtmlStyle__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PropertyHtmlStyle__Group__1__Impl();
@@ -37219,22 +35108,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyHtmlStyle__Group__1__Impl"
-    // InternalTableDSL.g:10900:1: rule__PropertyHtmlStyle__Group__1__Impl : ( 'htmlStyle' ) ;
+    // InternalTableDSL.g:10225:1: rule__PropertyHtmlStyle__Group__1__Impl : ( 'htmlStyle' ) ;
     public final void rule__PropertyHtmlStyle__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10904:1: ( ( 'htmlStyle' ) )
-            // InternalTableDSL.g:10905:1: ( 'htmlStyle' )
+            // InternalTableDSL.g:10229:1: ( ( 'htmlStyle' ) )
+            // InternalTableDSL.g:10230:1: ( 'htmlStyle' )
             {
-            // InternalTableDSL.g:10905:1: ( 'htmlStyle' )
-            // InternalTableDSL.g:10906:2: 'htmlStyle'
+            // InternalTableDSL.g:10230:1: ( 'htmlStyle' )
+            // InternalTableDSL.g:10231:2: 'htmlStyle'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyHtmlStyleAccess().getHtmlStyleKeyword_1()); 
             }
-            match(input,120,FOLLOW_2); if (state.failed) return ;
+            match(input,119,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPropertyHtmlStyleAccess().getHtmlStyleKeyword_1()); 
             }
@@ -37260,16 +35149,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyBooleanStyle__Group__0"
-    // InternalTableDSL.g:10916:1: rule__PropertyBooleanStyle__Group__0 : rule__PropertyBooleanStyle__Group__0__Impl rule__PropertyBooleanStyle__Group__1 ;
+    // InternalTableDSL.g:10241:1: rule__PropertyBooleanStyle__Group__0 : rule__PropertyBooleanStyle__Group__0__Impl rule__PropertyBooleanStyle__Group__1 ;
     public final void rule__PropertyBooleanStyle__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10920:1: ( rule__PropertyBooleanStyle__Group__0__Impl rule__PropertyBooleanStyle__Group__1 )
-            // InternalTableDSL.g:10921:2: rule__PropertyBooleanStyle__Group__0__Impl rule__PropertyBooleanStyle__Group__1
+            // InternalTableDSL.g:10245:1: ( rule__PropertyBooleanStyle__Group__0__Impl rule__PropertyBooleanStyle__Group__1 )
+            // InternalTableDSL.g:10246:2: rule__PropertyBooleanStyle__Group__0__Impl rule__PropertyBooleanStyle__Group__1
             {
-            pushFollow(FOLLOW_72);
+            pushFollow(FOLLOW_70);
             rule__PropertyBooleanStyle__Group__0__Impl();
 
             state._fsp--;
@@ -37298,23 +35187,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyBooleanStyle__Group__0__Impl"
-    // InternalTableDSL.g:10928:1: rule__PropertyBooleanStyle__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:10253:1: rule__PropertyBooleanStyle__Group__0__Impl : ( () ) ;
     public final void rule__PropertyBooleanStyle__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10932:1: ( ( () ) )
-            // InternalTableDSL.g:10933:1: ( () )
+            // InternalTableDSL.g:10257:1: ( ( () ) )
+            // InternalTableDSL.g:10258:1: ( () )
             {
-            // InternalTableDSL.g:10933:1: ( () )
-            // InternalTableDSL.g:10934:2: ()
+            // InternalTableDSL.g:10258:1: ( () )
+            // InternalTableDSL.g:10259:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyBooleanStyleAccess().getCxGridPropBooleanStyleAction_0()); 
             }
-            // InternalTableDSL.g:10935:2: ()
-            // InternalTableDSL.g:10935:3: 
+            // InternalTableDSL.g:10260:2: ()
+            // InternalTableDSL.g:10260:3: 
             {
             }
 
@@ -37339,14 +35228,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyBooleanStyle__Group__1"
-    // InternalTableDSL.g:10943:1: rule__PropertyBooleanStyle__Group__1 : rule__PropertyBooleanStyle__Group__1__Impl ;
+    // InternalTableDSL.g:10268:1: rule__PropertyBooleanStyle__Group__1 : rule__PropertyBooleanStyle__Group__1__Impl ;
     public final void rule__PropertyBooleanStyle__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10947:1: ( rule__PropertyBooleanStyle__Group__1__Impl )
-            // InternalTableDSL.g:10948:2: rule__PropertyBooleanStyle__Group__1__Impl
+            // InternalTableDSL.g:10272:1: ( rule__PropertyBooleanStyle__Group__1__Impl )
+            // InternalTableDSL.g:10273:2: rule__PropertyBooleanStyle__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PropertyBooleanStyle__Group__1__Impl();
@@ -37372,22 +35261,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyBooleanStyle__Group__1__Impl"
-    // InternalTableDSL.g:10954:1: rule__PropertyBooleanStyle__Group__1__Impl : ( 'boolStyle' ) ;
+    // InternalTableDSL.g:10279:1: rule__PropertyBooleanStyle__Group__1__Impl : ( 'boolStyle' ) ;
     public final void rule__PropertyBooleanStyle__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10958:1: ( ( 'boolStyle' ) )
-            // InternalTableDSL.g:10959:1: ( 'boolStyle' )
+            // InternalTableDSL.g:10283:1: ( ( 'boolStyle' ) )
+            // InternalTableDSL.g:10284:1: ( 'boolStyle' )
             {
-            // InternalTableDSL.g:10959:1: ( 'boolStyle' )
-            // InternalTableDSL.g:10960:2: 'boolStyle'
+            // InternalTableDSL.g:10284:1: ( 'boolStyle' )
+            // InternalTableDSL.g:10285:2: 'boolStyle'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyBooleanStyleAccess().getBoolStyleKeyword_1()); 
             }
-            match(input,121,FOLLOW_2); if (state.failed) return ;
+            match(input,120,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPropertyBooleanStyleAccess().getBoolStyleKeyword_1()); 
             }
@@ -37413,16 +35302,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyDateStyle__Group__0"
-    // InternalTableDSL.g:10970:1: rule__PropertyDateStyle__Group__0 : rule__PropertyDateStyle__Group__0__Impl rule__PropertyDateStyle__Group__1 ;
+    // InternalTableDSL.g:10295:1: rule__PropertyDateStyle__Group__0 : rule__PropertyDateStyle__Group__0__Impl rule__PropertyDateStyle__Group__1 ;
     public final void rule__PropertyDateStyle__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10974:1: ( rule__PropertyDateStyle__Group__0__Impl rule__PropertyDateStyle__Group__1 )
-            // InternalTableDSL.g:10975:2: rule__PropertyDateStyle__Group__0__Impl rule__PropertyDateStyle__Group__1
+            // InternalTableDSL.g:10299:1: ( rule__PropertyDateStyle__Group__0__Impl rule__PropertyDateStyle__Group__1 )
+            // InternalTableDSL.g:10300:2: rule__PropertyDateStyle__Group__0__Impl rule__PropertyDateStyle__Group__1
             {
-            pushFollow(FOLLOW_73);
+            pushFollow(FOLLOW_71);
             rule__PropertyDateStyle__Group__0__Impl();
 
             state._fsp--;
@@ -37451,23 +35340,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyDateStyle__Group__0__Impl"
-    // InternalTableDSL.g:10982:1: rule__PropertyDateStyle__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:10307:1: rule__PropertyDateStyle__Group__0__Impl : ( () ) ;
     public final void rule__PropertyDateStyle__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:10986:1: ( ( () ) )
-            // InternalTableDSL.g:10987:1: ( () )
+            // InternalTableDSL.g:10311:1: ( ( () ) )
+            // InternalTableDSL.g:10312:1: ( () )
             {
-            // InternalTableDSL.g:10987:1: ( () )
-            // InternalTableDSL.g:10988:2: ()
+            // InternalTableDSL.g:10312:1: ( () )
+            // InternalTableDSL.g:10313:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyDateStyleAccess().getCxGridPropDateStyleAction_0()); 
             }
-            // InternalTableDSL.g:10989:2: ()
-            // InternalTableDSL.g:10989:3: 
+            // InternalTableDSL.g:10314:2: ()
+            // InternalTableDSL.g:10314:3: 
             {
             }
 
@@ -37492,16 +35381,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyDateStyle__Group__1"
-    // InternalTableDSL.g:10997:1: rule__PropertyDateStyle__Group__1 : rule__PropertyDateStyle__Group__1__Impl rule__PropertyDateStyle__Group__2 ;
+    // InternalTableDSL.g:10322:1: rule__PropertyDateStyle__Group__1 : rule__PropertyDateStyle__Group__1__Impl rule__PropertyDateStyle__Group__2 ;
     public final void rule__PropertyDateStyle__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11001:1: ( rule__PropertyDateStyle__Group__1__Impl rule__PropertyDateStyle__Group__2 )
-            // InternalTableDSL.g:11002:2: rule__PropertyDateStyle__Group__1__Impl rule__PropertyDateStyle__Group__2
+            // InternalTableDSL.g:10326:1: ( rule__PropertyDateStyle__Group__1__Impl rule__PropertyDateStyle__Group__2 )
+            // InternalTableDSL.g:10327:2: rule__PropertyDateStyle__Group__1__Impl rule__PropertyDateStyle__Group__2
             {
-            pushFollow(FOLLOW_74);
+            pushFollow(FOLLOW_72);
             rule__PropertyDateStyle__Group__1__Impl();
 
             state._fsp--;
@@ -37530,22 +35419,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyDateStyle__Group__1__Impl"
-    // InternalTableDSL.g:11009:1: rule__PropertyDateStyle__Group__1__Impl : ( 'dateStyle' ) ;
+    // InternalTableDSL.g:10334:1: rule__PropertyDateStyle__Group__1__Impl : ( 'dateStyle' ) ;
     public final void rule__PropertyDateStyle__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11013:1: ( ( 'dateStyle' ) )
-            // InternalTableDSL.g:11014:1: ( 'dateStyle' )
+            // InternalTableDSL.g:10338:1: ( ( 'dateStyle' ) )
+            // InternalTableDSL.g:10339:1: ( 'dateStyle' )
             {
-            // InternalTableDSL.g:11014:1: ( 'dateStyle' )
-            // InternalTableDSL.g:11015:2: 'dateStyle'
+            // InternalTableDSL.g:10339:1: ( 'dateStyle' )
+            // InternalTableDSL.g:10340:2: 'dateStyle'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyDateStyleAccess().getDateStyleKeyword_1()); 
             }
-            match(input,122,FOLLOW_2); if (state.failed) return ;
+            match(input,121,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPropertyDateStyleAccess().getDateStyleKeyword_1()); 
             }
@@ -37571,14 +35460,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyDateStyle__Group__2"
-    // InternalTableDSL.g:11024:1: rule__PropertyDateStyle__Group__2 : rule__PropertyDateStyle__Group__2__Impl rule__PropertyDateStyle__Group__3 ;
+    // InternalTableDSL.g:10349:1: rule__PropertyDateStyle__Group__2 : rule__PropertyDateStyle__Group__2__Impl rule__PropertyDateStyle__Group__3 ;
     public final void rule__PropertyDateStyle__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11028:1: ( rule__PropertyDateStyle__Group__2__Impl rule__PropertyDateStyle__Group__3 )
-            // InternalTableDSL.g:11029:2: rule__PropertyDateStyle__Group__2__Impl rule__PropertyDateStyle__Group__3
+            // InternalTableDSL.g:10353:1: ( rule__PropertyDateStyle__Group__2__Impl rule__PropertyDateStyle__Group__3 )
+            // InternalTableDSL.g:10354:2: rule__PropertyDateStyle__Group__2__Impl rule__PropertyDateStyle__Group__3
             {
             pushFollow(FOLLOW_14);
             rule__PropertyDateStyle__Group__2__Impl();
@@ -37609,22 +35498,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyDateStyle__Group__2__Impl"
-    // InternalTableDSL.g:11036:1: rule__PropertyDateStyle__Group__2__Impl : ( 'format' ) ;
+    // InternalTableDSL.g:10361:1: rule__PropertyDateStyle__Group__2__Impl : ( 'format' ) ;
     public final void rule__PropertyDateStyle__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11040:1: ( ( 'format' ) )
-            // InternalTableDSL.g:11041:1: ( 'format' )
+            // InternalTableDSL.g:10365:1: ( ( 'format' ) )
+            // InternalTableDSL.g:10366:1: ( 'format' )
             {
-            // InternalTableDSL.g:11041:1: ( 'format' )
-            // InternalTableDSL.g:11042:2: 'format'
+            // InternalTableDSL.g:10366:1: ( 'format' )
+            // InternalTableDSL.g:10367:2: 'format'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyDateStyleAccess().getFormatKeyword_2()); 
             }
-            match(input,123,FOLLOW_2); if (state.failed) return ;
+            match(input,122,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPropertyDateStyleAccess().getFormatKeyword_2()); 
             }
@@ -37650,14 +35539,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyDateStyle__Group__3"
-    // InternalTableDSL.g:11051:1: rule__PropertyDateStyle__Group__3 : rule__PropertyDateStyle__Group__3__Impl ;
+    // InternalTableDSL.g:10376:1: rule__PropertyDateStyle__Group__3 : rule__PropertyDateStyle__Group__3__Impl ;
     public final void rule__PropertyDateStyle__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11055:1: ( rule__PropertyDateStyle__Group__3__Impl )
-            // InternalTableDSL.g:11056:2: rule__PropertyDateStyle__Group__3__Impl
+            // InternalTableDSL.g:10380:1: ( rule__PropertyDateStyle__Group__3__Impl )
+            // InternalTableDSL.g:10381:2: rule__PropertyDateStyle__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PropertyDateStyle__Group__3__Impl();
@@ -37683,23 +35572,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyDateStyle__Group__3__Impl"
-    // InternalTableDSL.g:11062:1: rule__PropertyDateStyle__Group__3__Impl : ( ( rule__PropertyDateStyle__DateFormatAssignment_3 ) ) ;
+    // InternalTableDSL.g:10387:1: rule__PropertyDateStyle__Group__3__Impl : ( ( rule__PropertyDateStyle__DateFormatAssignment_3 ) ) ;
     public final void rule__PropertyDateStyle__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11066:1: ( ( ( rule__PropertyDateStyle__DateFormatAssignment_3 ) ) )
-            // InternalTableDSL.g:11067:1: ( ( rule__PropertyDateStyle__DateFormatAssignment_3 ) )
+            // InternalTableDSL.g:10391:1: ( ( ( rule__PropertyDateStyle__DateFormatAssignment_3 ) ) )
+            // InternalTableDSL.g:10392:1: ( ( rule__PropertyDateStyle__DateFormatAssignment_3 ) )
             {
-            // InternalTableDSL.g:11067:1: ( ( rule__PropertyDateStyle__DateFormatAssignment_3 ) )
-            // InternalTableDSL.g:11068:2: ( rule__PropertyDateStyle__DateFormatAssignment_3 )
+            // InternalTableDSL.g:10392:1: ( ( rule__PropertyDateStyle__DateFormatAssignment_3 ) )
+            // InternalTableDSL.g:10393:2: ( rule__PropertyDateStyle__DateFormatAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyDateStyleAccess().getDateFormatAssignment_3()); 
             }
-            // InternalTableDSL.g:11069:2: ( rule__PropertyDateStyle__DateFormatAssignment_3 )
-            // InternalTableDSL.g:11069:3: rule__PropertyDateStyle__DateFormatAssignment_3
+            // InternalTableDSL.g:10394:2: ( rule__PropertyDateStyle__DateFormatAssignment_3 )
+            // InternalTableDSL.g:10394:3: rule__PropertyDateStyle__DateFormatAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__PropertyDateStyle__DateFormatAssignment_3();
@@ -37734,16 +35623,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyNumberStyle__Group__0"
-    // InternalTableDSL.g:11078:1: rule__PropertyNumberStyle__Group__0 : rule__PropertyNumberStyle__Group__0__Impl rule__PropertyNumberStyle__Group__1 ;
+    // InternalTableDSL.g:10403:1: rule__PropertyNumberStyle__Group__0 : rule__PropertyNumberStyle__Group__0__Impl rule__PropertyNumberStyle__Group__1 ;
     public final void rule__PropertyNumberStyle__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11082:1: ( rule__PropertyNumberStyle__Group__0__Impl rule__PropertyNumberStyle__Group__1 )
-            // InternalTableDSL.g:11083:2: rule__PropertyNumberStyle__Group__0__Impl rule__PropertyNumberStyle__Group__1
+            // InternalTableDSL.g:10407:1: ( rule__PropertyNumberStyle__Group__0__Impl rule__PropertyNumberStyle__Group__1 )
+            // InternalTableDSL.g:10408:2: rule__PropertyNumberStyle__Group__0__Impl rule__PropertyNumberStyle__Group__1
             {
-            pushFollow(FOLLOW_75);
+            pushFollow(FOLLOW_73);
             rule__PropertyNumberStyle__Group__0__Impl();
 
             state._fsp--;
@@ -37772,23 +35661,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyNumberStyle__Group__0__Impl"
-    // InternalTableDSL.g:11090:1: rule__PropertyNumberStyle__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:10415:1: rule__PropertyNumberStyle__Group__0__Impl : ( () ) ;
     public final void rule__PropertyNumberStyle__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11094:1: ( ( () ) )
-            // InternalTableDSL.g:11095:1: ( () )
+            // InternalTableDSL.g:10419:1: ( ( () ) )
+            // InternalTableDSL.g:10420:1: ( () )
             {
-            // InternalTableDSL.g:11095:1: ( () )
-            // InternalTableDSL.g:11096:2: ()
+            // InternalTableDSL.g:10420:1: ( () )
+            // InternalTableDSL.g:10421:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyNumberStyleAccess().getCxGridPropNumberStyleAction_0()); 
             }
-            // InternalTableDSL.g:11097:2: ()
-            // InternalTableDSL.g:11097:3: 
+            // InternalTableDSL.g:10422:2: ()
+            // InternalTableDSL.g:10422:3: 
             {
             }
 
@@ -37813,16 +35702,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyNumberStyle__Group__1"
-    // InternalTableDSL.g:11105:1: rule__PropertyNumberStyle__Group__1 : rule__PropertyNumberStyle__Group__1__Impl rule__PropertyNumberStyle__Group__2 ;
+    // InternalTableDSL.g:10430:1: rule__PropertyNumberStyle__Group__1 : rule__PropertyNumberStyle__Group__1__Impl rule__PropertyNumberStyle__Group__2 ;
     public final void rule__PropertyNumberStyle__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11109:1: ( rule__PropertyNumberStyle__Group__1__Impl rule__PropertyNumberStyle__Group__2 )
-            // InternalTableDSL.g:11110:2: rule__PropertyNumberStyle__Group__1__Impl rule__PropertyNumberStyle__Group__2
+            // InternalTableDSL.g:10434:1: ( rule__PropertyNumberStyle__Group__1__Impl rule__PropertyNumberStyle__Group__2 )
+            // InternalTableDSL.g:10435:2: rule__PropertyNumberStyle__Group__1__Impl rule__PropertyNumberStyle__Group__2
             {
-            pushFollow(FOLLOW_74);
+            pushFollow(FOLLOW_72);
             rule__PropertyNumberStyle__Group__1__Impl();
 
             state._fsp--;
@@ -37851,22 +35740,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyNumberStyle__Group__1__Impl"
-    // InternalTableDSL.g:11117:1: rule__PropertyNumberStyle__Group__1__Impl : ( 'numberStyle' ) ;
+    // InternalTableDSL.g:10442:1: rule__PropertyNumberStyle__Group__1__Impl : ( 'numberStyle' ) ;
     public final void rule__PropertyNumberStyle__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11121:1: ( ( 'numberStyle' ) )
-            // InternalTableDSL.g:11122:1: ( 'numberStyle' )
+            // InternalTableDSL.g:10446:1: ( ( 'numberStyle' ) )
+            // InternalTableDSL.g:10447:1: ( 'numberStyle' )
             {
-            // InternalTableDSL.g:11122:1: ( 'numberStyle' )
-            // InternalTableDSL.g:11123:2: 'numberStyle'
+            // InternalTableDSL.g:10447:1: ( 'numberStyle' )
+            // InternalTableDSL.g:10448:2: 'numberStyle'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyNumberStyleAccess().getNumberStyleKeyword_1()); 
             }
-            match(input,124,FOLLOW_2); if (state.failed) return ;
+            match(input,123,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPropertyNumberStyleAccess().getNumberStyleKeyword_1()); 
             }
@@ -37892,14 +35781,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyNumberStyle__Group__2"
-    // InternalTableDSL.g:11132:1: rule__PropertyNumberStyle__Group__2 : rule__PropertyNumberStyle__Group__2__Impl rule__PropertyNumberStyle__Group__3 ;
+    // InternalTableDSL.g:10457:1: rule__PropertyNumberStyle__Group__2 : rule__PropertyNumberStyle__Group__2__Impl rule__PropertyNumberStyle__Group__3 ;
     public final void rule__PropertyNumberStyle__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11136:1: ( rule__PropertyNumberStyle__Group__2__Impl rule__PropertyNumberStyle__Group__3 )
-            // InternalTableDSL.g:11137:2: rule__PropertyNumberStyle__Group__2__Impl rule__PropertyNumberStyle__Group__3
+            // InternalTableDSL.g:10461:1: ( rule__PropertyNumberStyle__Group__2__Impl rule__PropertyNumberStyle__Group__3 )
+            // InternalTableDSL.g:10462:2: rule__PropertyNumberStyle__Group__2__Impl rule__PropertyNumberStyle__Group__3
             {
             pushFollow(FOLLOW_14);
             rule__PropertyNumberStyle__Group__2__Impl();
@@ -37930,22 +35819,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyNumberStyle__Group__2__Impl"
-    // InternalTableDSL.g:11144:1: rule__PropertyNumberStyle__Group__2__Impl : ( 'format' ) ;
+    // InternalTableDSL.g:10469:1: rule__PropertyNumberStyle__Group__2__Impl : ( 'format' ) ;
     public final void rule__PropertyNumberStyle__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11148:1: ( ( 'format' ) )
-            // InternalTableDSL.g:11149:1: ( 'format' )
+            // InternalTableDSL.g:10473:1: ( ( 'format' ) )
+            // InternalTableDSL.g:10474:1: ( 'format' )
             {
-            // InternalTableDSL.g:11149:1: ( 'format' )
-            // InternalTableDSL.g:11150:2: 'format'
+            // InternalTableDSL.g:10474:1: ( 'format' )
+            // InternalTableDSL.g:10475:2: 'format'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyNumberStyleAccess().getFormatKeyword_2()); 
             }
-            match(input,123,FOLLOW_2); if (state.failed) return ;
+            match(input,122,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPropertyNumberStyleAccess().getFormatKeyword_2()); 
             }
@@ -37971,14 +35860,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyNumberStyle__Group__3"
-    // InternalTableDSL.g:11159:1: rule__PropertyNumberStyle__Group__3 : rule__PropertyNumberStyle__Group__3__Impl ;
+    // InternalTableDSL.g:10484:1: rule__PropertyNumberStyle__Group__3 : rule__PropertyNumberStyle__Group__3__Impl ;
     public final void rule__PropertyNumberStyle__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11163:1: ( rule__PropertyNumberStyle__Group__3__Impl )
-            // InternalTableDSL.g:11164:2: rule__PropertyNumberStyle__Group__3__Impl
+            // InternalTableDSL.g:10488:1: ( rule__PropertyNumberStyle__Group__3__Impl )
+            // InternalTableDSL.g:10489:2: rule__PropertyNumberStyle__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PropertyNumberStyle__Group__3__Impl();
@@ -38004,23 +35893,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyNumberStyle__Group__3__Impl"
-    // InternalTableDSL.g:11170:1: rule__PropertyNumberStyle__Group__3__Impl : ( ( rule__PropertyNumberStyle__NumberFormatAssignment_3 ) ) ;
+    // InternalTableDSL.g:10495:1: rule__PropertyNumberStyle__Group__3__Impl : ( ( rule__PropertyNumberStyle__NumberFormatAssignment_3 ) ) ;
     public final void rule__PropertyNumberStyle__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11174:1: ( ( ( rule__PropertyNumberStyle__NumberFormatAssignment_3 ) ) )
-            // InternalTableDSL.g:11175:1: ( ( rule__PropertyNumberStyle__NumberFormatAssignment_3 ) )
+            // InternalTableDSL.g:10499:1: ( ( ( rule__PropertyNumberStyle__NumberFormatAssignment_3 ) ) )
+            // InternalTableDSL.g:10500:1: ( ( rule__PropertyNumberStyle__NumberFormatAssignment_3 ) )
             {
-            // InternalTableDSL.g:11175:1: ( ( rule__PropertyNumberStyle__NumberFormatAssignment_3 ) )
-            // InternalTableDSL.g:11176:2: ( rule__PropertyNumberStyle__NumberFormatAssignment_3 )
+            // InternalTableDSL.g:10500:1: ( ( rule__PropertyNumberStyle__NumberFormatAssignment_3 ) )
+            // InternalTableDSL.g:10501:2: ( rule__PropertyNumberStyle__NumberFormatAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyNumberStyleAccess().getNumberFormatAssignment_3()); 
             }
-            // InternalTableDSL.g:11177:2: ( rule__PropertyNumberStyle__NumberFormatAssignment_3 )
-            // InternalTableDSL.g:11177:3: rule__PropertyNumberStyle__NumberFormatAssignment_3
+            // InternalTableDSL.g:10502:2: ( rule__PropertyNumberStyle__NumberFormatAssignment_3 )
+            // InternalTableDSL.g:10502:3: rule__PropertyNumberStyle__NumberFormatAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__PropertyNumberStyle__NumberFormatAssignment_3();
@@ -38055,16 +35944,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyProgressbarStyle__Group__0"
-    // InternalTableDSL.g:11186:1: rule__PropertyProgressbarStyle__Group__0 : rule__PropertyProgressbarStyle__Group__0__Impl rule__PropertyProgressbarStyle__Group__1 ;
+    // InternalTableDSL.g:10511:1: rule__PropertyProgressbarStyle__Group__0 : rule__PropertyProgressbarStyle__Group__0__Impl rule__PropertyProgressbarStyle__Group__1 ;
     public final void rule__PropertyProgressbarStyle__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11190:1: ( rule__PropertyProgressbarStyle__Group__0__Impl rule__PropertyProgressbarStyle__Group__1 )
-            // InternalTableDSL.g:11191:2: rule__PropertyProgressbarStyle__Group__0__Impl rule__PropertyProgressbarStyle__Group__1
+            // InternalTableDSL.g:10515:1: ( rule__PropertyProgressbarStyle__Group__0__Impl rule__PropertyProgressbarStyle__Group__1 )
+            // InternalTableDSL.g:10516:2: rule__PropertyProgressbarStyle__Group__0__Impl rule__PropertyProgressbarStyle__Group__1
             {
-            pushFollow(FOLLOW_76);
+            pushFollow(FOLLOW_74);
             rule__PropertyProgressbarStyle__Group__0__Impl();
 
             state._fsp--;
@@ -38093,23 +35982,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyProgressbarStyle__Group__0__Impl"
-    // InternalTableDSL.g:11198:1: rule__PropertyProgressbarStyle__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:10523:1: rule__PropertyProgressbarStyle__Group__0__Impl : ( () ) ;
     public final void rule__PropertyProgressbarStyle__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11202:1: ( ( () ) )
-            // InternalTableDSL.g:11203:1: ( () )
+            // InternalTableDSL.g:10527:1: ( ( () ) )
+            // InternalTableDSL.g:10528:1: ( () )
             {
-            // InternalTableDSL.g:11203:1: ( () )
-            // InternalTableDSL.g:11204:2: ()
+            // InternalTableDSL.g:10528:1: ( () )
+            // InternalTableDSL.g:10529:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyProgressbarStyleAccess().getCxGridPropProgressbarStyleAction_0()); 
             }
-            // InternalTableDSL.g:11205:2: ()
-            // InternalTableDSL.g:11205:3: 
+            // InternalTableDSL.g:10530:2: ()
+            // InternalTableDSL.g:10530:3: 
             {
             }
 
@@ -38134,16 +36023,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyProgressbarStyle__Group__1"
-    // InternalTableDSL.g:11213:1: rule__PropertyProgressbarStyle__Group__1 : rule__PropertyProgressbarStyle__Group__1__Impl rule__PropertyProgressbarStyle__Group__2 ;
+    // InternalTableDSL.g:10538:1: rule__PropertyProgressbarStyle__Group__1 : rule__PropertyProgressbarStyle__Group__1__Impl rule__PropertyProgressbarStyle__Group__2 ;
     public final void rule__PropertyProgressbarStyle__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11217:1: ( rule__PropertyProgressbarStyle__Group__1__Impl rule__PropertyProgressbarStyle__Group__2 )
-            // InternalTableDSL.g:11218:2: rule__PropertyProgressbarStyle__Group__1__Impl rule__PropertyProgressbarStyle__Group__2
+            // InternalTableDSL.g:10542:1: ( rule__PropertyProgressbarStyle__Group__1__Impl rule__PropertyProgressbarStyle__Group__2 )
+            // InternalTableDSL.g:10543:2: rule__PropertyProgressbarStyle__Group__1__Impl rule__PropertyProgressbarStyle__Group__2
             {
-            pushFollow(FOLLOW_77);
+            pushFollow(FOLLOW_75);
             rule__PropertyProgressbarStyle__Group__1__Impl();
 
             state._fsp--;
@@ -38172,22 +36061,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyProgressbarStyle__Group__1__Impl"
-    // InternalTableDSL.g:11225:1: rule__PropertyProgressbarStyle__Group__1__Impl : ( 'progressbarStyle' ) ;
+    // InternalTableDSL.g:10550:1: rule__PropertyProgressbarStyle__Group__1__Impl : ( 'progressbarStyle' ) ;
     public final void rule__PropertyProgressbarStyle__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11229:1: ( ( 'progressbarStyle' ) )
-            // InternalTableDSL.g:11230:1: ( 'progressbarStyle' )
+            // InternalTableDSL.g:10554:1: ( ( 'progressbarStyle' ) )
+            // InternalTableDSL.g:10555:1: ( 'progressbarStyle' )
             {
-            // InternalTableDSL.g:11230:1: ( 'progressbarStyle' )
-            // InternalTableDSL.g:11231:2: 'progressbarStyle'
+            // InternalTableDSL.g:10555:1: ( 'progressbarStyle' )
+            // InternalTableDSL.g:10556:2: 'progressbarStyle'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyProgressbarStyleAccess().getProgressbarStyleKeyword_1()); 
             }
-            match(input,125,FOLLOW_2); if (state.failed) return ;
+            match(input,124,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPropertyProgressbarStyleAccess().getProgressbarStyleKeyword_1()); 
             }
@@ -38213,16 +36102,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyProgressbarStyle__Group__2"
-    // InternalTableDSL.g:11240:1: rule__PropertyProgressbarStyle__Group__2 : rule__PropertyProgressbarStyle__Group__2__Impl rule__PropertyProgressbarStyle__Group__3 ;
+    // InternalTableDSL.g:10565:1: rule__PropertyProgressbarStyle__Group__2 : rule__PropertyProgressbarStyle__Group__2__Impl rule__PropertyProgressbarStyle__Group__3 ;
     public final void rule__PropertyProgressbarStyle__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11244:1: ( rule__PropertyProgressbarStyle__Group__2__Impl rule__PropertyProgressbarStyle__Group__3 )
-            // InternalTableDSL.g:11245:2: rule__PropertyProgressbarStyle__Group__2__Impl rule__PropertyProgressbarStyle__Group__3
+            // InternalTableDSL.g:10569:1: ( rule__PropertyProgressbarStyle__Group__2__Impl rule__PropertyProgressbarStyle__Group__3 )
+            // InternalTableDSL.g:10570:2: rule__PropertyProgressbarStyle__Group__2__Impl rule__PropertyProgressbarStyle__Group__3
             {
-            pushFollow(FOLLOW_78);
+            pushFollow(FOLLOW_76);
             rule__PropertyProgressbarStyle__Group__2__Impl();
 
             state._fsp--;
@@ -38251,22 +36140,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyProgressbarStyle__Group__2__Impl"
-    // InternalTableDSL.g:11252:1: rule__PropertyProgressbarStyle__Group__2__Impl : ( 'max' ) ;
+    // InternalTableDSL.g:10577:1: rule__PropertyProgressbarStyle__Group__2__Impl : ( 'max' ) ;
     public final void rule__PropertyProgressbarStyle__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11256:1: ( ( 'max' ) )
-            // InternalTableDSL.g:11257:1: ( 'max' )
+            // InternalTableDSL.g:10581:1: ( ( 'max' ) )
+            // InternalTableDSL.g:10582:1: ( 'max' )
             {
-            // InternalTableDSL.g:11257:1: ( 'max' )
-            // InternalTableDSL.g:11258:2: 'max'
+            // InternalTableDSL.g:10582:1: ( 'max' )
+            // InternalTableDSL.g:10583:2: 'max'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyProgressbarStyleAccess().getMaxKeyword_2()); 
             }
-            match(input,126,FOLLOW_2); if (state.failed) return ;
+            match(input,125,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPropertyProgressbarStyleAccess().getMaxKeyword_2()); 
             }
@@ -38292,14 +36181,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyProgressbarStyle__Group__3"
-    // InternalTableDSL.g:11267:1: rule__PropertyProgressbarStyle__Group__3 : rule__PropertyProgressbarStyle__Group__3__Impl ;
+    // InternalTableDSL.g:10592:1: rule__PropertyProgressbarStyle__Group__3 : rule__PropertyProgressbarStyle__Group__3__Impl ;
     public final void rule__PropertyProgressbarStyle__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11271:1: ( rule__PropertyProgressbarStyle__Group__3__Impl )
-            // InternalTableDSL.g:11272:2: rule__PropertyProgressbarStyle__Group__3__Impl
+            // InternalTableDSL.g:10596:1: ( rule__PropertyProgressbarStyle__Group__3__Impl )
+            // InternalTableDSL.g:10597:2: rule__PropertyProgressbarStyle__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PropertyProgressbarStyle__Group__3__Impl();
@@ -38325,23 +36214,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyProgressbarStyle__Group__3__Impl"
-    // InternalTableDSL.g:11278:1: rule__PropertyProgressbarStyle__Group__3__Impl : ( ( rule__PropertyProgressbarStyle__MaxValueAssignment_3 ) ) ;
+    // InternalTableDSL.g:10603:1: rule__PropertyProgressbarStyle__Group__3__Impl : ( ( rule__PropertyProgressbarStyle__MaxValueAssignment_3 ) ) ;
     public final void rule__PropertyProgressbarStyle__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11282:1: ( ( ( rule__PropertyProgressbarStyle__MaxValueAssignment_3 ) ) )
-            // InternalTableDSL.g:11283:1: ( ( rule__PropertyProgressbarStyle__MaxValueAssignment_3 ) )
+            // InternalTableDSL.g:10607:1: ( ( ( rule__PropertyProgressbarStyle__MaxValueAssignment_3 ) ) )
+            // InternalTableDSL.g:10608:1: ( ( rule__PropertyProgressbarStyle__MaxValueAssignment_3 ) )
             {
-            // InternalTableDSL.g:11283:1: ( ( rule__PropertyProgressbarStyle__MaxValueAssignment_3 ) )
-            // InternalTableDSL.g:11284:2: ( rule__PropertyProgressbarStyle__MaxValueAssignment_3 )
+            // InternalTableDSL.g:10608:1: ( ( rule__PropertyProgressbarStyle__MaxValueAssignment_3 ) )
+            // InternalTableDSL.g:10609:2: ( rule__PropertyProgressbarStyle__MaxValueAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyProgressbarStyleAccess().getMaxValueAssignment_3()); 
             }
-            // InternalTableDSL.g:11285:2: ( rule__PropertyProgressbarStyle__MaxValueAssignment_3 )
-            // InternalTableDSL.g:11285:3: rule__PropertyProgressbarStyle__MaxValueAssignment_3
+            // InternalTableDSL.g:10610:2: ( rule__PropertyProgressbarStyle__MaxValueAssignment_3 )
+            // InternalTableDSL.g:10610:3: rule__PropertyProgressbarStyle__MaxValueAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__PropertyProgressbarStyle__MaxValueAssignment_3();
@@ -38376,16 +36265,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__GridPropIndicatorStyle__Group__0"
-    // InternalTableDSL.g:11294:1: rule__GridPropIndicatorStyle__Group__0 : rule__GridPropIndicatorStyle__Group__0__Impl rule__GridPropIndicatorStyle__Group__1 ;
+    // InternalTableDSL.g:10619:1: rule__GridPropIndicatorStyle__Group__0 : rule__GridPropIndicatorStyle__Group__0__Impl rule__GridPropIndicatorStyle__Group__1 ;
     public final void rule__GridPropIndicatorStyle__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11298:1: ( rule__GridPropIndicatorStyle__Group__0__Impl rule__GridPropIndicatorStyle__Group__1 )
-            // InternalTableDSL.g:11299:2: rule__GridPropIndicatorStyle__Group__0__Impl rule__GridPropIndicatorStyle__Group__1
+            // InternalTableDSL.g:10623:1: ( rule__GridPropIndicatorStyle__Group__0__Impl rule__GridPropIndicatorStyle__Group__1 )
+            // InternalTableDSL.g:10624:2: rule__GridPropIndicatorStyle__Group__0__Impl rule__GridPropIndicatorStyle__Group__1
             {
-            pushFollow(FOLLOW_65);
+            pushFollow(FOLLOW_63);
             rule__GridPropIndicatorStyle__Group__0__Impl();
 
             state._fsp--;
@@ -38414,23 +36303,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__GridPropIndicatorStyle__Group__0__Impl"
-    // InternalTableDSL.g:11306:1: rule__GridPropIndicatorStyle__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:10631:1: rule__GridPropIndicatorStyle__Group__0__Impl : ( () ) ;
     public final void rule__GridPropIndicatorStyle__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11310:1: ( ( () ) )
-            // InternalTableDSL.g:11311:1: ( () )
+            // InternalTableDSL.g:10635:1: ( ( () ) )
+            // InternalTableDSL.g:10636:1: ( () )
             {
-            // InternalTableDSL.g:11311:1: ( () )
-            // InternalTableDSL.g:11312:2: ()
+            // InternalTableDSL.g:10636:1: ( () )
+            // InternalTableDSL.g:10637:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGridPropIndicatorStyleAccess().getCxGridPropIndicatorStyleAction_0()); 
             }
-            // InternalTableDSL.g:11313:2: ()
-            // InternalTableDSL.g:11313:3: 
+            // InternalTableDSL.g:10638:2: ()
+            // InternalTableDSL.g:10638:3: 
             {
             }
 
@@ -38455,16 +36344,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__GridPropIndicatorStyle__Group__1"
-    // InternalTableDSL.g:11321:1: rule__GridPropIndicatorStyle__Group__1 : rule__GridPropIndicatorStyle__Group__1__Impl rule__GridPropIndicatorStyle__Group__2 ;
+    // InternalTableDSL.g:10646:1: rule__GridPropIndicatorStyle__Group__1 : rule__GridPropIndicatorStyle__Group__1__Impl rule__GridPropIndicatorStyle__Group__2 ;
     public final void rule__GridPropIndicatorStyle__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11325:1: ( rule__GridPropIndicatorStyle__Group__1__Impl rule__GridPropIndicatorStyle__Group__2 )
-            // InternalTableDSL.g:11326:2: rule__GridPropIndicatorStyle__Group__1__Impl rule__GridPropIndicatorStyle__Group__2
+            // InternalTableDSL.g:10650:1: ( rule__GridPropIndicatorStyle__Group__1__Impl rule__GridPropIndicatorStyle__Group__2 )
+            // InternalTableDSL.g:10651:2: rule__GridPropIndicatorStyle__Group__1__Impl rule__GridPropIndicatorStyle__Group__2
             {
-            pushFollow(FOLLOW_79);
+            pushFollow(FOLLOW_77);
             rule__GridPropIndicatorStyle__Group__1__Impl();
 
             state._fsp--;
@@ -38493,22 +36382,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__GridPropIndicatorStyle__Group__1__Impl"
-    // InternalTableDSL.g:11333:1: rule__GridPropIndicatorStyle__Group__1__Impl : ( 'indicatorStyle' ) ;
+    // InternalTableDSL.g:10658:1: rule__GridPropIndicatorStyle__Group__1__Impl : ( 'indicatorStyle' ) ;
     public final void rule__GridPropIndicatorStyle__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11337:1: ( ( 'indicatorStyle' ) )
-            // InternalTableDSL.g:11338:1: ( 'indicatorStyle' )
+            // InternalTableDSL.g:10662:1: ( ( 'indicatorStyle' ) )
+            // InternalTableDSL.g:10663:1: ( 'indicatorStyle' )
             {
-            // InternalTableDSL.g:11338:1: ( 'indicatorStyle' )
-            // InternalTableDSL.g:11339:2: 'indicatorStyle'
+            // InternalTableDSL.g:10663:1: ( 'indicatorStyle' )
+            // InternalTableDSL.g:10664:2: 'indicatorStyle'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGridPropIndicatorStyleAccess().getIndicatorStyleKeyword_1()); 
             }
-            match(input,127,FOLLOW_2); if (state.failed) return ;
+            match(input,126,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGridPropIndicatorStyleAccess().getIndicatorStyleKeyword_1()); 
             }
@@ -38534,16 +36423,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__GridPropIndicatorStyle__Group__2"
-    // InternalTableDSL.g:11348:1: rule__GridPropIndicatorStyle__Group__2 : rule__GridPropIndicatorStyle__Group__2__Impl rule__GridPropIndicatorStyle__Group__3 ;
+    // InternalTableDSL.g:10673:1: rule__GridPropIndicatorStyle__Group__2 : rule__GridPropIndicatorStyle__Group__2__Impl rule__GridPropIndicatorStyle__Group__3 ;
     public final void rule__GridPropIndicatorStyle__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11352:1: ( rule__GridPropIndicatorStyle__Group__2__Impl rule__GridPropIndicatorStyle__Group__3 )
-            // InternalTableDSL.g:11353:2: rule__GridPropIndicatorStyle__Group__2__Impl rule__GridPropIndicatorStyle__Group__3
+            // InternalTableDSL.g:10677:1: ( rule__GridPropIndicatorStyle__Group__2__Impl rule__GridPropIndicatorStyle__Group__3 )
+            // InternalTableDSL.g:10678:2: rule__GridPropIndicatorStyle__Group__2__Impl rule__GridPropIndicatorStyle__Group__3
             {
-            pushFollow(FOLLOW_78);
+            pushFollow(FOLLOW_76);
             rule__GridPropIndicatorStyle__Group__2__Impl();
 
             state._fsp--;
@@ -38572,22 +36461,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__GridPropIndicatorStyle__Group__2__Impl"
-    // InternalTableDSL.g:11360:1: rule__GridPropIndicatorStyle__Group__2__Impl : ( 'greenFrom' ) ;
+    // InternalTableDSL.g:10685:1: rule__GridPropIndicatorStyle__Group__2__Impl : ( 'greenFrom' ) ;
     public final void rule__GridPropIndicatorStyle__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11364:1: ( ( 'greenFrom' ) )
-            // InternalTableDSL.g:11365:1: ( 'greenFrom' )
+            // InternalTableDSL.g:10689:1: ( ( 'greenFrom' ) )
+            // InternalTableDSL.g:10690:1: ( 'greenFrom' )
             {
-            // InternalTableDSL.g:11365:1: ( 'greenFrom' )
-            // InternalTableDSL.g:11366:2: 'greenFrom'
+            // InternalTableDSL.g:10690:1: ( 'greenFrom' )
+            // InternalTableDSL.g:10691:2: 'greenFrom'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGridPropIndicatorStyleAccess().getGreenFromKeyword_2()); 
             }
-            match(input,128,FOLLOW_2); if (state.failed) return ;
+            match(input,127,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGridPropIndicatorStyleAccess().getGreenFromKeyword_2()); 
             }
@@ -38613,16 +36502,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__GridPropIndicatorStyle__Group__3"
-    // InternalTableDSL.g:11375:1: rule__GridPropIndicatorStyle__Group__3 : rule__GridPropIndicatorStyle__Group__3__Impl rule__GridPropIndicatorStyle__Group__4 ;
+    // InternalTableDSL.g:10700:1: rule__GridPropIndicatorStyle__Group__3 : rule__GridPropIndicatorStyle__Group__3__Impl rule__GridPropIndicatorStyle__Group__4 ;
     public final void rule__GridPropIndicatorStyle__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11379:1: ( rule__GridPropIndicatorStyle__Group__3__Impl rule__GridPropIndicatorStyle__Group__4 )
-            // InternalTableDSL.g:11380:2: rule__GridPropIndicatorStyle__Group__3__Impl rule__GridPropIndicatorStyle__Group__4
+            // InternalTableDSL.g:10704:1: ( rule__GridPropIndicatorStyle__Group__3__Impl rule__GridPropIndicatorStyle__Group__4 )
+            // InternalTableDSL.g:10705:2: rule__GridPropIndicatorStyle__Group__3__Impl rule__GridPropIndicatorStyle__Group__4
             {
-            pushFollow(FOLLOW_80);
+            pushFollow(FOLLOW_78);
             rule__GridPropIndicatorStyle__Group__3__Impl();
 
             state._fsp--;
@@ -38651,23 +36540,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__GridPropIndicatorStyle__Group__3__Impl"
-    // InternalTableDSL.g:11387:1: rule__GridPropIndicatorStyle__Group__3__Impl : ( ( rule__GridPropIndicatorStyle__GreenStartsAssignment_3 ) ) ;
+    // InternalTableDSL.g:10712:1: rule__GridPropIndicatorStyle__Group__3__Impl : ( ( rule__GridPropIndicatorStyle__GreenStartsAssignment_3 ) ) ;
     public final void rule__GridPropIndicatorStyle__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11391:1: ( ( ( rule__GridPropIndicatorStyle__GreenStartsAssignment_3 ) ) )
-            // InternalTableDSL.g:11392:1: ( ( rule__GridPropIndicatorStyle__GreenStartsAssignment_3 ) )
+            // InternalTableDSL.g:10716:1: ( ( ( rule__GridPropIndicatorStyle__GreenStartsAssignment_3 ) ) )
+            // InternalTableDSL.g:10717:1: ( ( rule__GridPropIndicatorStyle__GreenStartsAssignment_3 ) )
             {
-            // InternalTableDSL.g:11392:1: ( ( rule__GridPropIndicatorStyle__GreenStartsAssignment_3 ) )
-            // InternalTableDSL.g:11393:2: ( rule__GridPropIndicatorStyle__GreenStartsAssignment_3 )
+            // InternalTableDSL.g:10717:1: ( ( rule__GridPropIndicatorStyle__GreenStartsAssignment_3 ) )
+            // InternalTableDSL.g:10718:2: ( rule__GridPropIndicatorStyle__GreenStartsAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGridPropIndicatorStyleAccess().getGreenStartsAssignment_3()); 
             }
-            // InternalTableDSL.g:11394:2: ( rule__GridPropIndicatorStyle__GreenStartsAssignment_3 )
-            // InternalTableDSL.g:11394:3: rule__GridPropIndicatorStyle__GreenStartsAssignment_3
+            // InternalTableDSL.g:10719:2: ( rule__GridPropIndicatorStyle__GreenStartsAssignment_3 )
+            // InternalTableDSL.g:10719:3: rule__GridPropIndicatorStyle__GreenStartsAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__GridPropIndicatorStyle__GreenStartsAssignment_3();
@@ -38702,16 +36591,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__GridPropIndicatorStyle__Group__4"
-    // InternalTableDSL.g:11402:1: rule__GridPropIndicatorStyle__Group__4 : rule__GridPropIndicatorStyle__Group__4__Impl rule__GridPropIndicatorStyle__Group__5 ;
+    // InternalTableDSL.g:10727:1: rule__GridPropIndicatorStyle__Group__4 : rule__GridPropIndicatorStyle__Group__4__Impl rule__GridPropIndicatorStyle__Group__5 ;
     public final void rule__GridPropIndicatorStyle__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11406:1: ( rule__GridPropIndicatorStyle__Group__4__Impl rule__GridPropIndicatorStyle__Group__5 )
-            // InternalTableDSL.g:11407:2: rule__GridPropIndicatorStyle__Group__4__Impl rule__GridPropIndicatorStyle__Group__5
+            // InternalTableDSL.g:10731:1: ( rule__GridPropIndicatorStyle__Group__4__Impl rule__GridPropIndicatorStyle__Group__5 )
+            // InternalTableDSL.g:10732:2: rule__GridPropIndicatorStyle__Group__4__Impl rule__GridPropIndicatorStyle__Group__5
             {
-            pushFollow(FOLLOW_78);
+            pushFollow(FOLLOW_76);
             rule__GridPropIndicatorStyle__Group__4__Impl();
 
             state._fsp--;
@@ -38740,22 +36629,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__GridPropIndicatorStyle__Group__4__Impl"
-    // InternalTableDSL.g:11414:1: rule__GridPropIndicatorStyle__Group__4__Impl : ( 'redUntil' ) ;
+    // InternalTableDSL.g:10739:1: rule__GridPropIndicatorStyle__Group__4__Impl : ( 'redUntil' ) ;
     public final void rule__GridPropIndicatorStyle__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11418:1: ( ( 'redUntil' ) )
-            // InternalTableDSL.g:11419:1: ( 'redUntil' )
+            // InternalTableDSL.g:10743:1: ( ( 'redUntil' ) )
+            // InternalTableDSL.g:10744:1: ( 'redUntil' )
             {
-            // InternalTableDSL.g:11419:1: ( 'redUntil' )
-            // InternalTableDSL.g:11420:2: 'redUntil'
+            // InternalTableDSL.g:10744:1: ( 'redUntil' )
+            // InternalTableDSL.g:10745:2: 'redUntil'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGridPropIndicatorStyleAccess().getRedUntilKeyword_4()); 
             }
-            match(input,129,FOLLOW_2); if (state.failed) return ;
+            match(input,128,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGridPropIndicatorStyleAccess().getRedUntilKeyword_4()); 
             }
@@ -38781,14 +36670,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__GridPropIndicatorStyle__Group__5"
-    // InternalTableDSL.g:11429:1: rule__GridPropIndicatorStyle__Group__5 : rule__GridPropIndicatorStyle__Group__5__Impl ;
+    // InternalTableDSL.g:10754:1: rule__GridPropIndicatorStyle__Group__5 : rule__GridPropIndicatorStyle__Group__5__Impl ;
     public final void rule__GridPropIndicatorStyle__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11433:1: ( rule__GridPropIndicatorStyle__Group__5__Impl )
-            // InternalTableDSL.g:11434:2: rule__GridPropIndicatorStyle__Group__5__Impl
+            // InternalTableDSL.g:10758:1: ( rule__GridPropIndicatorStyle__Group__5__Impl )
+            // InternalTableDSL.g:10759:2: rule__GridPropIndicatorStyle__Group__5__Impl
             {
             pushFollow(FOLLOW_2);
             rule__GridPropIndicatorStyle__Group__5__Impl();
@@ -38814,23 +36703,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__GridPropIndicatorStyle__Group__5__Impl"
-    // InternalTableDSL.g:11440:1: rule__GridPropIndicatorStyle__Group__5__Impl : ( ( rule__GridPropIndicatorStyle__RedEndsAssignment_5 ) ) ;
+    // InternalTableDSL.g:10765:1: rule__GridPropIndicatorStyle__Group__5__Impl : ( ( rule__GridPropIndicatorStyle__RedEndsAssignment_5 ) ) ;
     public final void rule__GridPropIndicatorStyle__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11444:1: ( ( ( rule__GridPropIndicatorStyle__RedEndsAssignment_5 ) ) )
-            // InternalTableDSL.g:11445:1: ( ( rule__GridPropIndicatorStyle__RedEndsAssignment_5 ) )
+            // InternalTableDSL.g:10769:1: ( ( ( rule__GridPropIndicatorStyle__RedEndsAssignment_5 ) ) )
+            // InternalTableDSL.g:10770:1: ( ( rule__GridPropIndicatorStyle__RedEndsAssignment_5 ) )
             {
-            // InternalTableDSL.g:11445:1: ( ( rule__GridPropIndicatorStyle__RedEndsAssignment_5 ) )
-            // InternalTableDSL.g:11446:2: ( rule__GridPropIndicatorStyle__RedEndsAssignment_5 )
+            // InternalTableDSL.g:10770:1: ( ( rule__GridPropIndicatorStyle__RedEndsAssignment_5 ) )
+            // InternalTableDSL.g:10771:2: ( rule__GridPropIndicatorStyle__RedEndsAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGridPropIndicatorStyleAccess().getRedEndsAssignment_5()); 
             }
-            // InternalTableDSL.g:11447:2: ( rule__GridPropIndicatorStyle__RedEndsAssignment_5 )
-            // InternalTableDSL.g:11447:3: rule__GridPropIndicatorStyle__RedEndsAssignment_5
+            // InternalTableDSL.g:10772:2: ( rule__GridPropIndicatorStyle__RedEndsAssignment_5 )
+            // InternalTableDSL.g:10772:3: rule__GridPropIndicatorStyle__RedEndsAssignment_5
             {
             pushFollow(FOLLOW_2);
             rule__GridPropIndicatorStyle__RedEndsAssignment_5();
@@ -38865,16 +36754,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyTextStyle__Group__0"
-    // InternalTableDSL.g:11456:1: rule__PropertyTextStyle__Group__0 : rule__PropertyTextStyle__Group__0__Impl rule__PropertyTextStyle__Group__1 ;
+    // InternalTableDSL.g:10781:1: rule__PropertyTextStyle__Group__0 : rule__PropertyTextStyle__Group__0__Impl rule__PropertyTextStyle__Group__1 ;
     public final void rule__PropertyTextStyle__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11460:1: ( rule__PropertyTextStyle__Group__0__Impl rule__PropertyTextStyle__Group__1 )
-            // InternalTableDSL.g:11461:2: rule__PropertyTextStyle__Group__0__Impl rule__PropertyTextStyle__Group__1
+            // InternalTableDSL.g:10785:1: ( rule__PropertyTextStyle__Group__0__Impl rule__PropertyTextStyle__Group__1 )
+            // InternalTableDSL.g:10786:2: rule__PropertyTextStyle__Group__0__Impl rule__PropertyTextStyle__Group__1
             {
-            pushFollow(FOLLOW_81);
+            pushFollow(FOLLOW_79);
             rule__PropertyTextStyle__Group__0__Impl();
 
             state._fsp--;
@@ -38903,23 +36792,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyTextStyle__Group__0__Impl"
-    // InternalTableDSL.g:11468:1: rule__PropertyTextStyle__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:10793:1: rule__PropertyTextStyle__Group__0__Impl : ( () ) ;
     public final void rule__PropertyTextStyle__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11472:1: ( ( () ) )
-            // InternalTableDSL.g:11473:1: ( () )
+            // InternalTableDSL.g:10797:1: ( ( () ) )
+            // InternalTableDSL.g:10798:1: ( () )
             {
-            // InternalTableDSL.g:11473:1: ( () )
-            // InternalTableDSL.g:11474:2: ()
+            // InternalTableDSL.g:10798:1: ( () )
+            // InternalTableDSL.g:10799:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyTextStyleAccess().getCxGridPropTextStyleAction_0()); 
             }
-            // InternalTableDSL.g:11475:2: ()
-            // InternalTableDSL.g:11475:3: 
+            // InternalTableDSL.g:10800:2: ()
+            // InternalTableDSL.g:10800:3: 
             {
             }
 
@@ -38944,14 +36833,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyTextStyle__Group__1"
-    // InternalTableDSL.g:11483:1: rule__PropertyTextStyle__Group__1 : rule__PropertyTextStyle__Group__1__Impl ;
+    // InternalTableDSL.g:10808:1: rule__PropertyTextStyle__Group__1 : rule__PropertyTextStyle__Group__1__Impl ;
     public final void rule__PropertyTextStyle__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11487:1: ( rule__PropertyTextStyle__Group__1__Impl )
-            // InternalTableDSL.g:11488:2: rule__PropertyTextStyle__Group__1__Impl
+            // InternalTableDSL.g:10812:1: ( rule__PropertyTextStyle__Group__1__Impl )
+            // InternalTableDSL.g:10813:2: rule__PropertyTextStyle__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PropertyTextStyle__Group__1__Impl();
@@ -38977,22 +36866,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyTextStyle__Group__1__Impl"
-    // InternalTableDSL.g:11494:1: rule__PropertyTextStyle__Group__1__Impl : ( 'textStyle' ) ;
+    // InternalTableDSL.g:10819:1: rule__PropertyTextStyle__Group__1__Impl : ( 'textStyle' ) ;
     public final void rule__PropertyTextStyle__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11498:1: ( ( 'textStyle' ) )
-            // InternalTableDSL.g:11499:1: ( 'textStyle' )
+            // InternalTableDSL.g:10823:1: ( ( 'textStyle' ) )
+            // InternalTableDSL.g:10824:1: ( 'textStyle' )
             {
-            // InternalTableDSL.g:11499:1: ( 'textStyle' )
-            // InternalTableDSL.g:11500:2: 'textStyle'
+            // InternalTableDSL.g:10824:1: ( 'textStyle' )
+            // InternalTableDSL.g:10825:2: 'textStyle'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyTextStyleAccess().getTextStyleKeyword_1()); 
             }
-            match(input,130,FOLLOW_2); if (state.failed) return ;
+            match(input,129,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPropertyTextStyleAccess().getTextStyleKeyword_1()); 
             }
@@ -39017,17 +36906,170 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     // $ANTLR end "rule__PropertyTextStyle__Group__1__Impl"
 
 
+    // $ANTLR start "rule__PropertyBlobImageStyle__Group__0"
+    // InternalTableDSL.g:10835:1: rule__PropertyBlobImageStyle__Group__0 : rule__PropertyBlobImageStyle__Group__0__Impl rule__PropertyBlobImageStyle__Group__1 ;
+    public final void rule__PropertyBlobImageStyle__Group__0() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+        	
+        try {
+            // InternalTableDSL.g:10839:1: ( rule__PropertyBlobImageStyle__Group__0__Impl rule__PropertyBlobImageStyle__Group__1 )
+            // InternalTableDSL.g:10840:2: rule__PropertyBlobImageStyle__Group__0__Impl rule__PropertyBlobImageStyle__Group__1
+            {
+            pushFollow(FOLLOW_80);
+            rule__PropertyBlobImageStyle__Group__0__Impl();
+
+            state._fsp--;
+            if (state.failed) return ;
+            pushFollow(FOLLOW_2);
+            rule__PropertyBlobImageStyle__Group__1();
+
+            state._fsp--;
+            if (state.failed) return ;
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__PropertyBlobImageStyle__Group__0"
+
+
+    // $ANTLR start "rule__PropertyBlobImageStyle__Group__0__Impl"
+    // InternalTableDSL.g:10847:1: rule__PropertyBlobImageStyle__Group__0__Impl : ( () ) ;
+    public final void rule__PropertyBlobImageStyle__Group__0__Impl() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+        	
+        try {
+            // InternalTableDSL.g:10851:1: ( ( () ) )
+            // InternalTableDSL.g:10852:1: ( () )
+            {
+            // InternalTableDSL.g:10852:1: ( () )
+            // InternalTableDSL.g:10853:2: ()
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getPropertyBlobImageStyleAccess().getCxGridPropBlobImageStyleAction_0()); 
+            }
+            // InternalTableDSL.g:10854:2: ()
+            // InternalTableDSL.g:10854:3: 
+            {
+            }
+
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getPropertyBlobImageStyleAccess().getCxGridPropBlobImageStyleAction_0()); 
+            }
+
+            }
+
+
+            }
+
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__PropertyBlobImageStyle__Group__0__Impl"
+
+
+    // $ANTLR start "rule__PropertyBlobImageStyle__Group__1"
+    // InternalTableDSL.g:10862:1: rule__PropertyBlobImageStyle__Group__1 : rule__PropertyBlobImageStyle__Group__1__Impl ;
+    public final void rule__PropertyBlobImageStyle__Group__1() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+        	
+        try {
+            // InternalTableDSL.g:10866:1: ( rule__PropertyBlobImageStyle__Group__1__Impl )
+            // InternalTableDSL.g:10867:2: rule__PropertyBlobImageStyle__Group__1__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__PropertyBlobImageStyle__Group__1__Impl();
+
+            state._fsp--;
+            if (state.failed) return ;
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__PropertyBlobImageStyle__Group__1"
+
+
+    // $ANTLR start "rule__PropertyBlobImageStyle__Group__1__Impl"
+    // InternalTableDSL.g:10873:1: rule__PropertyBlobImageStyle__Group__1__Impl : ( 'blobImageStyle' ) ;
+    public final void rule__PropertyBlobImageStyle__Group__1__Impl() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+        	
+        try {
+            // InternalTableDSL.g:10877:1: ( ( 'blobImageStyle' ) )
+            // InternalTableDSL.g:10878:1: ( 'blobImageStyle' )
+            {
+            // InternalTableDSL.g:10878:1: ( 'blobImageStyle' )
+            // InternalTableDSL.g:10879:2: 'blobImageStyle'
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getPropertyBlobImageStyleAccess().getBlobImageStyleKeyword_1()); 
+            }
+            match(input,130,FOLLOW_2); if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getPropertyBlobImageStyleAccess().getBlobImageStyleKeyword_1()); 
+            }
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__PropertyBlobImageStyle__Group__1__Impl"
+
+
     // $ANTLR start "rule__PropertyImageStyle__Group__0"
-    // InternalTableDSL.g:11510:1: rule__PropertyImageStyle__Group__0 : rule__PropertyImageStyle__Group__0__Impl rule__PropertyImageStyle__Group__1 ;
+    // InternalTableDSL.g:10889:1: rule__PropertyImageStyle__Group__0 : rule__PropertyImageStyle__Group__0__Impl rule__PropertyImageStyle__Group__1 ;
     public final void rule__PropertyImageStyle__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11514:1: ( rule__PropertyImageStyle__Group__0__Impl rule__PropertyImageStyle__Group__1 )
-            // InternalTableDSL.g:11515:2: rule__PropertyImageStyle__Group__0__Impl rule__PropertyImageStyle__Group__1
+            // InternalTableDSL.g:10893:1: ( rule__PropertyImageStyle__Group__0__Impl rule__PropertyImageStyle__Group__1 )
+            // InternalTableDSL.g:10894:2: rule__PropertyImageStyle__Group__0__Impl rule__PropertyImageStyle__Group__1
             {
-            pushFollow(FOLLOW_82);
+            pushFollow(FOLLOW_81);
             rule__PropertyImageStyle__Group__0__Impl();
 
             state._fsp--;
@@ -39056,23 +37098,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__Group__0__Impl"
-    // InternalTableDSL.g:11522:1: rule__PropertyImageStyle__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:10901:1: rule__PropertyImageStyle__Group__0__Impl : ( () ) ;
     public final void rule__PropertyImageStyle__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11526:1: ( ( () ) )
-            // InternalTableDSL.g:11527:1: ( () )
+            // InternalTableDSL.g:10905:1: ( ( () ) )
+            // InternalTableDSL.g:10906:1: ( () )
             {
-            // InternalTableDSL.g:11527:1: ( () )
-            // InternalTableDSL.g:11528:2: ()
+            // InternalTableDSL.g:10906:1: ( () )
+            // InternalTableDSL.g:10907:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyImageStyleAccess().getCxGridPropImageStyleAction_0()); 
             }
-            // InternalTableDSL.g:11529:2: ()
-            // InternalTableDSL.g:11529:3: 
+            // InternalTableDSL.g:10908:2: ()
+            // InternalTableDSL.g:10908:3: 
             {
             }
 
@@ -39097,16 +37139,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__Group__1"
-    // InternalTableDSL.g:11537:1: rule__PropertyImageStyle__Group__1 : rule__PropertyImageStyle__Group__1__Impl rule__PropertyImageStyle__Group__2 ;
+    // InternalTableDSL.g:10916:1: rule__PropertyImageStyle__Group__1 : rule__PropertyImageStyle__Group__1__Impl rule__PropertyImageStyle__Group__2 ;
     public final void rule__PropertyImageStyle__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11541:1: ( rule__PropertyImageStyle__Group__1__Impl rule__PropertyImageStyle__Group__2 )
-            // InternalTableDSL.g:11542:2: rule__PropertyImageStyle__Group__1__Impl rule__PropertyImageStyle__Group__2
+            // InternalTableDSL.g:10920:1: ( rule__PropertyImageStyle__Group__1__Impl rule__PropertyImageStyle__Group__2 )
+            // InternalTableDSL.g:10921:2: rule__PropertyImageStyle__Group__1__Impl rule__PropertyImageStyle__Group__2
             {
-            pushFollow(FOLLOW_83);
+            pushFollow(FOLLOW_82);
             rule__PropertyImageStyle__Group__1__Impl();
 
             state._fsp--;
@@ -39135,17 +37177,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__Group__1__Impl"
-    // InternalTableDSL.g:11549:1: rule__PropertyImageStyle__Group__1__Impl : ( 'imageStyle' ) ;
+    // InternalTableDSL.g:10928:1: rule__PropertyImageStyle__Group__1__Impl : ( 'imageStyle' ) ;
     public final void rule__PropertyImageStyle__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11553:1: ( ( 'imageStyle' ) )
-            // InternalTableDSL.g:11554:1: ( 'imageStyle' )
+            // InternalTableDSL.g:10932:1: ( ( 'imageStyle' ) )
+            // InternalTableDSL.g:10933:1: ( 'imageStyle' )
             {
-            // InternalTableDSL.g:11554:1: ( 'imageStyle' )
-            // InternalTableDSL.g:11555:2: 'imageStyle'
+            // InternalTableDSL.g:10933:1: ( 'imageStyle' )
+            // InternalTableDSL.g:10934:2: 'imageStyle'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyImageStyleAccess().getImageStyleKeyword_1()); 
@@ -39176,16 +37218,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__Group__2"
-    // InternalTableDSL.g:11564:1: rule__PropertyImageStyle__Group__2 : rule__PropertyImageStyle__Group__2__Impl rule__PropertyImageStyle__Group__3 ;
+    // InternalTableDSL.g:10943:1: rule__PropertyImageStyle__Group__2 : rule__PropertyImageStyle__Group__2__Impl rule__PropertyImageStyle__Group__3 ;
     public final void rule__PropertyImageStyle__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11568:1: ( rule__PropertyImageStyle__Group__2__Impl rule__PropertyImageStyle__Group__3 )
-            // InternalTableDSL.g:11569:2: rule__PropertyImageStyle__Group__2__Impl rule__PropertyImageStyle__Group__3
+            // InternalTableDSL.g:10947:1: ( rule__PropertyImageStyle__Group__2__Impl rule__PropertyImageStyle__Group__3 )
+            // InternalTableDSL.g:10948:2: rule__PropertyImageStyle__Group__2__Impl rule__PropertyImageStyle__Group__3
             {
-            pushFollow(FOLLOW_83);
+            pushFollow(FOLLOW_82);
             rule__PropertyImageStyle__Group__2__Impl();
 
             state._fsp--;
@@ -39214,31 +37256,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__Group__2__Impl"
-    // InternalTableDSL.g:11576:1: rule__PropertyImageStyle__Group__2__Impl : ( ( rule__PropertyImageStyle__Group_2__0 )? ) ;
+    // InternalTableDSL.g:10955:1: rule__PropertyImageStyle__Group__2__Impl : ( ( rule__PropertyImageStyle__Group_2__0 )? ) ;
     public final void rule__PropertyImageStyle__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11580:1: ( ( ( rule__PropertyImageStyle__Group_2__0 )? ) )
-            // InternalTableDSL.g:11581:1: ( ( rule__PropertyImageStyle__Group_2__0 )? )
+            // InternalTableDSL.g:10959:1: ( ( ( rule__PropertyImageStyle__Group_2__0 )? ) )
+            // InternalTableDSL.g:10960:1: ( ( rule__PropertyImageStyle__Group_2__0 )? )
             {
-            // InternalTableDSL.g:11581:1: ( ( rule__PropertyImageStyle__Group_2__0 )? )
-            // InternalTableDSL.g:11582:2: ( rule__PropertyImageStyle__Group_2__0 )?
+            // InternalTableDSL.g:10960:1: ( ( rule__PropertyImageStyle__Group_2__0 )? )
+            // InternalTableDSL.g:10961:2: ( rule__PropertyImageStyle__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyImageStyleAccess().getGroup_2()); 
             }
-            // InternalTableDSL.g:11583:2: ( rule__PropertyImageStyle__Group_2__0 )?
-            int alt84=2;
-            int LA84_0 = input.LA(1);
+            // InternalTableDSL.g:10962:2: ( rule__PropertyImageStyle__Group_2__0 )?
+            int alt82=2;
+            int LA82_0 = input.LA(1);
 
-            if ( (LA84_0==119) ) {
-                alt84=1;
+            if ( (LA82_0==118) ) {
+                alt82=1;
             }
-            switch (alt84) {
+            switch (alt82) {
                 case 1 :
-                    // InternalTableDSL.g:11583:3: rule__PropertyImageStyle__Group_2__0
+                    // InternalTableDSL.g:10962:3: rule__PropertyImageStyle__Group_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__PropertyImageStyle__Group_2__0();
@@ -39276,16 +37318,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__Group__3"
-    // InternalTableDSL.g:11591:1: rule__PropertyImageStyle__Group__3 : rule__PropertyImageStyle__Group__3__Impl rule__PropertyImageStyle__Group__4 ;
+    // InternalTableDSL.g:10970:1: rule__PropertyImageStyle__Group__3 : rule__PropertyImageStyle__Group__3__Impl rule__PropertyImageStyle__Group__4 ;
     public final void rule__PropertyImageStyle__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11595:1: ( rule__PropertyImageStyle__Group__3__Impl rule__PropertyImageStyle__Group__4 )
-            // InternalTableDSL.g:11596:2: rule__PropertyImageStyle__Group__3__Impl rule__PropertyImageStyle__Group__4
+            // InternalTableDSL.g:10974:1: ( rule__PropertyImageStyle__Group__3__Impl rule__PropertyImageStyle__Group__4 )
+            // InternalTableDSL.g:10975:2: rule__PropertyImageStyle__Group__3__Impl rule__PropertyImageStyle__Group__4
             {
-            pushFollow(FOLLOW_84);
+            pushFollow(FOLLOW_83);
             rule__PropertyImageStyle__Group__3__Impl();
 
             state._fsp--;
@@ -39314,17 +37356,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__Group__3__Impl"
-    // InternalTableDSL.g:11603:1: rule__PropertyImageStyle__Group__3__Impl : ( '{' ) ;
+    // InternalTableDSL.g:10982:1: rule__PropertyImageStyle__Group__3__Impl : ( '{' ) ;
     public final void rule__PropertyImageStyle__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11607:1: ( ( '{' ) )
-            // InternalTableDSL.g:11608:1: ( '{' )
+            // InternalTableDSL.g:10986:1: ( ( '{' ) )
+            // InternalTableDSL.g:10987:1: ( '{' )
             {
-            // InternalTableDSL.g:11608:1: ( '{' )
-            // InternalTableDSL.g:11609:2: '{'
+            // InternalTableDSL.g:10987:1: ( '{' )
+            // InternalTableDSL.g:10988:2: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyImageStyleAccess().getLeftCurlyBracketKeyword_3()); 
@@ -39355,16 +37397,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__Group__4"
-    // InternalTableDSL.g:11618:1: rule__PropertyImageStyle__Group__4 : rule__PropertyImageStyle__Group__4__Impl rule__PropertyImageStyle__Group__5 ;
+    // InternalTableDSL.g:10997:1: rule__PropertyImageStyle__Group__4 : rule__PropertyImageStyle__Group__4__Impl rule__PropertyImageStyle__Group__5 ;
     public final void rule__PropertyImageStyle__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11622:1: ( rule__PropertyImageStyle__Group__4__Impl rule__PropertyImageStyle__Group__5 )
-            // InternalTableDSL.g:11623:2: rule__PropertyImageStyle__Group__4__Impl rule__PropertyImageStyle__Group__5
+            // InternalTableDSL.g:11001:1: ( rule__PropertyImageStyle__Group__4__Impl rule__PropertyImageStyle__Group__5 )
+            // InternalTableDSL.g:11002:2: rule__PropertyImageStyle__Group__4__Impl rule__PropertyImageStyle__Group__5
             {
-            pushFollow(FOLLOW_84);
+            pushFollow(FOLLOW_83);
             rule__PropertyImageStyle__Group__4__Impl();
 
             state._fsp--;
@@ -39393,37 +37435,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__Group__4__Impl"
-    // InternalTableDSL.g:11630:1: rule__PropertyImageStyle__Group__4__Impl : ( ( rule__PropertyImageStyle__ConfigsAssignment_4 )* ) ;
+    // InternalTableDSL.g:11009:1: rule__PropertyImageStyle__Group__4__Impl : ( ( rule__PropertyImageStyle__ConfigsAssignment_4 )* ) ;
     public final void rule__PropertyImageStyle__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11634:1: ( ( ( rule__PropertyImageStyle__ConfigsAssignment_4 )* ) )
-            // InternalTableDSL.g:11635:1: ( ( rule__PropertyImageStyle__ConfigsAssignment_4 )* )
+            // InternalTableDSL.g:11013:1: ( ( ( rule__PropertyImageStyle__ConfigsAssignment_4 )* ) )
+            // InternalTableDSL.g:11014:1: ( ( rule__PropertyImageStyle__ConfigsAssignment_4 )* )
             {
-            // InternalTableDSL.g:11635:1: ( ( rule__PropertyImageStyle__ConfigsAssignment_4 )* )
-            // InternalTableDSL.g:11636:2: ( rule__PropertyImageStyle__ConfigsAssignment_4 )*
+            // InternalTableDSL.g:11014:1: ( ( rule__PropertyImageStyle__ConfigsAssignment_4 )* )
+            // InternalTableDSL.g:11015:2: ( rule__PropertyImageStyle__ConfigsAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyImageStyleAccess().getConfigsAssignment_4()); 
             }
-            // InternalTableDSL.g:11637:2: ( rule__PropertyImageStyle__ConfigsAssignment_4 )*
-            loop85:
+            // InternalTableDSL.g:11016:2: ( rule__PropertyImageStyle__ConfigsAssignment_4 )*
+            loop83:
             do {
-                int alt85=2;
-                int LA85_0 = input.LA(1);
+                int alt83=2;
+                int LA83_0 = input.LA(1);
 
-                if ( ((LA85_0>=105 && LA85_0<=106)) ) {
-                    alt85=1;
+                if ( ((LA83_0>=105 && LA83_0<=106)) ) {
+                    alt83=1;
                 }
 
 
-                switch (alt85) {
+                switch (alt83) {
             	case 1 :
-            	    // InternalTableDSL.g:11637:3: rule__PropertyImageStyle__ConfigsAssignment_4
+            	    // InternalTableDSL.g:11016:3: rule__PropertyImageStyle__ConfigsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_85);
+            	    pushFollow(FOLLOW_84);
             	    rule__PropertyImageStyle__ConfigsAssignment_4();
 
             	    state._fsp--;
@@ -39433,7 +37475,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop85;
+            	    break loop83;
                 }
             } while (true);
 
@@ -39462,14 +37504,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__Group__5"
-    // InternalTableDSL.g:11645:1: rule__PropertyImageStyle__Group__5 : rule__PropertyImageStyle__Group__5__Impl ;
+    // InternalTableDSL.g:11024:1: rule__PropertyImageStyle__Group__5 : rule__PropertyImageStyle__Group__5__Impl ;
     public final void rule__PropertyImageStyle__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11649:1: ( rule__PropertyImageStyle__Group__5__Impl )
-            // InternalTableDSL.g:11650:2: rule__PropertyImageStyle__Group__5__Impl
+            // InternalTableDSL.g:11028:1: ( rule__PropertyImageStyle__Group__5__Impl )
+            // InternalTableDSL.g:11029:2: rule__PropertyImageStyle__Group__5__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PropertyImageStyle__Group__5__Impl();
@@ -39495,17 +37537,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__Group__5__Impl"
-    // InternalTableDSL.g:11656:1: rule__PropertyImageStyle__Group__5__Impl : ( '}' ) ;
+    // InternalTableDSL.g:11035:1: rule__PropertyImageStyle__Group__5__Impl : ( '}' ) ;
     public final void rule__PropertyImageStyle__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11660:1: ( ( '}' ) )
-            // InternalTableDSL.g:11661:1: ( '}' )
+            // InternalTableDSL.g:11039:1: ( ( '}' ) )
+            // InternalTableDSL.g:11040:1: ( '}' )
             {
-            // InternalTableDSL.g:11661:1: ( '}' )
-            // InternalTableDSL.g:11662:2: '}'
+            // InternalTableDSL.g:11040:1: ( '}' )
+            // InternalTableDSL.g:11041:2: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyImageStyleAccess().getRightCurlyBracketKeyword_5()); 
@@ -39536,14 +37578,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__Group_2__0"
-    // InternalTableDSL.g:11672:1: rule__PropertyImageStyle__Group_2__0 : rule__PropertyImageStyle__Group_2__0__Impl rule__PropertyImageStyle__Group_2__1 ;
+    // InternalTableDSL.g:11051:1: rule__PropertyImageStyle__Group_2__0 : rule__PropertyImageStyle__Group_2__0__Impl rule__PropertyImageStyle__Group_2__1 ;
     public final void rule__PropertyImageStyle__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11676:1: ( rule__PropertyImageStyle__Group_2__0__Impl rule__PropertyImageStyle__Group_2__1 )
-            // InternalTableDSL.g:11677:2: rule__PropertyImageStyle__Group_2__0__Impl rule__PropertyImageStyle__Group_2__1
+            // InternalTableDSL.g:11055:1: ( rule__PropertyImageStyle__Group_2__0__Impl rule__PropertyImageStyle__Group_2__1 )
+            // InternalTableDSL.g:11056:2: rule__PropertyImageStyle__Group_2__0__Impl rule__PropertyImageStyle__Group_2__1
             {
             pushFollow(FOLLOW_14);
             rule__PropertyImageStyle__Group_2__0__Impl();
@@ -39574,22 +37616,22 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__Group_2__0__Impl"
-    // InternalTableDSL.g:11684:1: rule__PropertyImageStyle__Group_2__0__Impl : ( 'eventTopic' ) ;
+    // InternalTableDSL.g:11063:1: rule__PropertyImageStyle__Group_2__0__Impl : ( 'eventTopic' ) ;
     public final void rule__PropertyImageStyle__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11688:1: ( ( 'eventTopic' ) )
-            // InternalTableDSL.g:11689:1: ( 'eventTopic' )
+            // InternalTableDSL.g:11067:1: ( ( 'eventTopic' ) )
+            // InternalTableDSL.g:11068:1: ( 'eventTopic' )
             {
-            // InternalTableDSL.g:11689:1: ( 'eventTopic' )
-            // InternalTableDSL.g:11690:2: 'eventTopic'
+            // InternalTableDSL.g:11068:1: ( 'eventTopic' )
+            // InternalTableDSL.g:11069:2: 'eventTopic'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyImageStyleAccess().getEventTopicKeyword_2_0()); 
             }
-            match(input,119,FOLLOW_2); if (state.failed) return ;
+            match(input,118,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPropertyImageStyleAccess().getEventTopicKeyword_2_0()); 
             }
@@ -39615,14 +37657,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__Group_2__1"
-    // InternalTableDSL.g:11699:1: rule__PropertyImageStyle__Group_2__1 : rule__PropertyImageStyle__Group_2__1__Impl ;
+    // InternalTableDSL.g:11078:1: rule__PropertyImageStyle__Group_2__1 : rule__PropertyImageStyle__Group_2__1__Impl ;
     public final void rule__PropertyImageStyle__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11703:1: ( rule__PropertyImageStyle__Group_2__1__Impl )
-            // InternalTableDSL.g:11704:2: rule__PropertyImageStyle__Group_2__1__Impl
+            // InternalTableDSL.g:11082:1: ( rule__PropertyImageStyle__Group_2__1__Impl )
+            // InternalTableDSL.g:11083:2: rule__PropertyImageStyle__Group_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PropertyImageStyle__Group_2__1__Impl();
@@ -39648,23 +37690,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__Group_2__1__Impl"
-    // InternalTableDSL.g:11710:1: rule__PropertyImageStyle__Group_2__1__Impl : ( ( rule__PropertyImageStyle__EventTopicAssignment_2_1 ) ) ;
+    // InternalTableDSL.g:11089:1: rule__PropertyImageStyle__Group_2__1__Impl : ( ( rule__PropertyImageStyle__EventTopicAssignment_2_1 ) ) ;
     public final void rule__PropertyImageStyle__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11714:1: ( ( ( rule__PropertyImageStyle__EventTopicAssignment_2_1 ) ) )
-            // InternalTableDSL.g:11715:1: ( ( rule__PropertyImageStyle__EventTopicAssignment_2_1 ) )
+            // InternalTableDSL.g:11093:1: ( ( ( rule__PropertyImageStyle__EventTopicAssignment_2_1 ) ) )
+            // InternalTableDSL.g:11094:1: ( ( rule__PropertyImageStyle__EventTopicAssignment_2_1 ) )
             {
-            // InternalTableDSL.g:11715:1: ( ( rule__PropertyImageStyle__EventTopicAssignment_2_1 ) )
-            // InternalTableDSL.g:11716:2: ( rule__PropertyImageStyle__EventTopicAssignment_2_1 )
+            // InternalTableDSL.g:11094:1: ( ( rule__PropertyImageStyle__EventTopicAssignment_2_1 ) )
+            // InternalTableDSL.g:11095:2: ( rule__PropertyImageStyle__EventTopicAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyImageStyleAccess().getEventTopicAssignment_2_1()); 
             }
-            // InternalTableDSL.g:11717:2: ( rule__PropertyImageStyle__EventTopicAssignment_2_1 )
-            // InternalTableDSL.g:11717:3: rule__PropertyImageStyle__EventTopicAssignment_2_1
+            // InternalTableDSL.g:11096:2: ( rule__PropertyImageStyle__EventTopicAssignment_2_1 )
+            // InternalTableDSL.g:11096:3: rule__PropertyImageStyle__EventTopicAssignment_2_1
             {
             pushFollow(FOLLOW_2);
             rule__PropertyImageStyle__EventTopicAssignment_2_1();
@@ -39699,16 +37741,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NumericToResourceStyleConfig__Group__0"
-    // InternalTableDSL.g:11726:1: rule__NumericToResourceStyleConfig__Group__0 : rule__NumericToResourceStyleConfig__Group__0__Impl rule__NumericToResourceStyleConfig__Group__1 ;
+    // InternalTableDSL.g:11105:1: rule__NumericToResourceStyleConfig__Group__0 : rule__NumericToResourceStyleConfig__Group__0__Impl rule__NumericToResourceStyleConfig__Group__1 ;
     public final void rule__NumericToResourceStyleConfig__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11730:1: ( rule__NumericToResourceStyleConfig__Group__0__Impl rule__NumericToResourceStyleConfig__Group__1 )
-            // InternalTableDSL.g:11731:2: rule__NumericToResourceStyleConfig__Group__0__Impl rule__NumericToResourceStyleConfig__Group__1
+            // InternalTableDSL.g:11109:1: ( rule__NumericToResourceStyleConfig__Group__0__Impl rule__NumericToResourceStyleConfig__Group__1 )
+            // InternalTableDSL.g:11110:2: rule__NumericToResourceStyleConfig__Group__0__Impl rule__NumericToResourceStyleConfig__Group__1
             {
-            pushFollow(FOLLOW_86);
+            pushFollow(FOLLOW_85);
             rule__NumericToResourceStyleConfig__Group__0__Impl();
 
             state._fsp--;
@@ -39737,17 +37779,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NumericToResourceStyleConfig__Group__0__Impl"
-    // InternalTableDSL.g:11738:1: rule__NumericToResourceStyleConfig__Group__0__Impl : ( 'number' ) ;
+    // InternalTableDSL.g:11117:1: rule__NumericToResourceStyleConfig__Group__0__Impl : ( 'number' ) ;
     public final void rule__NumericToResourceStyleConfig__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11742:1: ( ( 'number' ) )
-            // InternalTableDSL.g:11743:1: ( 'number' )
+            // InternalTableDSL.g:11121:1: ( ( 'number' ) )
+            // InternalTableDSL.g:11122:1: ( 'number' )
             {
-            // InternalTableDSL.g:11743:1: ( 'number' )
-            // InternalTableDSL.g:11744:2: 'number'
+            // InternalTableDSL.g:11122:1: ( 'number' )
+            // InternalTableDSL.g:11123:2: 'number'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumericToResourceStyleConfigAccess().getNumberKeyword_0()); 
@@ -39778,16 +37820,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NumericToResourceStyleConfig__Group__1"
-    // InternalTableDSL.g:11753:1: rule__NumericToResourceStyleConfig__Group__1 : rule__NumericToResourceStyleConfig__Group__1__Impl rule__NumericToResourceStyleConfig__Group__2 ;
+    // InternalTableDSL.g:11132:1: rule__NumericToResourceStyleConfig__Group__1 : rule__NumericToResourceStyleConfig__Group__1__Impl rule__NumericToResourceStyleConfig__Group__2 ;
     public final void rule__NumericToResourceStyleConfig__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11757:1: ( rule__NumericToResourceStyleConfig__Group__1__Impl rule__NumericToResourceStyleConfig__Group__2 )
-            // InternalTableDSL.g:11758:2: rule__NumericToResourceStyleConfig__Group__1__Impl rule__NumericToResourceStyleConfig__Group__2
+            // InternalTableDSL.g:11136:1: ( rule__NumericToResourceStyleConfig__Group__1__Impl rule__NumericToResourceStyleConfig__Group__2 )
+            // InternalTableDSL.g:11137:2: rule__NumericToResourceStyleConfig__Group__1__Impl rule__NumericToResourceStyleConfig__Group__2
             {
-            pushFollow(FOLLOW_78);
+            pushFollow(FOLLOW_76);
             rule__NumericToResourceStyleConfig__Group__1__Impl();
 
             state._fsp--;
@@ -39816,23 +37858,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NumericToResourceStyleConfig__Group__1__Impl"
-    // InternalTableDSL.g:11765:1: rule__NumericToResourceStyleConfig__Group__1__Impl : ( ( rule__NumericToResourceStyleConfig__CompareAssignment_1 ) ) ;
+    // InternalTableDSL.g:11144:1: rule__NumericToResourceStyleConfig__Group__1__Impl : ( ( rule__NumericToResourceStyleConfig__CompareAssignment_1 ) ) ;
     public final void rule__NumericToResourceStyleConfig__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11769:1: ( ( ( rule__NumericToResourceStyleConfig__CompareAssignment_1 ) ) )
-            // InternalTableDSL.g:11770:1: ( ( rule__NumericToResourceStyleConfig__CompareAssignment_1 ) )
+            // InternalTableDSL.g:11148:1: ( ( ( rule__NumericToResourceStyleConfig__CompareAssignment_1 ) ) )
+            // InternalTableDSL.g:11149:1: ( ( rule__NumericToResourceStyleConfig__CompareAssignment_1 ) )
             {
-            // InternalTableDSL.g:11770:1: ( ( rule__NumericToResourceStyleConfig__CompareAssignment_1 ) )
-            // InternalTableDSL.g:11771:2: ( rule__NumericToResourceStyleConfig__CompareAssignment_1 )
+            // InternalTableDSL.g:11149:1: ( ( rule__NumericToResourceStyleConfig__CompareAssignment_1 ) )
+            // InternalTableDSL.g:11150:2: ( rule__NumericToResourceStyleConfig__CompareAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumericToResourceStyleConfigAccess().getCompareAssignment_1()); 
             }
-            // InternalTableDSL.g:11772:2: ( rule__NumericToResourceStyleConfig__CompareAssignment_1 )
-            // InternalTableDSL.g:11772:3: rule__NumericToResourceStyleConfig__CompareAssignment_1
+            // InternalTableDSL.g:11151:2: ( rule__NumericToResourceStyleConfig__CompareAssignment_1 )
+            // InternalTableDSL.g:11151:3: rule__NumericToResourceStyleConfig__CompareAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__NumericToResourceStyleConfig__CompareAssignment_1();
@@ -39867,16 +37909,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NumericToResourceStyleConfig__Group__2"
-    // InternalTableDSL.g:11780:1: rule__NumericToResourceStyleConfig__Group__2 : rule__NumericToResourceStyleConfig__Group__2__Impl rule__NumericToResourceStyleConfig__Group__3 ;
+    // InternalTableDSL.g:11159:1: rule__NumericToResourceStyleConfig__Group__2 : rule__NumericToResourceStyleConfig__Group__2__Impl rule__NumericToResourceStyleConfig__Group__3 ;
     public final void rule__NumericToResourceStyleConfig__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11784:1: ( rule__NumericToResourceStyleConfig__Group__2__Impl rule__NumericToResourceStyleConfig__Group__3 )
-            // InternalTableDSL.g:11785:2: rule__NumericToResourceStyleConfig__Group__2__Impl rule__NumericToResourceStyleConfig__Group__3
+            // InternalTableDSL.g:11163:1: ( rule__NumericToResourceStyleConfig__Group__2__Impl rule__NumericToResourceStyleConfig__Group__3 )
+            // InternalTableDSL.g:11164:2: rule__NumericToResourceStyleConfig__Group__2__Impl rule__NumericToResourceStyleConfig__Group__3
             {
-            pushFollow(FOLLOW_87);
+            pushFollow(FOLLOW_86);
             rule__NumericToResourceStyleConfig__Group__2__Impl();
 
             state._fsp--;
@@ -39905,23 +37947,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NumericToResourceStyleConfig__Group__2__Impl"
-    // InternalTableDSL.g:11792:1: rule__NumericToResourceStyleConfig__Group__2__Impl : ( ( rule__NumericToResourceStyleConfig__ValueAssignment_2 ) ) ;
+    // InternalTableDSL.g:11171:1: rule__NumericToResourceStyleConfig__Group__2__Impl : ( ( rule__NumericToResourceStyleConfig__ValueAssignment_2 ) ) ;
     public final void rule__NumericToResourceStyleConfig__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11796:1: ( ( ( rule__NumericToResourceStyleConfig__ValueAssignment_2 ) ) )
-            // InternalTableDSL.g:11797:1: ( ( rule__NumericToResourceStyleConfig__ValueAssignment_2 ) )
+            // InternalTableDSL.g:11175:1: ( ( ( rule__NumericToResourceStyleConfig__ValueAssignment_2 ) ) )
+            // InternalTableDSL.g:11176:1: ( ( rule__NumericToResourceStyleConfig__ValueAssignment_2 ) )
             {
-            // InternalTableDSL.g:11797:1: ( ( rule__NumericToResourceStyleConfig__ValueAssignment_2 ) )
-            // InternalTableDSL.g:11798:2: ( rule__NumericToResourceStyleConfig__ValueAssignment_2 )
+            // InternalTableDSL.g:11176:1: ( ( rule__NumericToResourceStyleConfig__ValueAssignment_2 ) )
+            // InternalTableDSL.g:11177:2: ( rule__NumericToResourceStyleConfig__ValueAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumericToResourceStyleConfigAccess().getValueAssignment_2()); 
             }
-            // InternalTableDSL.g:11799:2: ( rule__NumericToResourceStyleConfig__ValueAssignment_2 )
-            // InternalTableDSL.g:11799:3: rule__NumericToResourceStyleConfig__ValueAssignment_2
+            // InternalTableDSL.g:11178:2: ( rule__NumericToResourceStyleConfig__ValueAssignment_2 )
+            // InternalTableDSL.g:11178:3: rule__NumericToResourceStyleConfig__ValueAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__NumericToResourceStyleConfig__ValueAssignment_2();
@@ -39956,16 +37998,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NumericToResourceStyleConfig__Group__3"
-    // InternalTableDSL.g:11807:1: rule__NumericToResourceStyleConfig__Group__3 : rule__NumericToResourceStyleConfig__Group__3__Impl rule__NumericToResourceStyleConfig__Group__4 ;
+    // InternalTableDSL.g:11186:1: rule__NumericToResourceStyleConfig__Group__3 : rule__NumericToResourceStyleConfig__Group__3__Impl rule__NumericToResourceStyleConfig__Group__4 ;
     public final void rule__NumericToResourceStyleConfig__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11811:1: ( rule__NumericToResourceStyleConfig__Group__3__Impl rule__NumericToResourceStyleConfig__Group__4 )
-            // InternalTableDSL.g:11812:2: rule__NumericToResourceStyleConfig__Group__3__Impl rule__NumericToResourceStyleConfig__Group__4
+            // InternalTableDSL.g:11190:1: ( rule__NumericToResourceStyleConfig__Group__3__Impl rule__NumericToResourceStyleConfig__Group__4 )
+            // InternalTableDSL.g:11191:2: rule__NumericToResourceStyleConfig__Group__3__Impl rule__NumericToResourceStyleConfig__Group__4
             {
-            pushFollow(FOLLOW_88);
+            pushFollow(FOLLOW_87);
             rule__NumericToResourceStyleConfig__Group__3__Impl();
 
             state._fsp--;
@@ -39994,17 +38036,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NumericToResourceStyleConfig__Group__3__Impl"
-    // InternalTableDSL.g:11819:1: rule__NumericToResourceStyleConfig__Group__3__Impl : ( 'then' ) ;
+    // InternalTableDSL.g:11198:1: rule__NumericToResourceStyleConfig__Group__3__Impl : ( 'then' ) ;
     public final void rule__NumericToResourceStyleConfig__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11823:1: ( ( 'then' ) )
-            // InternalTableDSL.g:11824:1: ( 'then' )
+            // InternalTableDSL.g:11202:1: ( ( 'then' ) )
+            // InternalTableDSL.g:11203:1: ( 'then' )
             {
-            // InternalTableDSL.g:11824:1: ( 'then' )
-            // InternalTableDSL.g:11825:2: 'then'
+            // InternalTableDSL.g:11203:1: ( 'then' )
+            // InternalTableDSL.g:11204:2: 'then'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumericToResourceStyleConfigAccess().getThenKeyword_3()); 
@@ -40035,14 +38077,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NumericToResourceStyleConfig__Group__4"
-    // InternalTableDSL.g:11834:1: rule__NumericToResourceStyleConfig__Group__4 : rule__NumericToResourceStyleConfig__Group__4__Impl ;
+    // InternalTableDSL.g:11213:1: rule__NumericToResourceStyleConfig__Group__4 : rule__NumericToResourceStyleConfig__Group__4__Impl ;
     public final void rule__NumericToResourceStyleConfig__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11838:1: ( rule__NumericToResourceStyleConfig__Group__4__Impl )
-            // InternalTableDSL.g:11839:2: rule__NumericToResourceStyleConfig__Group__4__Impl
+            // InternalTableDSL.g:11217:1: ( rule__NumericToResourceStyleConfig__Group__4__Impl )
+            // InternalTableDSL.g:11218:2: rule__NumericToResourceStyleConfig__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__NumericToResourceStyleConfig__Group__4__Impl();
@@ -40068,23 +38110,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NumericToResourceStyleConfig__Group__4__Impl"
-    // InternalTableDSL.g:11845:1: rule__NumericToResourceStyleConfig__Group__4__Impl : ( ( rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4 ) ) ;
+    // InternalTableDSL.g:11224:1: rule__NumericToResourceStyleConfig__Group__4__Impl : ( ( rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4 ) ) ;
     public final void rule__NumericToResourceStyleConfig__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11849:1: ( ( ( rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4 ) ) )
-            // InternalTableDSL.g:11850:1: ( ( rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4 ) )
+            // InternalTableDSL.g:11228:1: ( ( ( rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4 ) ) )
+            // InternalTableDSL.g:11229:1: ( ( rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4 ) )
             {
-            // InternalTableDSL.g:11850:1: ( ( rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4 ) )
-            // InternalTableDSL.g:11851:2: ( rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4 )
+            // InternalTableDSL.g:11229:1: ( ( rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4 ) )
+            // InternalTableDSL.g:11230:2: ( rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumericToResourceStyleConfigAccess().getResourceThemePathAssignment_4()); 
             }
-            // InternalTableDSL.g:11852:2: ( rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4 )
-            // InternalTableDSL.g:11852:3: rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4
+            // InternalTableDSL.g:11231:2: ( rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4 )
+            // InternalTableDSL.g:11231:3: rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4
             {
             pushFollow(FOLLOW_2);
             rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4();
@@ -40119,16 +38161,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__StringToResourceStyleConfig__Group__0"
-    // InternalTableDSL.g:11861:1: rule__StringToResourceStyleConfig__Group__0 : rule__StringToResourceStyleConfig__Group__0__Impl rule__StringToResourceStyleConfig__Group__1 ;
+    // InternalTableDSL.g:11240:1: rule__StringToResourceStyleConfig__Group__0 : rule__StringToResourceStyleConfig__Group__0__Impl rule__StringToResourceStyleConfig__Group__1 ;
     public final void rule__StringToResourceStyleConfig__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11865:1: ( rule__StringToResourceStyleConfig__Group__0__Impl rule__StringToResourceStyleConfig__Group__1 )
-            // InternalTableDSL.g:11866:2: rule__StringToResourceStyleConfig__Group__0__Impl rule__StringToResourceStyleConfig__Group__1
+            // InternalTableDSL.g:11244:1: ( rule__StringToResourceStyleConfig__Group__0__Impl rule__StringToResourceStyleConfig__Group__1 )
+            // InternalTableDSL.g:11245:2: rule__StringToResourceStyleConfig__Group__0__Impl rule__StringToResourceStyleConfig__Group__1
             {
-            pushFollow(FOLLOW_86);
+            pushFollow(FOLLOW_85);
             rule__StringToResourceStyleConfig__Group__0__Impl();
 
             state._fsp--;
@@ -40157,17 +38199,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__StringToResourceStyleConfig__Group__0__Impl"
-    // InternalTableDSL.g:11873:1: rule__StringToResourceStyleConfig__Group__0__Impl : ( 'string' ) ;
+    // InternalTableDSL.g:11252:1: rule__StringToResourceStyleConfig__Group__0__Impl : ( 'string' ) ;
     public final void rule__StringToResourceStyleConfig__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11877:1: ( ( 'string' ) )
-            // InternalTableDSL.g:11878:1: ( 'string' )
+            // InternalTableDSL.g:11256:1: ( ( 'string' ) )
+            // InternalTableDSL.g:11257:1: ( 'string' )
             {
-            // InternalTableDSL.g:11878:1: ( 'string' )
-            // InternalTableDSL.g:11879:2: 'string'
+            // InternalTableDSL.g:11257:1: ( 'string' )
+            // InternalTableDSL.g:11258:2: 'string'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringToResourceStyleConfigAccess().getStringKeyword_0()); 
@@ -40198,14 +38240,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__StringToResourceStyleConfig__Group__1"
-    // InternalTableDSL.g:11888:1: rule__StringToResourceStyleConfig__Group__1 : rule__StringToResourceStyleConfig__Group__1__Impl rule__StringToResourceStyleConfig__Group__2 ;
+    // InternalTableDSL.g:11267:1: rule__StringToResourceStyleConfig__Group__1 : rule__StringToResourceStyleConfig__Group__1__Impl rule__StringToResourceStyleConfig__Group__2 ;
     public final void rule__StringToResourceStyleConfig__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11892:1: ( rule__StringToResourceStyleConfig__Group__1__Impl rule__StringToResourceStyleConfig__Group__2 )
-            // InternalTableDSL.g:11893:2: rule__StringToResourceStyleConfig__Group__1__Impl rule__StringToResourceStyleConfig__Group__2
+            // InternalTableDSL.g:11271:1: ( rule__StringToResourceStyleConfig__Group__1__Impl rule__StringToResourceStyleConfig__Group__2 )
+            // InternalTableDSL.g:11272:2: rule__StringToResourceStyleConfig__Group__1__Impl rule__StringToResourceStyleConfig__Group__2
             {
             pushFollow(FOLLOW_14);
             rule__StringToResourceStyleConfig__Group__1__Impl();
@@ -40236,23 +38278,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__StringToResourceStyleConfig__Group__1__Impl"
-    // InternalTableDSL.g:11900:1: rule__StringToResourceStyleConfig__Group__1__Impl : ( ( rule__StringToResourceStyleConfig__CompareAssignment_1 ) ) ;
+    // InternalTableDSL.g:11279:1: rule__StringToResourceStyleConfig__Group__1__Impl : ( ( rule__StringToResourceStyleConfig__CompareAssignment_1 ) ) ;
     public final void rule__StringToResourceStyleConfig__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11904:1: ( ( ( rule__StringToResourceStyleConfig__CompareAssignment_1 ) ) )
-            // InternalTableDSL.g:11905:1: ( ( rule__StringToResourceStyleConfig__CompareAssignment_1 ) )
+            // InternalTableDSL.g:11283:1: ( ( ( rule__StringToResourceStyleConfig__CompareAssignment_1 ) ) )
+            // InternalTableDSL.g:11284:1: ( ( rule__StringToResourceStyleConfig__CompareAssignment_1 ) )
             {
-            // InternalTableDSL.g:11905:1: ( ( rule__StringToResourceStyleConfig__CompareAssignment_1 ) )
-            // InternalTableDSL.g:11906:2: ( rule__StringToResourceStyleConfig__CompareAssignment_1 )
+            // InternalTableDSL.g:11284:1: ( ( rule__StringToResourceStyleConfig__CompareAssignment_1 ) )
+            // InternalTableDSL.g:11285:2: ( rule__StringToResourceStyleConfig__CompareAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringToResourceStyleConfigAccess().getCompareAssignment_1()); 
             }
-            // InternalTableDSL.g:11907:2: ( rule__StringToResourceStyleConfig__CompareAssignment_1 )
-            // InternalTableDSL.g:11907:3: rule__StringToResourceStyleConfig__CompareAssignment_1
+            // InternalTableDSL.g:11286:2: ( rule__StringToResourceStyleConfig__CompareAssignment_1 )
+            // InternalTableDSL.g:11286:3: rule__StringToResourceStyleConfig__CompareAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__StringToResourceStyleConfig__CompareAssignment_1();
@@ -40287,16 +38329,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__StringToResourceStyleConfig__Group__2"
-    // InternalTableDSL.g:11915:1: rule__StringToResourceStyleConfig__Group__2 : rule__StringToResourceStyleConfig__Group__2__Impl rule__StringToResourceStyleConfig__Group__3 ;
+    // InternalTableDSL.g:11294:1: rule__StringToResourceStyleConfig__Group__2 : rule__StringToResourceStyleConfig__Group__2__Impl rule__StringToResourceStyleConfig__Group__3 ;
     public final void rule__StringToResourceStyleConfig__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11919:1: ( rule__StringToResourceStyleConfig__Group__2__Impl rule__StringToResourceStyleConfig__Group__3 )
-            // InternalTableDSL.g:11920:2: rule__StringToResourceStyleConfig__Group__2__Impl rule__StringToResourceStyleConfig__Group__3
+            // InternalTableDSL.g:11298:1: ( rule__StringToResourceStyleConfig__Group__2__Impl rule__StringToResourceStyleConfig__Group__3 )
+            // InternalTableDSL.g:11299:2: rule__StringToResourceStyleConfig__Group__2__Impl rule__StringToResourceStyleConfig__Group__3
             {
-            pushFollow(FOLLOW_87);
+            pushFollow(FOLLOW_86);
             rule__StringToResourceStyleConfig__Group__2__Impl();
 
             state._fsp--;
@@ -40325,23 +38367,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__StringToResourceStyleConfig__Group__2__Impl"
-    // InternalTableDSL.g:11927:1: rule__StringToResourceStyleConfig__Group__2__Impl : ( ( rule__StringToResourceStyleConfig__ValueAssignment_2 ) ) ;
+    // InternalTableDSL.g:11306:1: rule__StringToResourceStyleConfig__Group__2__Impl : ( ( rule__StringToResourceStyleConfig__ValueAssignment_2 ) ) ;
     public final void rule__StringToResourceStyleConfig__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11931:1: ( ( ( rule__StringToResourceStyleConfig__ValueAssignment_2 ) ) )
-            // InternalTableDSL.g:11932:1: ( ( rule__StringToResourceStyleConfig__ValueAssignment_2 ) )
+            // InternalTableDSL.g:11310:1: ( ( ( rule__StringToResourceStyleConfig__ValueAssignment_2 ) ) )
+            // InternalTableDSL.g:11311:1: ( ( rule__StringToResourceStyleConfig__ValueAssignment_2 ) )
             {
-            // InternalTableDSL.g:11932:1: ( ( rule__StringToResourceStyleConfig__ValueAssignment_2 ) )
-            // InternalTableDSL.g:11933:2: ( rule__StringToResourceStyleConfig__ValueAssignment_2 )
+            // InternalTableDSL.g:11311:1: ( ( rule__StringToResourceStyleConfig__ValueAssignment_2 ) )
+            // InternalTableDSL.g:11312:2: ( rule__StringToResourceStyleConfig__ValueAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringToResourceStyleConfigAccess().getValueAssignment_2()); 
             }
-            // InternalTableDSL.g:11934:2: ( rule__StringToResourceStyleConfig__ValueAssignment_2 )
-            // InternalTableDSL.g:11934:3: rule__StringToResourceStyleConfig__ValueAssignment_2
+            // InternalTableDSL.g:11313:2: ( rule__StringToResourceStyleConfig__ValueAssignment_2 )
+            // InternalTableDSL.g:11313:3: rule__StringToResourceStyleConfig__ValueAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__StringToResourceStyleConfig__ValueAssignment_2();
@@ -40376,16 +38418,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__StringToResourceStyleConfig__Group__3"
-    // InternalTableDSL.g:11942:1: rule__StringToResourceStyleConfig__Group__3 : rule__StringToResourceStyleConfig__Group__3__Impl rule__StringToResourceStyleConfig__Group__4 ;
+    // InternalTableDSL.g:11321:1: rule__StringToResourceStyleConfig__Group__3 : rule__StringToResourceStyleConfig__Group__3__Impl rule__StringToResourceStyleConfig__Group__4 ;
     public final void rule__StringToResourceStyleConfig__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11946:1: ( rule__StringToResourceStyleConfig__Group__3__Impl rule__StringToResourceStyleConfig__Group__4 )
-            // InternalTableDSL.g:11947:2: rule__StringToResourceStyleConfig__Group__3__Impl rule__StringToResourceStyleConfig__Group__4
+            // InternalTableDSL.g:11325:1: ( rule__StringToResourceStyleConfig__Group__3__Impl rule__StringToResourceStyleConfig__Group__4 )
+            // InternalTableDSL.g:11326:2: rule__StringToResourceStyleConfig__Group__3__Impl rule__StringToResourceStyleConfig__Group__4
             {
-            pushFollow(FOLLOW_88);
+            pushFollow(FOLLOW_87);
             rule__StringToResourceStyleConfig__Group__3__Impl();
 
             state._fsp--;
@@ -40414,17 +38456,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__StringToResourceStyleConfig__Group__3__Impl"
-    // InternalTableDSL.g:11954:1: rule__StringToResourceStyleConfig__Group__3__Impl : ( 'then' ) ;
+    // InternalTableDSL.g:11333:1: rule__StringToResourceStyleConfig__Group__3__Impl : ( 'then' ) ;
     public final void rule__StringToResourceStyleConfig__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11958:1: ( ( 'then' ) )
-            // InternalTableDSL.g:11959:1: ( 'then' )
+            // InternalTableDSL.g:11337:1: ( ( 'then' ) )
+            // InternalTableDSL.g:11338:1: ( 'then' )
             {
-            // InternalTableDSL.g:11959:1: ( 'then' )
-            // InternalTableDSL.g:11960:2: 'then'
+            // InternalTableDSL.g:11338:1: ( 'then' )
+            // InternalTableDSL.g:11339:2: 'then'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringToResourceStyleConfigAccess().getThenKeyword_3()); 
@@ -40455,14 +38497,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__StringToResourceStyleConfig__Group__4"
-    // InternalTableDSL.g:11969:1: rule__StringToResourceStyleConfig__Group__4 : rule__StringToResourceStyleConfig__Group__4__Impl ;
+    // InternalTableDSL.g:11348:1: rule__StringToResourceStyleConfig__Group__4 : rule__StringToResourceStyleConfig__Group__4__Impl ;
     public final void rule__StringToResourceStyleConfig__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11973:1: ( rule__StringToResourceStyleConfig__Group__4__Impl )
-            // InternalTableDSL.g:11974:2: rule__StringToResourceStyleConfig__Group__4__Impl
+            // InternalTableDSL.g:11352:1: ( rule__StringToResourceStyleConfig__Group__4__Impl )
+            // InternalTableDSL.g:11353:2: rule__StringToResourceStyleConfig__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__StringToResourceStyleConfig__Group__4__Impl();
@@ -40488,23 +38530,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__StringToResourceStyleConfig__Group__4__Impl"
-    // InternalTableDSL.g:11980:1: rule__StringToResourceStyleConfig__Group__4__Impl : ( ( rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4 ) ) ;
+    // InternalTableDSL.g:11359:1: rule__StringToResourceStyleConfig__Group__4__Impl : ( ( rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4 ) ) ;
     public final void rule__StringToResourceStyleConfig__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:11984:1: ( ( ( rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4 ) ) )
-            // InternalTableDSL.g:11985:1: ( ( rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4 ) )
+            // InternalTableDSL.g:11363:1: ( ( ( rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4 ) ) )
+            // InternalTableDSL.g:11364:1: ( ( rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4 ) )
             {
-            // InternalTableDSL.g:11985:1: ( ( rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4 ) )
-            // InternalTableDSL.g:11986:2: ( rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4 )
+            // InternalTableDSL.g:11364:1: ( ( rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4 ) )
+            // InternalTableDSL.g:11365:2: ( rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringToResourceStyleConfigAccess().getResourceThemePathAssignment_4()); 
             }
-            // InternalTableDSL.g:11987:2: ( rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4 )
-            // InternalTableDSL.g:11987:3: rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4
+            // InternalTableDSL.g:11366:2: ( rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4 )
+            // InternalTableDSL.g:11366:3: rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4
             {
             pushFollow(FOLLOW_2);
             rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4();
@@ -40539,16 +38581,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__LInt__Group__0"
-    // InternalTableDSL.g:11996:1: rule__LInt__Group__0 : rule__LInt__Group__0__Impl rule__LInt__Group__1 ;
+    // InternalTableDSL.g:11375:1: rule__LInt__Group__0 : rule__LInt__Group__0__Impl rule__LInt__Group__1 ;
     public final void rule__LInt__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12000:1: ( rule__LInt__Group__0__Impl rule__LInt__Group__1 )
-            // InternalTableDSL.g:12001:2: rule__LInt__Group__0__Impl rule__LInt__Group__1
+            // InternalTableDSL.g:11379:1: ( rule__LInt__Group__0__Impl rule__LInt__Group__1 )
+            // InternalTableDSL.g:11380:2: rule__LInt__Group__0__Impl rule__LInt__Group__1
             {
-            pushFollow(FOLLOW_78);
+            pushFollow(FOLLOW_76);
             rule__LInt__Group__0__Impl();
 
             state._fsp--;
@@ -40577,31 +38619,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__LInt__Group__0__Impl"
-    // InternalTableDSL.g:12008:1: rule__LInt__Group__0__Impl : ( ( rule__LInt__Alternatives_0 )? ) ;
+    // InternalTableDSL.g:11387:1: rule__LInt__Group__0__Impl : ( ( rule__LInt__Alternatives_0 )? ) ;
     public final void rule__LInt__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12012:1: ( ( ( rule__LInt__Alternatives_0 )? ) )
-            // InternalTableDSL.g:12013:1: ( ( rule__LInt__Alternatives_0 )? )
+            // InternalTableDSL.g:11391:1: ( ( ( rule__LInt__Alternatives_0 )? ) )
+            // InternalTableDSL.g:11392:1: ( ( rule__LInt__Alternatives_0 )? )
             {
-            // InternalTableDSL.g:12013:1: ( ( rule__LInt__Alternatives_0 )? )
-            // InternalTableDSL.g:12014:2: ( rule__LInt__Alternatives_0 )?
+            // InternalTableDSL.g:11392:1: ( ( rule__LInt__Alternatives_0 )? )
+            // InternalTableDSL.g:11393:2: ( rule__LInt__Alternatives_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLIntAccess().getAlternatives_0()); 
             }
-            // InternalTableDSL.g:12015:2: ( rule__LInt__Alternatives_0 )?
-            int alt86=2;
-            int LA86_0 = input.LA(1);
+            // InternalTableDSL.g:11394:2: ( rule__LInt__Alternatives_0 )?
+            int alt84=2;
+            int LA84_0 = input.LA(1);
 
-            if ( ((LA86_0>=19 && LA86_0<=20)) ) {
-                alt86=1;
+            if ( ((LA84_0>=19 && LA84_0<=20)) ) {
+                alt84=1;
             }
-            switch (alt86) {
+            switch (alt84) {
                 case 1 :
-                    // InternalTableDSL.g:12015:3: rule__LInt__Alternatives_0
+                    // InternalTableDSL.g:11394:3: rule__LInt__Alternatives_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__LInt__Alternatives_0();
@@ -40639,14 +38681,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__LInt__Group__1"
-    // InternalTableDSL.g:12023:1: rule__LInt__Group__1 : rule__LInt__Group__1__Impl ;
+    // InternalTableDSL.g:11402:1: rule__LInt__Group__1 : rule__LInt__Group__1__Impl ;
     public final void rule__LInt__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12027:1: ( rule__LInt__Group__1__Impl )
-            // InternalTableDSL.g:12028:2: rule__LInt__Group__1__Impl
+            // InternalTableDSL.g:11406:1: ( rule__LInt__Group__1__Impl )
+            // InternalTableDSL.g:11407:2: rule__LInt__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__LInt__Group__1__Impl();
@@ -40672,17 +38714,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__LInt__Group__1__Impl"
-    // InternalTableDSL.g:12034:1: rule__LInt__Group__1__Impl : ( RULE_INT ) ;
+    // InternalTableDSL.g:11413:1: rule__LInt__Group__1__Impl : ( RULE_INT ) ;
     public final void rule__LInt__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12038:1: ( ( RULE_INT ) )
-            // InternalTableDSL.g:12039:1: ( RULE_INT )
+            // InternalTableDSL.g:11417:1: ( ( RULE_INT ) )
+            // InternalTableDSL.g:11418:1: ( RULE_INT )
             {
-            // InternalTableDSL.g:12039:1: ( RULE_INT )
-            // InternalTableDSL.g:12040:2: RULE_INT
+            // InternalTableDSL.g:11418:1: ( RULE_INT )
+            // InternalTableDSL.g:11419:2: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLIntAccess().getINTTerminalRuleCall_1()); 
@@ -40713,16 +38755,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__LDouble__Group__0"
-    // InternalTableDSL.g:12050:1: rule__LDouble__Group__0 : rule__LDouble__Group__0__Impl rule__LDouble__Group__1 ;
+    // InternalTableDSL.g:11429:1: rule__LDouble__Group__0 : rule__LDouble__Group__0__Impl rule__LDouble__Group__1 ;
     public final void rule__LDouble__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12054:1: ( rule__LDouble__Group__0__Impl rule__LDouble__Group__1 )
-            // InternalTableDSL.g:12055:2: rule__LDouble__Group__0__Impl rule__LDouble__Group__1
+            // InternalTableDSL.g:11433:1: ( rule__LDouble__Group__0__Impl rule__LDouble__Group__1 )
+            // InternalTableDSL.g:11434:2: rule__LDouble__Group__0__Impl rule__LDouble__Group__1
             {
-            pushFollow(FOLLOW_68);
+            pushFollow(FOLLOW_66);
             rule__LDouble__Group__0__Impl();
 
             state._fsp--;
@@ -40751,17 +38793,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__LDouble__Group__0__Impl"
-    // InternalTableDSL.g:12062:1: rule__LDouble__Group__0__Impl : ( ruleLInt ) ;
+    // InternalTableDSL.g:11441:1: rule__LDouble__Group__0__Impl : ( ruleLInt ) ;
     public final void rule__LDouble__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12066:1: ( ( ruleLInt ) )
-            // InternalTableDSL.g:12067:1: ( ruleLInt )
+            // InternalTableDSL.g:11445:1: ( ( ruleLInt ) )
+            // InternalTableDSL.g:11446:1: ( ruleLInt )
             {
-            // InternalTableDSL.g:12067:1: ( ruleLInt )
-            // InternalTableDSL.g:12068:2: ruleLInt
+            // InternalTableDSL.g:11446:1: ( ruleLInt )
+            // InternalTableDSL.g:11447:2: ruleLInt
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLDoubleAccess().getLIntParserRuleCall_0()); 
@@ -40796,14 +38838,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__LDouble__Group__1"
-    // InternalTableDSL.g:12077:1: rule__LDouble__Group__1 : rule__LDouble__Group__1__Impl ;
+    // InternalTableDSL.g:11456:1: rule__LDouble__Group__1 : rule__LDouble__Group__1__Impl ;
     public final void rule__LDouble__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12081:1: ( rule__LDouble__Group__1__Impl )
-            // InternalTableDSL.g:12082:2: rule__LDouble__Group__1__Impl
+            // InternalTableDSL.g:11460:1: ( rule__LDouble__Group__1__Impl )
+            // InternalTableDSL.g:11461:2: rule__LDouble__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__LDouble__Group__1__Impl();
@@ -40829,31 +38871,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__LDouble__Group__1__Impl"
-    // InternalTableDSL.g:12088:1: rule__LDouble__Group__1__Impl : ( ( rule__LDouble__Group_1__0 )? ) ;
+    // InternalTableDSL.g:11467:1: rule__LDouble__Group__1__Impl : ( ( rule__LDouble__Group_1__0 )? ) ;
     public final void rule__LDouble__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12092:1: ( ( ( rule__LDouble__Group_1__0 )? ) )
-            // InternalTableDSL.g:12093:1: ( ( rule__LDouble__Group_1__0 )? )
+            // InternalTableDSL.g:11471:1: ( ( ( rule__LDouble__Group_1__0 )? ) )
+            // InternalTableDSL.g:11472:1: ( ( rule__LDouble__Group_1__0 )? )
             {
-            // InternalTableDSL.g:12093:1: ( ( rule__LDouble__Group_1__0 )? )
-            // InternalTableDSL.g:12094:2: ( rule__LDouble__Group_1__0 )?
+            // InternalTableDSL.g:11472:1: ( ( rule__LDouble__Group_1__0 )? )
+            // InternalTableDSL.g:11473:2: ( rule__LDouble__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLDoubleAccess().getGroup_1()); 
             }
-            // InternalTableDSL.g:12095:2: ( rule__LDouble__Group_1__0 )?
-            int alt87=2;
-            int LA87_0 = input.LA(1);
+            // InternalTableDSL.g:11474:2: ( rule__LDouble__Group_1__0 )?
+            int alt85=2;
+            int LA85_0 = input.LA(1);
 
-            if ( (LA87_0==46) ) {
-                alt87=1;
+            if ( (LA85_0==46) ) {
+                alt85=1;
             }
-            switch (alt87) {
+            switch (alt85) {
                 case 1 :
-                    // InternalTableDSL.g:12095:3: rule__LDouble__Group_1__0
+                    // InternalTableDSL.g:11474:3: rule__LDouble__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__LDouble__Group_1__0();
@@ -40891,16 +38933,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__LDouble__Group_1__0"
-    // InternalTableDSL.g:12104:1: rule__LDouble__Group_1__0 : rule__LDouble__Group_1__0__Impl rule__LDouble__Group_1__1 ;
+    // InternalTableDSL.g:11483:1: rule__LDouble__Group_1__0 : rule__LDouble__Group_1__0__Impl rule__LDouble__Group_1__1 ;
     public final void rule__LDouble__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12108:1: ( rule__LDouble__Group_1__0__Impl rule__LDouble__Group_1__1 )
-            // InternalTableDSL.g:12109:2: rule__LDouble__Group_1__0__Impl rule__LDouble__Group_1__1
+            // InternalTableDSL.g:11487:1: ( rule__LDouble__Group_1__0__Impl rule__LDouble__Group_1__1 )
+            // InternalTableDSL.g:11488:2: rule__LDouble__Group_1__0__Impl rule__LDouble__Group_1__1
             {
-            pushFollow(FOLLOW_89);
+            pushFollow(FOLLOW_88);
             rule__LDouble__Group_1__0__Impl();
 
             state._fsp--;
@@ -40929,17 +38971,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__LDouble__Group_1__0__Impl"
-    // InternalTableDSL.g:12116:1: rule__LDouble__Group_1__0__Impl : ( '.' ) ;
+    // InternalTableDSL.g:11495:1: rule__LDouble__Group_1__0__Impl : ( '.' ) ;
     public final void rule__LDouble__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12120:1: ( ( '.' ) )
-            // InternalTableDSL.g:12121:1: ( '.' )
+            // InternalTableDSL.g:11499:1: ( ( '.' ) )
+            // InternalTableDSL.g:11500:1: ( '.' )
             {
-            // InternalTableDSL.g:12121:1: ( '.' )
-            // InternalTableDSL.g:12122:2: '.'
+            // InternalTableDSL.g:11500:1: ( '.' )
+            // InternalTableDSL.g:11501:2: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLDoubleAccess().getFullStopKeyword_1_0()); 
@@ -40970,14 +39012,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__LDouble__Group_1__1"
-    // InternalTableDSL.g:12131:1: rule__LDouble__Group_1__1 : rule__LDouble__Group_1__1__Impl ;
+    // InternalTableDSL.g:11510:1: rule__LDouble__Group_1__1 : rule__LDouble__Group_1__1__Impl ;
     public final void rule__LDouble__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12135:1: ( rule__LDouble__Group_1__1__Impl )
-            // InternalTableDSL.g:12136:2: rule__LDouble__Group_1__1__Impl
+            // InternalTableDSL.g:11514:1: ( rule__LDouble__Group_1__1__Impl )
+            // InternalTableDSL.g:11515:2: rule__LDouble__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__LDouble__Group_1__1__Impl();
@@ -41003,17 +39045,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__LDouble__Group_1__1__Impl"
-    // InternalTableDSL.g:12142:1: rule__LDouble__Group_1__1__Impl : ( RULE_INT ) ;
+    // InternalTableDSL.g:11521:1: rule__LDouble__Group_1__1__Impl : ( RULE_INT ) ;
     public final void rule__LDouble__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12146:1: ( ( RULE_INT ) )
-            // InternalTableDSL.g:12147:1: ( RULE_INT )
+            // InternalTableDSL.g:11525:1: ( ( RULE_INT ) )
+            // InternalTableDSL.g:11526:1: ( RULE_INT )
             {
-            // InternalTableDSL.g:12147:1: ( RULE_INT )
-            // InternalTableDSL.g:12148:2: RULE_INT
+            // InternalTableDSL.g:11526:1: ( RULE_INT )
+            // InternalTableDSL.g:11527:2: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLDoubleAccess().getINTTerminalRuleCall_1_1()); 
@@ -41044,16 +39086,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__SignedNumber__Group__0"
-    // InternalTableDSL.g:12158:1: rule__SignedNumber__Group__0 : rule__SignedNumber__Group__0__Impl rule__SignedNumber__Group__1 ;
+    // InternalTableDSL.g:11537:1: rule__SignedNumber__Group__0 : rule__SignedNumber__Group__0__Impl rule__SignedNumber__Group__1 ;
     public final void rule__SignedNumber__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12162:1: ( rule__SignedNumber__Group__0__Impl rule__SignedNumber__Group__1 )
-            // InternalTableDSL.g:12163:2: rule__SignedNumber__Group__0__Impl rule__SignedNumber__Group__1
+            // InternalTableDSL.g:11541:1: ( rule__SignedNumber__Group__0__Impl rule__SignedNumber__Group__1 )
+            // InternalTableDSL.g:11542:2: rule__SignedNumber__Group__0__Impl rule__SignedNumber__Group__1
             {
-            pushFollow(FOLLOW_40);
+            pushFollow(FOLLOW_41);
             rule__SignedNumber__Group__0__Impl();
 
             state._fsp--;
@@ -41082,31 +39124,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__SignedNumber__Group__0__Impl"
-    // InternalTableDSL.g:12170:1: rule__SignedNumber__Group__0__Impl : ( ( '-' )? ) ;
+    // InternalTableDSL.g:11549:1: rule__SignedNumber__Group__0__Impl : ( ( '-' )? ) ;
     public final void rule__SignedNumber__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12174:1: ( ( ( '-' )? ) )
-            // InternalTableDSL.g:12175:1: ( ( '-' )? )
+            // InternalTableDSL.g:11553:1: ( ( ( '-' )? ) )
+            // InternalTableDSL.g:11554:1: ( ( '-' )? )
             {
-            // InternalTableDSL.g:12175:1: ( ( '-' )? )
-            // InternalTableDSL.g:12176:2: ( '-' )?
+            // InternalTableDSL.g:11554:1: ( ( '-' )? )
+            // InternalTableDSL.g:11555:2: ( '-' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSignedNumberAccess().getHyphenMinusKeyword_0()); 
             }
-            // InternalTableDSL.g:12177:2: ( '-' )?
-            int alt88=2;
-            int LA88_0 = input.LA(1);
+            // InternalTableDSL.g:11556:2: ( '-' )?
+            int alt86=2;
+            int LA86_0 = input.LA(1);
 
-            if ( (LA88_0==20) ) {
-                alt88=1;
+            if ( (LA86_0==20) ) {
+                alt86=1;
             }
-            switch (alt88) {
+            switch (alt86) {
                 case 1 :
-                    // InternalTableDSL.g:12177:3: '-'
+                    // InternalTableDSL.g:11556:3: '-'
                     {
                     match(input,20,FOLLOW_2); if (state.failed) return ;
 
@@ -41140,14 +39182,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__SignedNumber__Group__1"
-    // InternalTableDSL.g:12185:1: rule__SignedNumber__Group__1 : rule__SignedNumber__Group__1__Impl ;
+    // InternalTableDSL.g:11564:1: rule__SignedNumber__Group__1 : rule__SignedNumber__Group__1__Impl ;
     public final void rule__SignedNumber__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12189:1: ( rule__SignedNumber__Group__1__Impl )
-            // InternalTableDSL.g:12190:2: rule__SignedNumber__Group__1__Impl
+            // InternalTableDSL.g:11568:1: ( rule__SignedNumber__Group__1__Impl )
+            // InternalTableDSL.g:11569:2: rule__SignedNumber__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__SignedNumber__Group__1__Impl();
@@ -41173,17 +39215,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__SignedNumber__Group__1__Impl"
-    // InternalTableDSL.g:12196:1: rule__SignedNumber__Group__1__Impl : ( ruleNumber ) ;
+    // InternalTableDSL.g:11575:1: rule__SignedNumber__Group__1__Impl : ( ruleNumber ) ;
     public final void rule__SignedNumber__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12200:1: ( ( ruleNumber ) )
-            // InternalTableDSL.g:12201:1: ( ruleNumber )
+            // InternalTableDSL.g:11579:1: ( ( ruleNumber ) )
+            // InternalTableDSL.g:11580:1: ( ruleNumber )
             {
-            // InternalTableDSL.g:12201:1: ( ruleNumber )
-            // InternalTableDSL.g:12202:2: ruleNumber
+            // InternalTableDSL.g:11580:1: ( ruleNumber )
+            // InternalTableDSL.g:11581:2: ruleNumber
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSignedNumberAccess().getNumberParserRuleCall_1()); 
@@ -41218,16 +39260,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__SignedInt__Group__0"
-    // InternalTableDSL.g:12212:1: rule__SignedInt__Group__0 : rule__SignedInt__Group__0__Impl rule__SignedInt__Group__1 ;
+    // InternalTableDSL.g:11591:1: rule__SignedInt__Group__0 : rule__SignedInt__Group__0__Impl rule__SignedInt__Group__1 ;
     public final void rule__SignedInt__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12216:1: ( rule__SignedInt__Group__0__Impl rule__SignedInt__Group__1 )
-            // InternalTableDSL.g:12217:2: rule__SignedInt__Group__0__Impl rule__SignedInt__Group__1
+            // InternalTableDSL.g:11595:1: ( rule__SignedInt__Group__0__Impl rule__SignedInt__Group__1 )
+            // InternalTableDSL.g:11596:2: rule__SignedInt__Group__0__Impl rule__SignedInt__Group__1
             {
-            pushFollow(FOLLOW_43);
+            pushFollow(FOLLOW_44);
             rule__SignedInt__Group__0__Impl();
 
             state._fsp--;
@@ -41256,31 +39298,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__SignedInt__Group__0__Impl"
-    // InternalTableDSL.g:12224:1: rule__SignedInt__Group__0__Impl : ( ( '-' )? ) ;
+    // InternalTableDSL.g:11603:1: rule__SignedInt__Group__0__Impl : ( ( '-' )? ) ;
     public final void rule__SignedInt__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12228:1: ( ( ( '-' )? ) )
-            // InternalTableDSL.g:12229:1: ( ( '-' )? )
+            // InternalTableDSL.g:11607:1: ( ( ( '-' )? ) )
+            // InternalTableDSL.g:11608:1: ( ( '-' )? )
             {
-            // InternalTableDSL.g:12229:1: ( ( '-' )? )
-            // InternalTableDSL.g:12230:2: ( '-' )?
+            // InternalTableDSL.g:11608:1: ( ( '-' )? )
+            // InternalTableDSL.g:11609:2: ( '-' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSignedIntAccess().getHyphenMinusKeyword_0()); 
             }
-            // InternalTableDSL.g:12231:2: ( '-' )?
-            int alt89=2;
-            int LA89_0 = input.LA(1);
+            // InternalTableDSL.g:11610:2: ( '-' )?
+            int alt87=2;
+            int LA87_0 = input.LA(1);
 
-            if ( (LA89_0==20) ) {
-                alt89=1;
+            if ( (LA87_0==20) ) {
+                alt87=1;
             }
-            switch (alt89) {
+            switch (alt87) {
                 case 1 :
-                    // InternalTableDSL.g:12231:3: '-'
+                    // InternalTableDSL.g:11610:3: '-'
                     {
                     match(input,20,FOLLOW_2); if (state.failed) return ;
 
@@ -41314,14 +39356,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__SignedInt__Group__1"
-    // InternalTableDSL.g:12239:1: rule__SignedInt__Group__1 : rule__SignedInt__Group__1__Impl ;
+    // InternalTableDSL.g:11618:1: rule__SignedInt__Group__1 : rule__SignedInt__Group__1__Impl ;
     public final void rule__SignedInt__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12243:1: ( rule__SignedInt__Group__1__Impl )
-            // InternalTableDSL.g:12244:2: rule__SignedInt__Group__1__Impl
+            // InternalTableDSL.g:11622:1: ( rule__SignedInt__Group__1__Impl )
+            // InternalTableDSL.g:11623:2: rule__SignedInt__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__SignedInt__Group__1__Impl();
@@ -41347,17 +39389,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__SignedInt__Group__1__Impl"
-    // InternalTableDSL.g:12250:1: rule__SignedInt__Group__1__Impl : ( RULE_INT ) ;
+    // InternalTableDSL.g:11629:1: rule__SignedInt__Group__1__Impl : ( RULE_INT ) ;
     public final void rule__SignedInt__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12254:1: ( ( RULE_INT ) )
-            // InternalTableDSL.g:12255:1: ( RULE_INT )
+            // InternalTableDSL.g:11633:1: ( ( RULE_INT ) )
+            // InternalTableDSL.g:11634:1: ( RULE_INT )
             {
-            // InternalTableDSL.g:12255:1: ( RULE_INT )
-            // InternalTableDSL.g:12256:2: RULE_INT
+            // InternalTableDSL.g:11634:1: ( RULE_INT )
+            // InternalTableDSL.g:11635:2: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSignedIntAccess().getINTTerminalRuleCall_1()); 
@@ -41388,16 +39430,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__0"
-    // InternalTableDSL.g:12266:1: rule__XImportDeclaration__Group__0 : rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 ;
+    // InternalTableDSL.g:11645:1: rule__XImportDeclaration__Group__0 : rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 ;
     public final void rule__XImportDeclaration__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12270:1: ( rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 )
-            // InternalTableDSL.g:12271:2: rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1
+            // InternalTableDSL.g:11649:1: ( rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 )
+            // InternalTableDSL.g:11650:2: rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1
             {
-            pushFollow(FOLLOW_90);
+            pushFollow(FOLLOW_89);
             rule__XImportDeclaration__Group__0__Impl();
 
             state._fsp--;
@@ -41426,23 +39468,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__0__Impl"
-    // InternalTableDSL.g:12278:1: rule__XImportDeclaration__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:11657:1: rule__XImportDeclaration__Group__0__Impl : ( () ) ;
     public final void rule__XImportDeclaration__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12282:1: ( ( () ) )
-            // InternalTableDSL.g:12283:1: ( () )
+            // InternalTableDSL.g:11661:1: ( ( () ) )
+            // InternalTableDSL.g:11662:1: ( () )
             {
-            // InternalTableDSL.g:12283:1: ( () )
-            // InternalTableDSL.g:12284:2: ()
+            // InternalTableDSL.g:11662:1: ( () )
+            // InternalTableDSL.g:11663:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getOXImportDeclarationAction_0()); 
             }
-            // InternalTableDSL.g:12285:2: ()
-            // InternalTableDSL.g:12285:3: 
+            // InternalTableDSL.g:11664:2: ()
+            // InternalTableDSL.g:11664:3: 
             {
             }
 
@@ -41467,16 +39509,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__1"
-    // InternalTableDSL.g:12293:1: rule__XImportDeclaration__Group__1 : rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 ;
+    // InternalTableDSL.g:11672:1: rule__XImportDeclaration__Group__1 : rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 ;
     public final void rule__XImportDeclaration__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12297:1: ( rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 )
-            // InternalTableDSL.g:12298:2: rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2
+            // InternalTableDSL.g:11676:1: ( rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 )
+            // InternalTableDSL.g:11677:2: rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2
             {
-            pushFollow(FOLLOW_91);
+            pushFollow(FOLLOW_90);
             rule__XImportDeclaration__Group__1__Impl();
 
             state._fsp--;
@@ -41505,17 +39547,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__1__Impl"
-    // InternalTableDSL.g:12305:1: rule__XImportDeclaration__Group__1__Impl : ( 'import' ) ;
+    // InternalTableDSL.g:11684:1: rule__XImportDeclaration__Group__1__Impl : ( 'import' ) ;
     public final void rule__XImportDeclaration__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12309:1: ( ( 'import' ) )
-            // InternalTableDSL.g:12310:1: ( 'import' )
+            // InternalTableDSL.g:11688:1: ( ( 'import' ) )
+            // InternalTableDSL.g:11689:1: ( 'import' )
             {
-            // InternalTableDSL.g:12310:1: ( 'import' )
-            // InternalTableDSL.g:12311:2: 'import'
+            // InternalTableDSL.g:11689:1: ( 'import' )
+            // InternalTableDSL.g:11690:2: 'import'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportKeyword_1()); 
@@ -41546,16 +39588,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__2"
-    // InternalTableDSL.g:12320:1: rule__XImportDeclaration__Group__2 : rule__XImportDeclaration__Group__2__Impl rule__XImportDeclaration__Group__3 ;
+    // InternalTableDSL.g:11699:1: rule__XImportDeclaration__Group__2 : rule__XImportDeclaration__Group__2__Impl rule__XImportDeclaration__Group__3 ;
     public final void rule__XImportDeclaration__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12324:1: ( rule__XImportDeclaration__Group__2__Impl rule__XImportDeclaration__Group__3 )
-            // InternalTableDSL.g:12325:2: rule__XImportDeclaration__Group__2__Impl rule__XImportDeclaration__Group__3
+            // InternalTableDSL.g:11703:1: ( rule__XImportDeclaration__Group__2__Impl rule__XImportDeclaration__Group__3 )
+            // InternalTableDSL.g:11704:2: rule__XImportDeclaration__Group__2__Impl rule__XImportDeclaration__Group__3
             {
-            pushFollow(FOLLOW_92);
+            pushFollow(FOLLOW_91);
             rule__XImportDeclaration__Group__2__Impl();
 
             state._fsp--;
@@ -41584,23 +39626,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__2__Impl"
-    // InternalTableDSL.g:12332:1: rule__XImportDeclaration__Group__2__Impl : ( ( rule__XImportDeclaration__Alternatives_2 ) ) ;
+    // InternalTableDSL.g:11711:1: rule__XImportDeclaration__Group__2__Impl : ( ( rule__XImportDeclaration__Alternatives_2 ) ) ;
     public final void rule__XImportDeclaration__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12336:1: ( ( ( rule__XImportDeclaration__Alternatives_2 ) ) )
-            // InternalTableDSL.g:12337:1: ( ( rule__XImportDeclaration__Alternatives_2 ) )
+            // InternalTableDSL.g:11715:1: ( ( ( rule__XImportDeclaration__Alternatives_2 ) ) )
+            // InternalTableDSL.g:11716:1: ( ( rule__XImportDeclaration__Alternatives_2 ) )
             {
-            // InternalTableDSL.g:12337:1: ( ( rule__XImportDeclaration__Alternatives_2 ) )
-            // InternalTableDSL.g:12338:2: ( rule__XImportDeclaration__Alternatives_2 )
+            // InternalTableDSL.g:11716:1: ( ( rule__XImportDeclaration__Alternatives_2 ) )
+            // InternalTableDSL.g:11717:2: ( rule__XImportDeclaration__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getAlternatives_2()); 
             }
-            // InternalTableDSL.g:12339:2: ( rule__XImportDeclaration__Alternatives_2 )
-            // InternalTableDSL.g:12339:3: rule__XImportDeclaration__Alternatives_2
+            // InternalTableDSL.g:11718:2: ( rule__XImportDeclaration__Alternatives_2 )
+            // InternalTableDSL.g:11718:3: rule__XImportDeclaration__Alternatives_2
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Alternatives_2();
@@ -41635,14 +39677,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__3"
-    // InternalTableDSL.g:12347:1: rule__XImportDeclaration__Group__3 : rule__XImportDeclaration__Group__3__Impl ;
+    // InternalTableDSL.g:11726:1: rule__XImportDeclaration__Group__3 : rule__XImportDeclaration__Group__3__Impl ;
     public final void rule__XImportDeclaration__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12351:1: ( rule__XImportDeclaration__Group__3__Impl )
-            // InternalTableDSL.g:12352:2: rule__XImportDeclaration__Group__3__Impl
+            // InternalTableDSL.g:11730:1: ( rule__XImportDeclaration__Group__3__Impl )
+            // InternalTableDSL.g:11731:2: rule__XImportDeclaration__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group__3__Impl();
@@ -41668,31 +39710,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__3__Impl"
-    // InternalTableDSL.g:12358:1: rule__XImportDeclaration__Group__3__Impl : ( ( ';' )? ) ;
+    // InternalTableDSL.g:11737:1: rule__XImportDeclaration__Group__3__Impl : ( ( ';' )? ) ;
     public final void rule__XImportDeclaration__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12362:1: ( ( ( ';' )? ) )
-            // InternalTableDSL.g:12363:1: ( ( ';' )? )
+            // InternalTableDSL.g:11741:1: ( ( ( ';' )? ) )
+            // InternalTableDSL.g:11742:1: ( ( ';' )? )
             {
-            // InternalTableDSL.g:12363:1: ( ( ';' )? )
-            // InternalTableDSL.g:12364:2: ( ';' )?
+            // InternalTableDSL.g:11742:1: ( ( ';' )? )
+            // InternalTableDSL.g:11743:2: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getSemicolonKeyword_3()); 
             }
-            // InternalTableDSL.g:12365:2: ( ';' )?
-            int alt90=2;
-            int LA90_0 = input.LA(1);
+            // InternalTableDSL.g:11744:2: ( ';' )?
+            int alt88=2;
+            int LA88_0 = input.LA(1);
 
-            if ( (LA90_0==133) ) {
-                alt90=1;
+            if ( (LA88_0==133) ) {
+                alt88=1;
             }
-            switch (alt90) {
+            switch (alt88) {
                 case 1 :
-                    // InternalTableDSL.g:12365:3: ';'
+                    // InternalTableDSL.g:11744:3: ';'
                     {
                     match(input,133,FOLLOW_2); if (state.failed) return ;
 
@@ -41726,16 +39768,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__0"
-    // InternalTableDSL.g:12374:1: rule__XImportDeclaration__Group_2_0__0 : rule__XImportDeclaration__Group_2_0__0__Impl rule__XImportDeclaration__Group_2_0__1 ;
+    // InternalTableDSL.g:11753:1: rule__XImportDeclaration__Group_2_0__0 : rule__XImportDeclaration__Group_2_0__0__Impl rule__XImportDeclaration__Group_2_0__1 ;
     public final void rule__XImportDeclaration__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12378:1: ( rule__XImportDeclaration__Group_2_0__0__Impl rule__XImportDeclaration__Group_2_0__1 )
-            // InternalTableDSL.g:12379:2: rule__XImportDeclaration__Group_2_0__0__Impl rule__XImportDeclaration__Group_2_0__1
+            // InternalTableDSL.g:11757:1: ( rule__XImportDeclaration__Group_2_0__0__Impl rule__XImportDeclaration__Group_2_0__1 )
+            // InternalTableDSL.g:11758:2: rule__XImportDeclaration__Group_2_0__0__Impl rule__XImportDeclaration__Group_2_0__1
             {
-            pushFollow(FOLLOW_93);
+            pushFollow(FOLLOW_92);
             rule__XImportDeclaration__Group_2_0__0__Impl();
 
             state._fsp--;
@@ -41764,23 +39806,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__0__Impl"
-    // InternalTableDSL.g:12386:1: rule__XImportDeclaration__Group_2_0__0__Impl : ( ( rule__XImportDeclaration__StaticAssignment_2_0_0 ) ) ;
+    // InternalTableDSL.g:11765:1: rule__XImportDeclaration__Group_2_0__0__Impl : ( ( rule__XImportDeclaration__StaticAssignment_2_0_0 ) ) ;
     public final void rule__XImportDeclaration__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12390:1: ( ( ( rule__XImportDeclaration__StaticAssignment_2_0_0 ) ) )
-            // InternalTableDSL.g:12391:1: ( ( rule__XImportDeclaration__StaticAssignment_2_0_0 ) )
+            // InternalTableDSL.g:11769:1: ( ( ( rule__XImportDeclaration__StaticAssignment_2_0_0 ) ) )
+            // InternalTableDSL.g:11770:1: ( ( rule__XImportDeclaration__StaticAssignment_2_0_0 ) )
             {
-            // InternalTableDSL.g:12391:1: ( ( rule__XImportDeclaration__StaticAssignment_2_0_0 ) )
-            // InternalTableDSL.g:12392:2: ( rule__XImportDeclaration__StaticAssignment_2_0_0 )
+            // InternalTableDSL.g:11770:1: ( ( rule__XImportDeclaration__StaticAssignment_2_0_0 ) )
+            // InternalTableDSL.g:11771:2: ( rule__XImportDeclaration__StaticAssignment_2_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getStaticAssignment_2_0_0()); 
             }
-            // InternalTableDSL.g:12393:2: ( rule__XImportDeclaration__StaticAssignment_2_0_0 )
-            // InternalTableDSL.g:12393:3: rule__XImportDeclaration__StaticAssignment_2_0_0
+            // InternalTableDSL.g:11772:2: ( rule__XImportDeclaration__StaticAssignment_2_0_0 )
+            // InternalTableDSL.g:11772:3: rule__XImportDeclaration__StaticAssignment_2_0_0
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__StaticAssignment_2_0_0();
@@ -41815,16 +39857,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__1"
-    // InternalTableDSL.g:12401:1: rule__XImportDeclaration__Group_2_0__1 : rule__XImportDeclaration__Group_2_0__1__Impl rule__XImportDeclaration__Group_2_0__2 ;
+    // InternalTableDSL.g:11780:1: rule__XImportDeclaration__Group_2_0__1 : rule__XImportDeclaration__Group_2_0__1__Impl rule__XImportDeclaration__Group_2_0__2 ;
     public final void rule__XImportDeclaration__Group_2_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12405:1: ( rule__XImportDeclaration__Group_2_0__1__Impl rule__XImportDeclaration__Group_2_0__2 )
-            // InternalTableDSL.g:12406:2: rule__XImportDeclaration__Group_2_0__1__Impl rule__XImportDeclaration__Group_2_0__2
+            // InternalTableDSL.g:11784:1: ( rule__XImportDeclaration__Group_2_0__1__Impl rule__XImportDeclaration__Group_2_0__2 )
+            // InternalTableDSL.g:11785:2: rule__XImportDeclaration__Group_2_0__1__Impl rule__XImportDeclaration__Group_2_0__2
             {
-            pushFollow(FOLLOW_93);
+            pushFollow(FOLLOW_92);
             rule__XImportDeclaration__Group_2_0__1__Impl();
 
             state._fsp--;
@@ -41853,31 +39895,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__1__Impl"
-    // InternalTableDSL.g:12413:1: rule__XImportDeclaration__Group_2_0__1__Impl : ( ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )? ) ;
+    // InternalTableDSL.g:11792:1: rule__XImportDeclaration__Group_2_0__1__Impl : ( ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )? ) ;
     public final void rule__XImportDeclaration__Group_2_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12417:1: ( ( ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )? ) )
-            // InternalTableDSL.g:12418:1: ( ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )? )
+            // InternalTableDSL.g:11796:1: ( ( ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )? ) )
+            // InternalTableDSL.g:11797:1: ( ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )? )
             {
-            // InternalTableDSL.g:12418:1: ( ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )? )
-            // InternalTableDSL.g:12419:2: ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )?
+            // InternalTableDSL.g:11797:1: ( ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )? )
+            // InternalTableDSL.g:11798:2: ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getExtensionAssignment_2_0_1()); 
             }
-            // InternalTableDSL.g:12420:2: ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )?
-            int alt91=2;
-            int LA91_0 = input.LA(1);
+            // InternalTableDSL.g:11799:2: ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )?
+            int alt89=2;
+            int LA89_0 = input.LA(1);
 
-            if ( (LA91_0==51) ) {
-                alt91=1;
+            if ( (LA89_0==51) ) {
+                alt89=1;
             }
-            switch (alt91) {
+            switch (alt89) {
                 case 1 :
-                    // InternalTableDSL.g:12420:3: rule__XImportDeclaration__ExtensionAssignment_2_0_1
+                    // InternalTableDSL.g:11799:3: rule__XImportDeclaration__ExtensionAssignment_2_0_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__ExtensionAssignment_2_0_1();
@@ -41915,16 +39957,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__2"
-    // InternalTableDSL.g:12428:1: rule__XImportDeclaration__Group_2_0__2 : rule__XImportDeclaration__Group_2_0__2__Impl rule__XImportDeclaration__Group_2_0__3 ;
+    // InternalTableDSL.g:11807:1: rule__XImportDeclaration__Group_2_0__2 : rule__XImportDeclaration__Group_2_0__2__Impl rule__XImportDeclaration__Group_2_0__3 ;
     public final void rule__XImportDeclaration__Group_2_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12432:1: ( rule__XImportDeclaration__Group_2_0__2__Impl rule__XImportDeclaration__Group_2_0__3 )
-            // InternalTableDSL.g:12433:2: rule__XImportDeclaration__Group_2_0__2__Impl rule__XImportDeclaration__Group_2_0__3
+            // InternalTableDSL.g:11811:1: ( rule__XImportDeclaration__Group_2_0__2__Impl rule__XImportDeclaration__Group_2_0__3 )
+            // InternalTableDSL.g:11812:2: rule__XImportDeclaration__Group_2_0__2__Impl rule__XImportDeclaration__Group_2_0__3
             {
-            pushFollow(FOLLOW_94);
+            pushFollow(FOLLOW_93);
             rule__XImportDeclaration__Group_2_0__2__Impl();
 
             state._fsp--;
@@ -41953,23 +39995,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__2__Impl"
-    // InternalTableDSL.g:12440:1: rule__XImportDeclaration__Group_2_0__2__Impl : ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 ) ) ;
+    // InternalTableDSL.g:11819:1: rule__XImportDeclaration__Group_2_0__2__Impl : ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 ) ) ;
     public final void rule__XImportDeclaration__Group_2_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12444:1: ( ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 ) ) )
-            // InternalTableDSL.g:12445:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 ) )
+            // InternalTableDSL.g:11823:1: ( ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 ) ) )
+            // InternalTableDSL.g:11824:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 ) )
             {
-            // InternalTableDSL.g:12445:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 ) )
-            // InternalTableDSL.g:12446:2: ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 )
+            // InternalTableDSL.g:11824:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 ) )
+            // InternalTableDSL.g:11825:2: ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeAssignment_2_0_2()); 
             }
-            // InternalTableDSL.g:12447:2: ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 )
-            // InternalTableDSL.g:12447:3: rule__XImportDeclaration__ImportedTypeAssignment_2_0_2
+            // InternalTableDSL.g:11826:2: ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 )
+            // InternalTableDSL.g:11826:3: rule__XImportDeclaration__ImportedTypeAssignment_2_0_2
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__ImportedTypeAssignment_2_0_2();
@@ -42004,14 +40046,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__3"
-    // InternalTableDSL.g:12455:1: rule__XImportDeclaration__Group_2_0__3 : rule__XImportDeclaration__Group_2_0__3__Impl ;
+    // InternalTableDSL.g:11834:1: rule__XImportDeclaration__Group_2_0__3 : rule__XImportDeclaration__Group_2_0__3__Impl ;
     public final void rule__XImportDeclaration__Group_2_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12459:1: ( rule__XImportDeclaration__Group_2_0__3__Impl )
-            // InternalTableDSL.g:12460:2: rule__XImportDeclaration__Group_2_0__3__Impl
+            // InternalTableDSL.g:11838:1: ( rule__XImportDeclaration__Group_2_0__3__Impl )
+            // InternalTableDSL.g:11839:2: rule__XImportDeclaration__Group_2_0__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group_2_0__3__Impl();
@@ -42037,23 +40079,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__3__Impl"
-    // InternalTableDSL.g:12466:1: rule__XImportDeclaration__Group_2_0__3__Impl : ( ( rule__XImportDeclaration__Alternatives_2_0_3 ) ) ;
+    // InternalTableDSL.g:11845:1: rule__XImportDeclaration__Group_2_0__3__Impl : ( ( rule__XImportDeclaration__Alternatives_2_0_3 ) ) ;
     public final void rule__XImportDeclaration__Group_2_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12470:1: ( ( ( rule__XImportDeclaration__Alternatives_2_0_3 ) ) )
-            // InternalTableDSL.g:12471:1: ( ( rule__XImportDeclaration__Alternatives_2_0_3 ) )
+            // InternalTableDSL.g:11849:1: ( ( ( rule__XImportDeclaration__Alternatives_2_0_3 ) ) )
+            // InternalTableDSL.g:11850:1: ( ( rule__XImportDeclaration__Alternatives_2_0_3 ) )
             {
-            // InternalTableDSL.g:12471:1: ( ( rule__XImportDeclaration__Alternatives_2_0_3 ) )
-            // InternalTableDSL.g:12472:2: ( rule__XImportDeclaration__Alternatives_2_0_3 )
+            // InternalTableDSL.g:11850:1: ( ( rule__XImportDeclaration__Alternatives_2_0_3 ) )
+            // InternalTableDSL.g:11851:2: ( rule__XImportDeclaration__Alternatives_2_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getAlternatives_2_0_3()); 
             }
-            // InternalTableDSL.g:12473:2: ( rule__XImportDeclaration__Alternatives_2_0_3 )
-            // InternalTableDSL.g:12473:3: rule__XImportDeclaration__Alternatives_2_0_3
+            // InternalTableDSL.g:11852:2: ( rule__XImportDeclaration__Alternatives_2_0_3 )
+            // InternalTableDSL.g:11852:3: rule__XImportDeclaration__Alternatives_2_0_3
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Alternatives_2_0_3();
@@ -42088,14 +40130,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_3__0"
-    // InternalTableDSL.g:12482:1: rule__XImportDeclaration__Group_2_3__0 : rule__XImportDeclaration__Group_2_3__0__Impl rule__XImportDeclaration__Group_2_3__1 ;
+    // InternalTableDSL.g:11861:1: rule__XImportDeclaration__Group_2_3__0 : rule__XImportDeclaration__Group_2_3__0__Impl rule__XImportDeclaration__Group_2_3__1 ;
     public final void rule__XImportDeclaration__Group_2_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12486:1: ( rule__XImportDeclaration__Group_2_3__0__Impl rule__XImportDeclaration__Group_2_3__1 )
-            // InternalTableDSL.g:12487:2: rule__XImportDeclaration__Group_2_3__0__Impl rule__XImportDeclaration__Group_2_3__1
+            // InternalTableDSL.g:11865:1: ( rule__XImportDeclaration__Group_2_3__0__Impl rule__XImportDeclaration__Group_2_3__1 )
+            // InternalTableDSL.g:11866:2: rule__XImportDeclaration__Group_2_3__0__Impl rule__XImportDeclaration__Group_2_3__1
             {
             pushFollow(FOLLOW_7);
             rule__XImportDeclaration__Group_2_3__0__Impl();
@@ -42126,23 +40168,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_3__0__Impl"
-    // InternalTableDSL.g:12494:1: rule__XImportDeclaration__Group_2_3__0__Impl : ( ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 ) ) ;
+    // InternalTableDSL.g:11873:1: rule__XImportDeclaration__Group_2_3__0__Impl : ( ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 ) ) ;
     public final void rule__XImportDeclaration__Group_2_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12498:1: ( ( ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 ) ) )
-            // InternalTableDSL.g:12499:1: ( ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 ) )
+            // InternalTableDSL.g:11877:1: ( ( ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 ) ) )
+            // InternalTableDSL.g:11878:1: ( ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 ) )
             {
-            // InternalTableDSL.g:12499:1: ( ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 ) )
-            // InternalTableDSL.g:12500:2: ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 )
+            // InternalTableDSL.g:11878:1: ( ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 ) )
+            // InternalTableDSL.g:11879:2: ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getFqnImportAssignment_2_3_0()); 
             }
-            // InternalTableDSL.g:12501:2: ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 )
-            // InternalTableDSL.g:12501:3: rule__XImportDeclaration__FqnImportAssignment_2_3_0
+            // InternalTableDSL.g:11880:2: ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 )
+            // InternalTableDSL.g:11880:3: rule__XImportDeclaration__FqnImportAssignment_2_3_0
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__FqnImportAssignment_2_3_0();
@@ -42177,14 +40219,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_3__1"
-    // InternalTableDSL.g:12509:1: rule__XImportDeclaration__Group_2_3__1 : rule__XImportDeclaration__Group_2_3__1__Impl ;
+    // InternalTableDSL.g:11888:1: rule__XImportDeclaration__Group_2_3__1 : rule__XImportDeclaration__Group_2_3__1__Impl ;
     public final void rule__XImportDeclaration__Group_2_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12513:1: ( rule__XImportDeclaration__Group_2_3__1__Impl )
-            // InternalTableDSL.g:12514:2: rule__XImportDeclaration__Group_2_3__1__Impl
+            // InternalTableDSL.g:11892:1: ( rule__XImportDeclaration__Group_2_3__1__Impl )
+            // InternalTableDSL.g:11893:2: rule__XImportDeclaration__Group_2_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group_2_3__1__Impl();
@@ -42210,23 +40252,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_3__1__Impl"
-    // InternalTableDSL.g:12520:1: rule__XImportDeclaration__Group_2_3__1__Impl : ( ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 ) ) ;
+    // InternalTableDSL.g:11899:1: rule__XImportDeclaration__Group_2_3__1__Impl : ( ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 ) ) ;
     public final void rule__XImportDeclaration__Group_2_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12524:1: ( ( ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 ) ) )
-            // InternalTableDSL.g:12525:1: ( ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 ) )
+            // InternalTableDSL.g:11903:1: ( ( ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 ) ) )
+            // InternalTableDSL.g:11904:1: ( ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 ) )
             {
-            // InternalTableDSL.g:12525:1: ( ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 ) )
-            // InternalTableDSL.g:12526:2: ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 )
+            // InternalTableDSL.g:11904:1: ( ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 ) )
+            // InternalTableDSL.g:11905:2: ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedFullyQualifiedNameAssignment_2_3_1()); 
             }
-            // InternalTableDSL.g:12527:2: ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 )
-            // InternalTableDSL.g:12527:3: rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1
+            // InternalTableDSL.g:11906:2: ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 )
+            // InternalTableDSL.g:11906:3: rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1();
@@ -42261,16 +40303,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group__0"
-    // InternalTableDSL.g:12536:1: rule__XAnnotation__Group__0 : rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 ;
+    // InternalTableDSL.g:11915:1: rule__XAnnotation__Group__0 : rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 ;
     public final void rule__XAnnotation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12540:1: ( rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 )
-            // InternalTableDSL.g:12541:2: rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1
+            // InternalTableDSL.g:11919:1: ( rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 )
+            // InternalTableDSL.g:11920:2: rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1
             {
-            pushFollow(FOLLOW_95);
+            pushFollow(FOLLOW_94);
             rule__XAnnotation__Group__0__Impl();
 
             state._fsp--;
@@ -42299,23 +40341,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group__0__Impl"
-    // InternalTableDSL.g:12548:1: rule__XAnnotation__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:11927:1: rule__XAnnotation__Group__0__Impl : ( () ) ;
     public final void rule__XAnnotation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12552:1: ( ( () ) )
-            // InternalTableDSL.g:12553:1: ( () )
+            // InternalTableDSL.g:11931:1: ( ( () ) )
+            // InternalTableDSL.g:11932:1: ( () )
             {
-            // InternalTableDSL.g:12553:1: ( () )
-            // InternalTableDSL.g:12554:2: ()
+            // InternalTableDSL.g:11932:1: ( () )
+            // InternalTableDSL.g:11933:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getXAnnotationAction_0()); 
             }
-            // InternalTableDSL.g:12555:2: ()
-            // InternalTableDSL.g:12555:3: 
+            // InternalTableDSL.g:11934:2: ()
+            // InternalTableDSL.g:11934:3: 
             {
             }
 
@@ -42340,14 +40382,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group__1"
-    // InternalTableDSL.g:12563:1: rule__XAnnotation__Group__1 : rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 ;
+    // InternalTableDSL.g:11942:1: rule__XAnnotation__Group__1 : rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 ;
     public final void rule__XAnnotation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12567:1: ( rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 )
-            // InternalTableDSL.g:12568:2: rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2
+            // InternalTableDSL.g:11946:1: ( rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 )
+            // InternalTableDSL.g:11947:2: rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2
             {
             pushFollow(FOLLOW_7);
             rule__XAnnotation__Group__1__Impl();
@@ -42378,17 +40420,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group__1__Impl"
-    // InternalTableDSL.g:12575:1: rule__XAnnotation__Group__1__Impl : ( '@' ) ;
+    // InternalTableDSL.g:11954:1: rule__XAnnotation__Group__1__Impl : ( '@' ) ;
     public final void rule__XAnnotation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12579:1: ( ( '@' ) )
-            // InternalTableDSL.g:12580:1: ( '@' )
+            // InternalTableDSL.g:11958:1: ( ( '@' ) )
+            // InternalTableDSL.g:11959:1: ( '@' )
             {
-            // InternalTableDSL.g:12580:1: ( '@' )
-            // InternalTableDSL.g:12581:2: '@'
+            // InternalTableDSL.g:11959:1: ( '@' )
+            // InternalTableDSL.g:11960:2: '@'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1()); 
@@ -42419,16 +40461,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group__2"
-    // InternalTableDSL.g:12590:1: rule__XAnnotation__Group__2 : rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 ;
+    // InternalTableDSL.g:11969:1: rule__XAnnotation__Group__2 : rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 ;
     public final void rule__XAnnotation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12594:1: ( rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 )
-            // InternalTableDSL.g:12595:2: rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3
+            // InternalTableDSL.g:11973:1: ( rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 )
+            // InternalTableDSL.g:11974:2: rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3
             {
-            pushFollow(FOLLOW_96);
+            pushFollow(FOLLOW_95);
             rule__XAnnotation__Group__2__Impl();
 
             state._fsp--;
@@ -42457,23 +40499,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group__2__Impl"
-    // InternalTableDSL.g:12602:1: rule__XAnnotation__Group__2__Impl : ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) ;
+    // InternalTableDSL.g:11981:1: rule__XAnnotation__Group__2__Impl : ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) ;
     public final void rule__XAnnotation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12606:1: ( ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) )
-            // InternalTableDSL.g:12607:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
+            // InternalTableDSL.g:11985:1: ( ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) )
+            // InternalTableDSL.g:11986:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
             {
-            // InternalTableDSL.g:12607:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
-            // InternalTableDSL.g:12608:2: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
+            // InternalTableDSL.g:11986:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
+            // InternalTableDSL.g:11987:2: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAnnotationTypeAssignment_2()); 
             }
-            // InternalTableDSL.g:12609:2: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
-            // InternalTableDSL.g:12609:3: rule__XAnnotation__AnnotationTypeAssignment_2
+            // InternalTableDSL.g:11988:2: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
+            // InternalTableDSL.g:11988:3: rule__XAnnotation__AnnotationTypeAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotation__AnnotationTypeAssignment_2();
@@ -42508,14 +40550,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group__3"
-    // InternalTableDSL.g:12617:1: rule__XAnnotation__Group__3 : rule__XAnnotation__Group__3__Impl ;
+    // InternalTableDSL.g:11996:1: rule__XAnnotation__Group__3 : rule__XAnnotation__Group__3__Impl ;
     public final void rule__XAnnotation__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12621:1: ( rule__XAnnotation__Group__3__Impl )
-            // InternalTableDSL.g:12622:2: rule__XAnnotation__Group__3__Impl
+            // InternalTableDSL.g:12000:1: ( rule__XAnnotation__Group__3__Impl )
+            // InternalTableDSL.g:12001:2: rule__XAnnotation__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotation__Group__3__Impl();
@@ -42541,31 +40583,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group__3__Impl"
-    // InternalTableDSL.g:12628:1: rule__XAnnotation__Group__3__Impl : ( ( rule__XAnnotation__Group_3__0 )? ) ;
+    // InternalTableDSL.g:12007:1: rule__XAnnotation__Group__3__Impl : ( ( rule__XAnnotation__Group_3__0 )? ) ;
     public final void rule__XAnnotation__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12632:1: ( ( ( rule__XAnnotation__Group_3__0 )? ) )
-            // InternalTableDSL.g:12633:1: ( ( rule__XAnnotation__Group_3__0 )? )
+            // InternalTableDSL.g:12011:1: ( ( ( rule__XAnnotation__Group_3__0 )? ) )
+            // InternalTableDSL.g:12012:1: ( ( rule__XAnnotation__Group_3__0 )? )
             {
-            // InternalTableDSL.g:12633:1: ( ( rule__XAnnotation__Group_3__0 )? )
-            // InternalTableDSL.g:12634:2: ( rule__XAnnotation__Group_3__0 )?
+            // InternalTableDSL.g:12012:1: ( ( rule__XAnnotation__Group_3__0 )? )
+            // InternalTableDSL.g:12013:2: ( rule__XAnnotation__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getGroup_3()); 
             }
-            // InternalTableDSL.g:12635:2: ( rule__XAnnotation__Group_3__0 )?
-            int alt92=2;
-            int LA92_0 = input.LA(1);
+            // InternalTableDSL.g:12014:2: ( rule__XAnnotation__Group_3__0 )?
+            int alt90=2;
+            int LA90_0 = input.LA(1);
 
-            if ( (LA92_0==135) ) {
-                alt92=1;
+            if ( (LA90_0==135) ) {
+                alt90=1;
             }
-            switch (alt92) {
+            switch (alt90) {
                 case 1 :
-                    // InternalTableDSL.g:12635:3: rule__XAnnotation__Group_3__0
+                    // InternalTableDSL.g:12014:3: rule__XAnnotation__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAnnotation__Group_3__0();
@@ -42603,16 +40645,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__0"
-    // InternalTableDSL.g:12644:1: rule__XAnnotation__Group_3__0 : rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 ;
+    // InternalTableDSL.g:12023:1: rule__XAnnotation__Group_3__0 : rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 ;
     public final void rule__XAnnotation__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12648:1: ( rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 )
-            // InternalTableDSL.g:12649:2: rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1
+            // InternalTableDSL.g:12027:1: ( rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 )
+            // InternalTableDSL.g:12028:2: rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1
             {
-            pushFollow(FOLLOW_97);
+            pushFollow(FOLLOW_96);
             rule__XAnnotation__Group_3__0__Impl();
 
             state._fsp--;
@@ -42641,23 +40683,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__0__Impl"
-    // InternalTableDSL.g:12656:1: rule__XAnnotation__Group_3__0__Impl : ( ( '(' ) ) ;
+    // InternalTableDSL.g:12035:1: rule__XAnnotation__Group_3__0__Impl : ( ( '(' ) ) ;
     public final void rule__XAnnotation__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12660:1: ( ( ( '(' ) ) )
-            // InternalTableDSL.g:12661:1: ( ( '(' ) )
+            // InternalTableDSL.g:12039:1: ( ( ( '(' ) ) )
+            // InternalTableDSL.g:12040:1: ( ( '(' ) )
             {
-            // InternalTableDSL.g:12661:1: ( ( '(' ) )
-            // InternalTableDSL.g:12662:2: ( '(' )
+            // InternalTableDSL.g:12040:1: ( ( '(' ) )
+            // InternalTableDSL.g:12041:2: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getLeftParenthesisKeyword_3_0()); 
             }
-            // InternalTableDSL.g:12663:2: ( '(' )
-            // InternalTableDSL.g:12663:3: '('
+            // InternalTableDSL.g:12042:2: ( '(' )
+            // InternalTableDSL.g:12042:3: '('
             {
             match(input,135,FOLLOW_2); if (state.failed) return ;
 
@@ -42688,16 +40730,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__1"
-    // InternalTableDSL.g:12671:1: rule__XAnnotation__Group_3__1 : rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 ;
+    // InternalTableDSL.g:12050:1: rule__XAnnotation__Group_3__1 : rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 ;
     public final void rule__XAnnotation__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12675:1: ( rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 )
-            // InternalTableDSL.g:12676:2: rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2
+            // InternalTableDSL.g:12054:1: ( rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 )
+            // InternalTableDSL.g:12055:2: rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2
             {
-            pushFollow(FOLLOW_97);
+            pushFollow(FOLLOW_96);
             rule__XAnnotation__Group_3__1__Impl();
 
             state._fsp--;
@@ -42726,31 +40768,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__1__Impl"
-    // InternalTableDSL.g:12683:1: rule__XAnnotation__Group_3__1__Impl : ( ( rule__XAnnotation__Alternatives_3_1 )? ) ;
+    // InternalTableDSL.g:12062:1: rule__XAnnotation__Group_3__1__Impl : ( ( rule__XAnnotation__Alternatives_3_1 )? ) ;
     public final void rule__XAnnotation__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12687:1: ( ( ( rule__XAnnotation__Alternatives_3_1 )? ) )
-            // InternalTableDSL.g:12688:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
+            // InternalTableDSL.g:12066:1: ( ( ( rule__XAnnotation__Alternatives_3_1 )? ) )
+            // InternalTableDSL.g:12067:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
             {
-            // InternalTableDSL.g:12688:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
-            // InternalTableDSL.g:12689:2: ( rule__XAnnotation__Alternatives_3_1 )?
+            // InternalTableDSL.g:12067:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
+            // InternalTableDSL.g:12068:2: ( rule__XAnnotation__Alternatives_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAlternatives_3_1()); 
             }
-            // InternalTableDSL.g:12690:2: ( rule__XAnnotation__Alternatives_3_1 )?
-            int alt93=2;
-            int LA93_0 = input.LA(1);
+            // InternalTableDSL.g:12069:2: ( rule__XAnnotation__Alternatives_3_1 )?
+            int alt91=2;
+            int LA91_0 = input.LA(1);
 
-            if ( ((LA93_0>=RULE_STRING && LA93_0<=RULE_DECIMAL)||(LA93_0>=19 && LA93_0<=20)||LA93_0==32||LA93_0==43||(LA93_0>=48 && LA93_0<=53)||LA93_0==75||(LA93_0>=134 && LA93_0<=135)||(LA93_0>=139 && LA93_0<=140)||LA93_0==142||LA93_0==144||(LA93_0>=147 && LA93_0<=155)||LA93_0==157||LA93_0==184) ) {
-                alt93=1;
+            if ( ((LA91_0>=RULE_STRING && LA91_0<=RULE_DECIMAL)||(LA91_0>=19 && LA91_0<=20)||LA91_0==32||LA91_0==43||(LA91_0>=48 && LA91_0<=53)||LA91_0==75||(LA91_0>=134 && LA91_0<=135)||(LA91_0>=139 && LA91_0<=140)||LA91_0==142||LA91_0==144||(LA91_0>=147 && LA91_0<=155)||LA91_0==157||LA91_0==181) ) {
+                alt91=1;
             }
-            switch (alt93) {
+            switch (alt91) {
                 case 1 :
-                    // InternalTableDSL.g:12690:3: rule__XAnnotation__Alternatives_3_1
+                    // InternalTableDSL.g:12069:3: rule__XAnnotation__Alternatives_3_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAnnotation__Alternatives_3_1();
@@ -42788,14 +40830,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__2"
-    // InternalTableDSL.g:12698:1: rule__XAnnotation__Group_3__2 : rule__XAnnotation__Group_3__2__Impl ;
+    // InternalTableDSL.g:12077:1: rule__XAnnotation__Group_3__2 : rule__XAnnotation__Group_3__2__Impl ;
     public final void rule__XAnnotation__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12702:1: ( rule__XAnnotation__Group_3__2__Impl )
-            // InternalTableDSL.g:12703:2: rule__XAnnotation__Group_3__2__Impl
+            // InternalTableDSL.g:12081:1: ( rule__XAnnotation__Group_3__2__Impl )
+            // InternalTableDSL.g:12082:2: rule__XAnnotation__Group_3__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3__2__Impl();
@@ -42821,17 +40863,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__2__Impl"
-    // InternalTableDSL.g:12709:1: rule__XAnnotation__Group_3__2__Impl : ( ')' ) ;
+    // InternalTableDSL.g:12088:1: rule__XAnnotation__Group_3__2__Impl : ( ')' ) ;
     public final void rule__XAnnotation__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12713:1: ( ( ')' ) )
-            // InternalTableDSL.g:12714:1: ( ')' )
+            // InternalTableDSL.g:12092:1: ( ( ')' ) )
+            // InternalTableDSL.g:12093:1: ( ')' )
             {
-            // InternalTableDSL.g:12714:1: ( ')' )
-            // InternalTableDSL.g:12715:2: ')'
+            // InternalTableDSL.g:12093:1: ( ')' )
+            // InternalTableDSL.g:12094:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2()); 
@@ -42862,16 +40904,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__0"
-    // InternalTableDSL.g:12725:1: rule__XAnnotation__Group_3_1_0__0 : rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 ;
+    // InternalTableDSL.g:12104:1: rule__XAnnotation__Group_3_1_0__0 : rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 ;
     public final void rule__XAnnotation__Group_3_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12729:1: ( rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 )
-            // InternalTableDSL.g:12730:2: rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1
+            // InternalTableDSL.g:12108:1: ( rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 )
+            // InternalTableDSL.g:12109:2: rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_97);
             rule__XAnnotation__Group_3_1_0__0__Impl();
 
             state._fsp--;
@@ -42900,23 +40942,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__0__Impl"
-    // InternalTableDSL.g:12737:1: rule__XAnnotation__Group_3_1_0__0__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) ;
+    // InternalTableDSL.g:12116:1: rule__XAnnotation__Group_3_1_0__0__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) ;
     public final void rule__XAnnotation__Group_3_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12741:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) )
-            // InternalTableDSL.g:12742:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
+            // InternalTableDSL.g:12120:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) )
+            // InternalTableDSL.g:12121:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
             {
-            // InternalTableDSL.g:12742:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
-            // InternalTableDSL.g:12743:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
+            // InternalTableDSL.g:12121:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
+            // InternalTableDSL.g:12122:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsAssignment_3_1_0_0()); 
             }
-            // InternalTableDSL.g:12744:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
-            // InternalTableDSL.g:12744:3: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0
+            // InternalTableDSL.g:12123:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
+            // InternalTableDSL.g:12123:3: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0();
@@ -42951,14 +40993,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__1"
-    // InternalTableDSL.g:12752:1: rule__XAnnotation__Group_3_1_0__1 : rule__XAnnotation__Group_3_1_0__1__Impl ;
+    // InternalTableDSL.g:12131:1: rule__XAnnotation__Group_3_1_0__1 : rule__XAnnotation__Group_3_1_0__1__Impl ;
     public final void rule__XAnnotation__Group_3_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12756:1: ( rule__XAnnotation__Group_3_1_0__1__Impl )
-            // InternalTableDSL.g:12757:2: rule__XAnnotation__Group_3_1_0__1__Impl
+            // InternalTableDSL.g:12135:1: ( rule__XAnnotation__Group_3_1_0__1__Impl )
+            // InternalTableDSL.g:12136:2: rule__XAnnotation__Group_3_1_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3_1_0__1__Impl();
@@ -42984,37 +41026,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__1__Impl"
-    // InternalTableDSL.g:12763:1: rule__XAnnotation__Group_3_1_0__1__Impl : ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) ;
+    // InternalTableDSL.g:12142:1: rule__XAnnotation__Group_3_1_0__1__Impl : ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) ;
     public final void rule__XAnnotation__Group_3_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12767:1: ( ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) )
-            // InternalTableDSL.g:12768:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
+            // InternalTableDSL.g:12146:1: ( ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) )
+            // InternalTableDSL.g:12147:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
             {
-            // InternalTableDSL.g:12768:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
-            // InternalTableDSL.g:12769:2: ( rule__XAnnotation__Group_3_1_0_1__0 )*
+            // InternalTableDSL.g:12147:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
+            // InternalTableDSL.g:12148:2: ( rule__XAnnotation__Group_3_1_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getGroup_3_1_0_1()); 
             }
-            // InternalTableDSL.g:12770:2: ( rule__XAnnotation__Group_3_1_0_1__0 )*
-            loop94:
+            // InternalTableDSL.g:12149:2: ( rule__XAnnotation__Group_3_1_0_1__0 )*
+            loop92:
             do {
-                int alt94=2;
-                int LA94_0 = input.LA(1);
+                int alt92=2;
+                int LA92_0 = input.LA(1);
 
-                if ( (LA94_0==137) ) {
-                    alt94=1;
+                if ( (LA92_0==137) ) {
+                    alt92=1;
                 }
 
 
-                switch (alt94) {
+                switch (alt92) {
             	case 1 :
-            	    // InternalTableDSL.g:12770:3: rule__XAnnotation__Group_3_1_0_1__0
+            	    // InternalTableDSL.g:12149:3: rule__XAnnotation__Group_3_1_0_1__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XAnnotation__Group_3_1_0_1__0();
 
             	    state._fsp--;
@@ -43024,7 +41066,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop94;
+            	    break loop92;
                 }
             } while (true);
 
@@ -43053,14 +41095,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__0"
-    // InternalTableDSL.g:12779:1: rule__XAnnotation__Group_3_1_0_1__0 : rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 ;
+    // InternalTableDSL.g:12158:1: rule__XAnnotation__Group_3_1_0_1__0 : rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 ;
     public final void rule__XAnnotation__Group_3_1_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12783:1: ( rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 )
-            // InternalTableDSL.g:12784:2: rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1
+            // InternalTableDSL.g:12162:1: ( rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 )
+            // InternalTableDSL.g:12163:2: rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1
             {
             pushFollow(FOLLOW_7);
             rule__XAnnotation__Group_3_1_0_1__0__Impl();
@@ -43091,17 +41133,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__0__Impl"
-    // InternalTableDSL.g:12791:1: rule__XAnnotation__Group_3_1_0_1__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:12170:1: rule__XAnnotation__Group_3_1_0_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotation__Group_3_1_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12795:1: ( ( ',' ) )
-            // InternalTableDSL.g:12796:1: ( ',' )
+            // InternalTableDSL.g:12174:1: ( ( ',' ) )
+            // InternalTableDSL.g:12175:1: ( ',' )
             {
-            // InternalTableDSL.g:12796:1: ( ',' )
-            // InternalTableDSL.g:12797:2: ','
+            // InternalTableDSL.g:12175:1: ( ',' )
+            // InternalTableDSL.g:12176:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0()); 
@@ -43132,14 +41174,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__1"
-    // InternalTableDSL.g:12806:1: rule__XAnnotation__Group_3_1_0_1__1 : rule__XAnnotation__Group_3_1_0_1__1__Impl ;
+    // InternalTableDSL.g:12185:1: rule__XAnnotation__Group_3_1_0_1__1 : rule__XAnnotation__Group_3_1_0_1__1__Impl ;
     public final void rule__XAnnotation__Group_3_1_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12810:1: ( rule__XAnnotation__Group_3_1_0_1__1__Impl )
-            // InternalTableDSL.g:12811:2: rule__XAnnotation__Group_3_1_0_1__1__Impl
+            // InternalTableDSL.g:12189:1: ( rule__XAnnotation__Group_3_1_0_1__1__Impl )
+            // InternalTableDSL.g:12190:2: rule__XAnnotation__Group_3_1_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3_1_0_1__1__Impl();
@@ -43165,23 +41207,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__1__Impl"
-    // InternalTableDSL.g:12817:1: rule__XAnnotation__Group_3_1_0_1__1__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) ;
+    // InternalTableDSL.g:12196:1: rule__XAnnotation__Group_3_1_0_1__1__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) ;
     public final void rule__XAnnotation__Group_3_1_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12821:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) )
-            // InternalTableDSL.g:12822:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
+            // InternalTableDSL.g:12200:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) )
+            // InternalTableDSL.g:12201:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
             {
-            // InternalTableDSL.g:12822:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
-            // InternalTableDSL.g:12823:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
+            // InternalTableDSL.g:12201:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
+            // InternalTableDSL.g:12202:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsAssignment_3_1_0_1_1()); 
             }
-            // InternalTableDSL.g:12824:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
-            // InternalTableDSL.g:12824:3: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1
+            // InternalTableDSL.g:12203:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
+            // InternalTableDSL.g:12203:3: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1();
@@ -43216,16 +41258,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__0"
-    // InternalTableDSL.g:12833:1: rule__XAnnotationElementValuePair__Group__0 : rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 ;
+    // InternalTableDSL.g:12212:1: rule__XAnnotationElementValuePair__Group__0 : rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 ;
     public final void rule__XAnnotationElementValuePair__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12837:1: ( rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 )
-            // InternalTableDSL.g:12838:2: rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1
+            // InternalTableDSL.g:12216:1: ( rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 )
+            // InternalTableDSL.g:12217:2: rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XAnnotationElementValuePair__Group__0__Impl();
 
             state._fsp--;
@@ -43254,23 +41296,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__0__Impl"
-    // InternalTableDSL.g:12845:1: rule__XAnnotationElementValuePair__Group__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) ;
+    // InternalTableDSL.g:12224:1: rule__XAnnotationElementValuePair__Group__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12849:1: ( ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) )
-            // InternalTableDSL.g:12850:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
+            // InternalTableDSL.g:12228:1: ( ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) )
+            // InternalTableDSL.g:12229:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
             {
-            // InternalTableDSL.g:12850:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
-            // InternalTableDSL.g:12851:2: ( rule__XAnnotationElementValuePair__Group_0__0 )
+            // InternalTableDSL.g:12229:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
+            // InternalTableDSL.g:12230:2: ( rule__XAnnotationElementValuePair__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getGroup_0()); 
             }
-            // InternalTableDSL.g:12852:2: ( rule__XAnnotationElementValuePair__Group_0__0 )
-            // InternalTableDSL.g:12852:3: rule__XAnnotationElementValuePair__Group_0__0
+            // InternalTableDSL.g:12231:2: ( rule__XAnnotationElementValuePair__Group_0__0 )
+            // InternalTableDSL.g:12231:3: rule__XAnnotationElementValuePair__Group_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0__0();
@@ -43305,14 +41347,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__1"
-    // InternalTableDSL.g:12860:1: rule__XAnnotationElementValuePair__Group__1 : rule__XAnnotationElementValuePair__Group__1__Impl ;
+    // InternalTableDSL.g:12239:1: rule__XAnnotationElementValuePair__Group__1 : rule__XAnnotationElementValuePair__Group__1__Impl ;
     public final void rule__XAnnotationElementValuePair__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12864:1: ( rule__XAnnotationElementValuePair__Group__1__Impl )
-            // InternalTableDSL.g:12865:2: rule__XAnnotationElementValuePair__Group__1__Impl
+            // InternalTableDSL.g:12243:1: ( rule__XAnnotationElementValuePair__Group__1__Impl )
+            // InternalTableDSL.g:12244:2: rule__XAnnotationElementValuePair__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group__1__Impl();
@@ -43338,23 +41380,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__1__Impl"
-    // InternalTableDSL.g:12871:1: rule__XAnnotationElementValuePair__Group__1__Impl : ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) ;
+    // InternalTableDSL.g:12250:1: rule__XAnnotationElementValuePair__Group__1__Impl : ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12875:1: ( ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) )
-            // InternalTableDSL.g:12876:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
+            // InternalTableDSL.g:12254:1: ( ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) )
+            // InternalTableDSL.g:12255:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
             {
-            // InternalTableDSL.g:12876:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
-            // InternalTableDSL.g:12877:2: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
+            // InternalTableDSL.g:12255:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
+            // InternalTableDSL.g:12256:2: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getValueAssignment_1()); 
             }
-            // InternalTableDSL.g:12878:2: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
-            // InternalTableDSL.g:12878:3: rule__XAnnotationElementValuePair__ValueAssignment_1
+            // InternalTableDSL.g:12257:2: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
+            // InternalTableDSL.g:12257:3: rule__XAnnotationElementValuePair__ValueAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__ValueAssignment_1();
@@ -43389,14 +41431,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0__0"
-    // InternalTableDSL.g:12887:1: rule__XAnnotationElementValuePair__Group_0__0 : rule__XAnnotationElementValuePair__Group_0__0__Impl ;
+    // InternalTableDSL.g:12266:1: rule__XAnnotationElementValuePair__Group_0__0 : rule__XAnnotationElementValuePair__Group_0__0__Impl ;
     public final void rule__XAnnotationElementValuePair__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12891:1: ( rule__XAnnotationElementValuePair__Group_0__0__Impl )
-            // InternalTableDSL.g:12892:2: rule__XAnnotationElementValuePair__Group_0__0__Impl
+            // InternalTableDSL.g:12270:1: ( rule__XAnnotationElementValuePair__Group_0__0__Impl )
+            // InternalTableDSL.g:12271:2: rule__XAnnotationElementValuePair__Group_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0__0__Impl();
@@ -43422,23 +41464,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0__0__Impl"
-    // InternalTableDSL.g:12898:1: rule__XAnnotationElementValuePair__Group_0__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) ;
+    // InternalTableDSL.g:12277:1: rule__XAnnotationElementValuePair__Group_0__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12902:1: ( ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) )
-            // InternalTableDSL.g:12903:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
+            // InternalTableDSL.g:12281:1: ( ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) )
+            // InternalTableDSL.g:12282:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
             {
-            // InternalTableDSL.g:12903:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
-            // InternalTableDSL.g:12904:2: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
+            // InternalTableDSL.g:12282:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
+            // InternalTableDSL.g:12283:2: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getGroup_0_0()); 
             }
-            // InternalTableDSL.g:12905:2: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
-            // InternalTableDSL.g:12905:3: rule__XAnnotationElementValuePair__Group_0_0__0
+            // InternalTableDSL.g:12284:2: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
+            // InternalTableDSL.g:12284:3: rule__XAnnotationElementValuePair__Group_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0_0__0();
@@ -43473,16 +41515,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__0"
-    // InternalTableDSL.g:12914:1: rule__XAnnotationElementValuePair__Group_0_0__0 : rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 ;
+    // InternalTableDSL.g:12293:1: rule__XAnnotationElementValuePair__Group_0_0__0 : rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12918:1: ( rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 )
-            // InternalTableDSL.g:12919:2: rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1
+            // InternalTableDSL.g:12297:1: ( rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 )
+            // InternalTableDSL.g:12298:2: rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1
             {
-            pushFollow(FOLLOW_101);
+            pushFollow(FOLLOW_100);
             rule__XAnnotationElementValuePair__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -43511,23 +41553,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__0__Impl"
-    // InternalTableDSL.g:12926:1: rule__XAnnotationElementValuePair__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) ;
+    // InternalTableDSL.g:12305:1: rule__XAnnotationElementValuePair__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12930:1: ( ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) )
-            // InternalTableDSL.g:12931:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
+            // InternalTableDSL.g:12309:1: ( ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) )
+            // InternalTableDSL.g:12310:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
             {
-            // InternalTableDSL.g:12931:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
-            // InternalTableDSL.g:12932:2: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
+            // InternalTableDSL.g:12310:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
+            // InternalTableDSL.g:12311:2: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getElementAssignment_0_0_0()); 
             }
-            // InternalTableDSL.g:12933:2: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
-            // InternalTableDSL.g:12933:3: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0
+            // InternalTableDSL.g:12312:2: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
+            // InternalTableDSL.g:12312:3: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__ElementAssignment_0_0_0();
@@ -43562,14 +41604,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__1"
-    // InternalTableDSL.g:12941:1: rule__XAnnotationElementValuePair__Group_0_0__1 : rule__XAnnotationElementValuePair__Group_0_0__1__Impl ;
+    // InternalTableDSL.g:12320:1: rule__XAnnotationElementValuePair__Group_0_0__1 : rule__XAnnotationElementValuePair__Group_0_0__1__Impl ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12945:1: ( rule__XAnnotationElementValuePair__Group_0_0__1__Impl )
-            // InternalTableDSL.g:12946:2: rule__XAnnotationElementValuePair__Group_0_0__1__Impl
+            // InternalTableDSL.g:12324:1: ( rule__XAnnotationElementValuePair__Group_0_0__1__Impl )
+            // InternalTableDSL.g:12325:2: rule__XAnnotationElementValuePair__Group_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0_0__1__Impl();
@@ -43595,17 +41637,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__1__Impl"
-    // InternalTableDSL.g:12952:1: rule__XAnnotationElementValuePair__Group_0_0__1__Impl : ( '=' ) ;
+    // InternalTableDSL.g:12331:1: rule__XAnnotationElementValuePair__Group_0_0__1__Impl : ( '=' ) ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12956:1: ( ( '=' ) )
-            // InternalTableDSL.g:12957:1: ( '=' )
+            // InternalTableDSL.g:12335:1: ( ( '=' ) )
+            // InternalTableDSL.g:12336:1: ( '=' )
             {
-            // InternalTableDSL.g:12957:1: ( '=' )
-            // InternalTableDSL.g:12958:2: '='
+            // InternalTableDSL.g:12336:1: ( '=' )
+            // InternalTableDSL.g:12337:2: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getEqualsSignKeyword_0_0_1()); 
@@ -43636,16 +41678,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__0"
-    // InternalTableDSL.g:12968:1: rule__XAnnotationElementValueOrCommaList__Group_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 ;
+    // InternalTableDSL.g:12347:1: rule__XAnnotationElementValueOrCommaList__Group_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12972:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 )
-            // InternalTableDSL.g:12973:2: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1
+            // InternalTableDSL.g:12351:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 )
+            // InternalTableDSL.g:12352:2: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1
             {
-            pushFollow(FOLLOW_102);
+            pushFollow(FOLLOW_101);
             rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl();
 
             state._fsp--;
@@ -43674,23 +41716,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl"
-    // InternalTableDSL.g:12980:1: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) ;
+    // InternalTableDSL.g:12359:1: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12984:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) )
-            // InternalTableDSL.g:12985:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
+            // InternalTableDSL.g:12363:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) )
+            // InternalTableDSL.g:12364:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
             {
-            // InternalTableDSL.g:12985:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
-            // InternalTableDSL.g:12986:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
+            // InternalTableDSL.g:12364:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
+            // InternalTableDSL.g:12365:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_0()); 
             }
-            // InternalTableDSL.g:12987:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
-            // InternalTableDSL.g:12987:3: rule__XAnnotationElementValueOrCommaList__Group_0_0__0
+            // InternalTableDSL.g:12366:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
+            // InternalTableDSL.g:12366:3: rule__XAnnotationElementValueOrCommaList__Group_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0__0();
@@ -43725,16 +41767,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__1"
-    // InternalTableDSL.g:12995:1: rule__XAnnotationElementValueOrCommaList__Group_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 ;
+    // InternalTableDSL.g:12374:1: rule__XAnnotationElementValueOrCommaList__Group_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:12999:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 )
-            // InternalTableDSL.g:13000:2: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2
+            // InternalTableDSL.g:12378:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 )
+            // InternalTableDSL.g:12379:2: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2
             {
-            pushFollow(FOLLOW_102);
+            pushFollow(FOLLOW_101);
             rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl();
 
             state._fsp--;
@@ -43763,31 +41805,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl"
-    // InternalTableDSL.g:13007:1: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) ;
+    // InternalTableDSL.g:12386:1: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13011:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) )
-            // InternalTableDSL.g:13012:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
+            // InternalTableDSL.g:12390:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) )
+            // InternalTableDSL.g:12391:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
             {
-            // InternalTableDSL.g:13012:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
-            // InternalTableDSL.g:13013:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
+            // InternalTableDSL.g:12391:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
+            // InternalTableDSL.g:12392:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_1()); 
             }
-            // InternalTableDSL.g:13014:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
-            int alt95=2;
-            int LA95_0 = input.LA(1);
+            // InternalTableDSL.g:12393:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
+            int alt93=2;
+            int LA93_0 = input.LA(1);
 
-            if ( ((LA95_0>=RULE_STRING && LA95_0<=RULE_DECIMAL)||(LA95_0>=19 && LA95_0<=20)||LA95_0==32||LA95_0==43||(LA95_0>=48 && LA95_0<=53)||LA95_0==75||(LA95_0>=134 && LA95_0<=135)||(LA95_0>=139 && LA95_0<=140)||LA95_0==142||LA95_0==144||(LA95_0>=147 && LA95_0<=155)||LA95_0==157||LA95_0==184) ) {
-                alt95=1;
+            if ( ((LA93_0>=RULE_STRING && LA93_0<=RULE_DECIMAL)||(LA93_0>=19 && LA93_0<=20)||LA93_0==32||LA93_0==43||(LA93_0>=48 && LA93_0<=53)||LA93_0==75||(LA93_0>=134 && LA93_0<=135)||(LA93_0>=139 && LA93_0<=140)||LA93_0==142||LA93_0==144||(LA93_0>=147 && LA93_0<=155)||LA93_0==157||LA93_0==181) ) {
+                alt93=1;
             }
-            switch (alt95) {
+            switch (alt93) {
                 case 1 :
-                    // InternalTableDSL.g:13014:3: rule__XAnnotationElementValueOrCommaList__Group_0_1__0
+                    // InternalTableDSL.g:12393:3: rule__XAnnotationElementValueOrCommaList__Group_0_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValueOrCommaList__Group_0_1__0();
@@ -43825,14 +41867,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__2"
-    // InternalTableDSL.g:13022:1: rule__XAnnotationElementValueOrCommaList__Group_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl ;
+    // InternalTableDSL.g:12401:1: rule__XAnnotationElementValueOrCommaList__Group_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13026:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl )
-            // InternalTableDSL.g:13027:2: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl
+            // InternalTableDSL.g:12405:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl )
+            // InternalTableDSL.g:12406:2: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl();
@@ -43858,17 +41900,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl"
-    // InternalTableDSL.g:13033:1: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl : ( ']' ) ;
+    // InternalTableDSL.g:12412:1: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl : ( ']' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13037:1: ( ( ']' ) )
-            // InternalTableDSL.g:13038:1: ( ']' )
+            // InternalTableDSL.g:12416:1: ( ( ']' ) )
+            // InternalTableDSL.g:12417:1: ( ']' )
             {
-            // InternalTableDSL.g:13038:1: ( ']' )
-            // InternalTableDSL.g:13039:2: ']'
+            // InternalTableDSL.g:12417:1: ( ']' )
+            // InternalTableDSL.g:12418:2: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2()); 
@@ -43899,14 +41941,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0__0"
-    // InternalTableDSL.g:13049:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl ;
+    // InternalTableDSL.g:12428:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13053:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl )
-            // InternalTableDSL.g:13054:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl
+            // InternalTableDSL.g:12432:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl )
+            // InternalTableDSL.g:12433:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl();
@@ -43932,23 +41974,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl"
-    // InternalTableDSL.g:13060:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) ;
+    // InternalTableDSL.g:12439:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13064:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) )
-            // InternalTableDSL.g:13065:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
+            // InternalTableDSL.g:12443:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) )
+            // InternalTableDSL.g:12444:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
             {
-            // InternalTableDSL.g:13065:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
-            // InternalTableDSL.g:13066:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
+            // InternalTableDSL.g:12444:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
+            // InternalTableDSL.g:12445:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_0_0()); 
             }
-            // InternalTableDSL.g:13067:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
-            // InternalTableDSL.g:13067:3: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0
+            // InternalTableDSL.g:12446:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
+            // InternalTableDSL.g:12446:3: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0();
@@ -43983,16 +42025,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0"
-    // InternalTableDSL.g:13076:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 ;
+    // InternalTableDSL.g:12455:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13080:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 )
-            // InternalTableDSL.g:13081:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1
+            // InternalTableDSL.g:12459:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 )
+            // InternalTableDSL.g:12460:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1
             {
-            pushFollow(FOLLOW_103);
+            pushFollow(FOLLOW_102);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl();
 
             state._fsp--;
@@ -44021,23 +42063,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl"
-    // InternalTableDSL.g:13088:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:12467:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl : ( () ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13092:1: ( ( () ) )
-            // InternalTableDSL.g:13093:1: ( () )
+            // InternalTableDSL.g:12471:1: ( ( () ) )
+            // InternalTableDSL.g:12472:1: ( () )
             {
-            // InternalTableDSL.g:13093:1: ( () )
-            // InternalTableDSL.g:13094:2: ()
+            // InternalTableDSL.g:12472:1: ( () )
+            // InternalTableDSL.g:12473:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralAction_0_0_0_0()); 
             }
-            // InternalTableDSL.g:13095:2: ()
-            // InternalTableDSL.g:13095:3: 
+            // InternalTableDSL.g:12474:2: ()
+            // InternalTableDSL.g:12474:3: 
             {
             }
 
@@ -44062,16 +42104,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1"
-    // InternalTableDSL.g:13103:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 ;
+    // InternalTableDSL.g:12482:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13107:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 )
-            // InternalTableDSL.g:13108:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2
+            // InternalTableDSL.g:12486:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 )
+            // InternalTableDSL.g:12487:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2
             {
-            pushFollow(FOLLOW_104);
+            pushFollow(FOLLOW_103);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl();
 
             state._fsp--;
@@ -44100,17 +42142,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl"
-    // InternalTableDSL.g:13115:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl : ( '#' ) ;
+    // InternalTableDSL.g:12494:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl : ( '#' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13119:1: ( ( '#' ) )
-            // InternalTableDSL.g:13120:1: ( '#' )
+            // InternalTableDSL.g:12498:1: ( ( '#' ) )
+            // InternalTableDSL.g:12499:1: ( '#' )
             {
-            // InternalTableDSL.g:13120:1: ( '#' )
-            // InternalTableDSL.g:13121:2: '#'
+            // InternalTableDSL.g:12499:1: ( '#' )
+            // InternalTableDSL.g:12500:2: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1()); 
@@ -44141,14 +42183,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2"
-    // InternalTableDSL.g:13130:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl ;
+    // InternalTableDSL.g:12509:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13134:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl )
-            // InternalTableDSL.g:13135:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl
+            // InternalTableDSL.g:12513:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl )
+            // InternalTableDSL.g:12514:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl();
@@ -44174,17 +42216,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl"
-    // InternalTableDSL.g:13141:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl : ( '[' ) ;
+    // InternalTableDSL.g:12520:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl : ( '[' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13145:1: ( ( '[' ) )
-            // InternalTableDSL.g:13146:1: ( '[' )
+            // InternalTableDSL.g:12524:1: ( ( '[' ) )
+            // InternalTableDSL.g:12525:1: ( '[' )
             {
-            // InternalTableDSL.g:13146:1: ( '[' )
-            // InternalTableDSL.g:13147:2: '['
+            // InternalTableDSL.g:12525:1: ( '[' )
+            // InternalTableDSL.g:12526:2: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
@@ -44215,16 +42257,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__0"
-    // InternalTableDSL.g:13157:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 ;
+    // InternalTableDSL.g:12536:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13161:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 )
-            // InternalTableDSL.g:13162:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1
+            // InternalTableDSL.g:12540:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 )
+            // InternalTableDSL.g:12541:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_97);
             rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl();
 
             state._fsp--;
@@ -44253,23 +42295,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl"
-    // InternalTableDSL.g:13169:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) ;
+    // InternalTableDSL.g:12548:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13173:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) )
-            // InternalTableDSL.g:13174:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
+            // InternalTableDSL.g:12552:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) )
+            // InternalTableDSL.g:12553:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
             {
-            // InternalTableDSL.g:13174:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
-            // InternalTableDSL.g:13175:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
+            // InternalTableDSL.g:12553:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
+            // InternalTableDSL.g:12554:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsAssignment_0_1_0()); 
             }
-            // InternalTableDSL.g:13176:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
-            // InternalTableDSL.g:13176:3: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0
+            // InternalTableDSL.g:12555:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
+            // InternalTableDSL.g:12555:3: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0();
@@ -44304,14 +42346,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__1"
-    // InternalTableDSL.g:13184:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl ;
+    // InternalTableDSL.g:12563:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13188:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl )
-            // InternalTableDSL.g:13189:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl
+            // InternalTableDSL.g:12567:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl )
+            // InternalTableDSL.g:12568:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl();
@@ -44337,37 +42379,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl"
-    // InternalTableDSL.g:13195:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) ;
+    // InternalTableDSL.g:12574:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13199:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) )
-            // InternalTableDSL.g:13200:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
+            // InternalTableDSL.g:12578:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) )
+            // InternalTableDSL.g:12579:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
             {
-            // InternalTableDSL.g:13200:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
-            // InternalTableDSL.g:13201:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
+            // InternalTableDSL.g:12579:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
+            // InternalTableDSL.g:12580:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_1_1()); 
             }
-            // InternalTableDSL.g:13202:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
-            loop96:
+            // InternalTableDSL.g:12581:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
+            loop94:
             do {
-                int alt96=2;
-                int LA96_0 = input.LA(1);
+                int alt94=2;
+                int LA94_0 = input.LA(1);
 
-                if ( (LA96_0==137) ) {
-                    alt96=1;
+                if ( (LA94_0==137) ) {
+                    alt94=1;
                 }
 
 
-                switch (alt96) {
+                switch (alt94) {
             	case 1 :
-            	    // InternalTableDSL.g:13202:3: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0
+            	    // InternalTableDSL.g:12581:3: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -44377,7 +42419,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop96;
+            	    break loop94;
                 }
             } while (true);
 
@@ -44406,16 +42448,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0"
-    // InternalTableDSL.g:13211:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 ;
+    // InternalTableDSL.g:12590:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13215:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 )
-            // InternalTableDSL.g:13216:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1
+            // InternalTableDSL.g:12594:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 )
+            // InternalTableDSL.g:12595:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl();
 
             state._fsp--;
@@ -44444,17 +42486,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl"
-    // InternalTableDSL.g:13223:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:12602:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13227:1: ( ( ',' ) )
-            // InternalTableDSL.g:13228:1: ( ',' )
+            // InternalTableDSL.g:12606:1: ( ( ',' ) )
+            // InternalTableDSL.g:12607:1: ( ',' )
             {
-            // InternalTableDSL.g:13228:1: ( ',' )
-            // InternalTableDSL.g:13229:2: ','
+            // InternalTableDSL.g:12607:1: ( ',' )
+            // InternalTableDSL.g:12608:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0()); 
@@ -44485,14 +42527,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1"
-    // InternalTableDSL.g:13238:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl ;
+    // InternalTableDSL.g:12617:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13242:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl )
-            // InternalTableDSL.g:13243:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl
+            // InternalTableDSL.g:12621:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl )
+            // InternalTableDSL.g:12622:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl();
@@ -44518,23 +42560,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl"
-    // InternalTableDSL.g:13249:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) ;
+    // InternalTableDSL.g:12628:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13253:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) )
-            // InternalTableDSL.g:13254:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
+            // InternalTableDSL.g:12632:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) )
+            // InternalTableDSL.g:12633:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
             {
-            // InternalTableDSL.g:13254:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
-            // InternalTableDSL.g:13255:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
+            // InternalTableDSL.g:12633:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
+            // InternalTableDSL.g:12634:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsAssignment_0_1_1_1()); 
             }
-            // InternalTableDSL.g:13256:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
-            // InternalTableDSL.g:13256:3: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1
+            // InternalTableDSL.g:12635:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
+            // InternalTableDSL.g:12635:3: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1();
@@ -44569,16 +42611,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__0"
-    // InternalTableDSL.g:13265:1: rule__XAnnotationElementValueOrCommaList__Group_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 ;
+    // InternalTableDSL.g:12644:1: rule__XAnnotationElementValueOrCommaList__Group_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13269:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 )
-            // InternalTableDSL.g:13270:2: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1
+            // InternalTableDSL.g:12648:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 )
+            // InternalTableDSL.g:12649:2: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_97);
             rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl();
 
             state._fsp--;
@@ -44607,17 +42649,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl"
-    // InternalTableDSL.g:13277:1: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl : ( ruleXAnnotationOrExpression ) ;
+    // InternalTableDSL.g:12656:1: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13281:1: ( ( ruleXAnnotationOrExpression ) )
-            // InternalTableDSL.g:13282:1: ( ruleXAnnotationOrExpression )
+            // InternalTableDSL.g:12660:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalTableDSL.g:12661:1: ( ruleXAnnotationOrExpression )
             {
-            // InternalTableDSL.g:13282:1: ( ruleXAnnotationOrExpression )
-            // InternalTableDSL.g:13283:2: ruleXAnnotationOrExpression
+            // InternalTableDSL.g:12661:1: ( ruleXAnnotationOrExpression )
+            // InternalTableDSL.g:12662:2: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXAnnotationOrExpressionParserRuleCall_1_0()); 
@@ -44652,14 +42694,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__1"
-    // InternalTableDSL.g:13292:1: rule__XAnnotationElementValueOrCommaList__Group_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl ;
+    // InternalTableDSL.g:12671:1: rule__XAnnotationElementValueOrCommaList__Group_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13296:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl )
-            // InternalTableDSL.g:13297:2: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl
+            // InternalTableDSL.g:12675:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl )
+            // InternalTableDSL.g:12676:2: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl();
@@ -44685,31 +42727,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl"
-    // InternalTableDSL.g:13303:1: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) ;
+    // InternalTableDSL.g:12682:1: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13307:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) )
-            // InternalTableDSL.g:13308:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
+            // InternalTableDSL.g:12686:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) )
+            // InternalTableDSL.g:12687:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
             {
-            // InternalTableDSL.g:13308:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
-            // InternalTableDSL.g:13309:2: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
+            // InternalTableDSL.g:12687:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
+            // InternalTableDSL.g:12688:2: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1_1()); 
             }
-            // InternalTableDSL.g:13310:2: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
-            int alt97=2;
-            int LA97_0 = input.LA(1);
+            // InternalTableDSL.g:12689:2: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
+            int alt95=2;
+            int LA95_0 = input.LA(1);
 
-            if ( (LA97_0==137) ) {
-                alt97=1;
+            if ( (LA95_0==137) ) {
+                alt95=1;
             }
-            switch (alt97) {
+            switch (alt95) {
                 case 1 :
-                    // InternalTableDSL.g:13310:3: rule__XAnnotationElementValueOrCommaList__Group_1_1__0
+                    // InternalTableDSL.g:12689:3: rule__XAnnotationElementValueOrCommaList__Group_1_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValueOrCommaList__Group_1_1__0();
@@ -44747,16 +42789,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__0"
-    // InternalTableDSL.g:13319:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 ;
+    // InternalTableDSL.g:12698:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13323:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 )
-            // InternalTableDSL.g:13324:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1
+            // InternalTableDSL.g:12702:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 )
+            // InternalTableDSL.g:12703:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_97);
             rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl();
 
             state._fsp--;
@@ -44785,23 +42827,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl"
-    // InternalTableDSL.g:13331:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl : ( () ) ;
+    // InternalTableDSL.g:12710:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl : ( () ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13335:1: ( ( () ) )
-            // InternalTableDSL.g:13336:1: ( () )
+            // InternalTableDSL.g:12714:1: ( ( () ) )
+            // InternalTableDSL.g:12715:1: ( () )
             {
-            // InternalTableDSL.g:13336:1: ( () )
-            // InternalTableDSL.g:13337:2: ()
+            // InternalTableDSL.g:12715:1: ( () )
+            // InternalTableDSL.g:12716:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0()); 
             }
-            // InternalTableDSL.g:13338:2: ()
-            // InternalTableDSL.g:13338:3: 
+            // InternalTableDSL.g:12717:2: ()
+            // InternalTableDSL.g:12717:3: 
             {
             }
 
@@ -44826,14 +42868,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__1"
-    // InternalTableDSL.g:13346:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl ;
+    // InternalTableDSL.g:12725:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13350:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl )
-            // InternalTableDSL.g:13351:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl
+            // InternalTableDSL.g:12729:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl )
+            // InternalTableDSL.g:12730:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl();
@@ -44859,28 +42901,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl"
-    // InternalTableDSL.g:13357:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) ;
+    // InternalTableDSL.g:12736:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13361:1: ( ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) )
-            // InternalTableDSL.g:13362:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
+            // InternalTableDSL.g:12740:1: ( ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) )
+            // InternalTableDSL.g:12741:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
             {
-            // InternalTableDSL.g:13362:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
-            // InternalTableDSL.g:13363:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
+            // InternalTableDSL.g:12741:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
+            // InternalTableDSL.g:12742:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
             {
-            // InternalTableDSL.g:13363:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) )
-            // InternalTableDSL.g:13364:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
+            // InternalTableDSL.g:12742:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) )
+            // InternalTableDSL.g:12743:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1_1_1()); 
             }
-            // InternalTableDSL.g:13365:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
-            // InternalTableDSL.g:13365:4: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
+            // InternalTableDSL.g:12744:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
+            // InternalTableDSL.g:12744:4: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
             {
-            pushFollow(FOLLOW_99);
+            pushFollow(FOLLOW_98);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0();
 
             state._fsp--;
@@ -44894,28 +42936,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
             }
 
-            // InternalTableDSL.g:13368:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
-            // InternalTableDSL.g:13369:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
+            // InternalTableDSL.g:12747:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
+            // InternalTableDSL.g:12748:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1_1_1()); 
             }
-            // InternalTableDSL.g:13370:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
-            loop98:
+            // InternalTableDSL.g:12749:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
+            loop96:
             do {
-                int alt98=2;
-                int LA98_0 = input.LA(1);
+                int alt96=2;
+                int LA96_0 = input.LA(1);
 
-                if ( (LA98_0==137) ) {
-                    alt98=1;
+                if ( (LA96_0==137) ) {
+                    alt96=1;
                 }
 
 
-                switch (alt98) {
+                switch (alt96) {
             	case 1 :
-            	    // InternalTableDSL.g:13370:4: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
+            	    // InternalTableDSL.g:12749:4: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0();
 
             	    state._fsp--;
@@ -44925,7 +42967,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop98;
+            	    break loop96;
                 }
             } while (true);
 
@@ -44957,16 +42999,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0"
-    // InternalTableDSL.g:13380:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 ;
+    // InternalTableDSL.g:12759:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13384:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 )
-            // InternalTableDSL.g:13385:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1
+            // InternalTableDSL.g:12763:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 )
+            // InternalTableDSL.g:12764:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl();
 
             state._fsp--;
@@ -44995,17 +43037,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl"
-    // InternalTableDSL.g:13392:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:12771:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13396:1: ( ( ',' ) )
-            // InternalTableDSL.g:13397:1: ( ',' )
+            // InternalTableDSL.g:12775:1: ( ( ',' ) )
+            // InternalTableDSL.g:12776:1: ( ',' )
             {
-            // InternalTableDSL.g:13397:1: ( ',' )
-            // InternalTableDSL.g:13398:2: ','
+            // InternalTableDSL.g:12776:1: ( ',' )
+            // InternalTableDSL.g:12777:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0()); 
@@ -45036,14 +43078,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1"
-    // InternalTableDSL.g:13407:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl ;
+    // InternalTableDSL.g:12786:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13411:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl )
-            // InternalTableDSL.g:13412:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl
+            // InternalTableDSL.g:12790:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl )
+            // InternalTableDSL.g:12791:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl();
@@ -45069,23 +43111,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl"
-    // InternalTableDSL.g:13418:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) ;
+    // InternalTableDSL.g:12797:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13422:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) )
-            // InternalTableDSL.g:13423:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
+            // InternalTableDSL.g:12801:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) )
+            // InternalTableDSL.g:12802:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
             {
-            // InternalTableDSL.g:13423:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
-            // InternalTableDSL.g:13424:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
+            // InternalTableDSL.g:12802:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
+            // InternalTableDSL.g:12803:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsAssignment_1_1_1_1()); 
             }
-            // InternalTableDSL.g:13425:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
-            // InternalTableDSL.g:13425:3: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1
+            // InternalTableDSL.g:12804:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
+            // InternalTableDSL.g:12804:3: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1();
@@ -45120,16 +43162,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__0"
-    // InternalTableDSL.g:13434:1: rule__XAnnotationElementValue__Group_0__0 : rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 ;
+    // InternalTableDSL.g:12813:1: rule__XAnnotationElementValue__Group_0__0 : rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 ;
     public final void rule__XAnnotationElementValue__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13438:1: ( rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 )
-            // InternalTableDSL.g:13439:2: rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1
+            // InternalTableDSL.g:12817:1: ( rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 )
+            // InternalTableDSL.g:12818:2: rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1
             {
-            pushFollow(FOLLOW_102);
+            pushFollow(FOLLOW_101);
             rule__XAnnotationElementValue__Group_0__0__Impl();
 
             state._fsp--;
@@ -45158,23 +43200,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__0__Impl"
-    // InternalTableDSL.g:13446:1: rule__XAnnotationElementValue__Group_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) ;
+    // InternalTableDSL.g:12825:1: rule__XAnnotationElementValue__Group_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13450:1: ( ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) )
-            // InternalTableDSL.g:13451:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
+            // InternalTableDSL.g:12829:1: ( ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) )
+            // InternalTableDSL.g:12830:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
             {
-            // InternalTableDSL.g:13451:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
-            // InternalTableDSL.g:13452:2: ( rule__XAnnotationElementValue__Group_0_0__0 )
+            // InternalTableDSL.g:12830:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
+            // InternalTableDSL.g:12831:2: ( rule__XAnnotationElementValue__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_0()); 
             }
-            // InternalTableDSL.g:13453:2: ( rule__XAnnotationElementValue__Group_0_0__0 )
-            // InternalTableDSL.g:13453:3: rule__XAnnotationElementValue__Group_0_0__0
+            // InternalTableDSL.g:12832:2: ( rule__XAnnotationElementValue__Group_0_0__0 )
+            // InternalTableDSL.g:12832:3: rule__XAnnotationElementValue__Group_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0__0();
@@ -45209,16 +43251,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__1"
-    // InternalTableDSL.g:13461:1: rule__XAnnotationElementValue__Group_0__1 : rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 ;
+    // InternalTableDSL.g:12840:1: rule__XAnnotationElementValue__Group_0__1 : rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 ;
     public final void rule__XAnnotationElementValue__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13465:1: ( rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 )
-            // InternalTableDSL.g:13466:2: rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2
+            // InternalTableDSL.g:12844:1: ( rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 )
+            // InternalTableDSL.g:12845:2: rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2
             {
-            pushFollow(FOLLOW_102);
+            pushFollow(FOLLOW_101);
             rule__XAnnotationElementValue__Group_0__1__Impl();
 
             state._fsp--;
@@ -45247,31 +43289,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__1__Impl"
-    // InternalTableDSL.g:13473:1: rule__XAnnotationElementValue__Group_0__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) ;
+    // InternalTableDSL.g:12852:1: rule__XAnnotationElementValue__Group_0__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) ;
     public final void rule__XAnnotationElementValue__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13477:1: ( ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) )
-            // InternalTableDSL.g:13478:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
+            // InternalTableDSL.g:12856:1: ( ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) )
+            // InternalTableDSL.g:12857:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
             {
-            // InternalTableDSL.g:13478:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
-            // InternalTableDSL.g:13479:2: ( rule__XAnnotationElementValue__Group_0_1__0 )?
+            // InternalTableDSL.g:12857:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
+            // InternalTableDSL.g:12858:2: ( rule__XAnnotationElementValue__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_1()); 
             }
-            // InternalTableDSL.g:13480:2: ( rule__XAnnotationElementValue__Group_0_1__0 )?
-            int alt99=2;
-            int LA99_0 = input.LA(1);
+            // InternalTableDSL.g:12859:2: ( rule__XAnnotationElementValue__Group_0_1__0 )?
+            int alt97=2;
+            int LA97_0 = input.LA(1);
 
-            if ( ((LA99_0>=RULE_STRING && LA99_0<=RULE_DECIMAL)||(LA99_0>=19 && LA99_0<=20)||LA99_0==32||LA99_0==43||(LA99_0>=48 && LA99_0<=53)||LA99_0==75||(LA99_0>=134 && LA99_0<=135)||(LA99_0>=139 && LA99_0<=140)||LA99_0==142||LA99_0==144||(LA99_0>=147 && LA99_0<=155)||LA99_0==157||LA99_0==184) ) {
-                alt99=1;
+            if ( ((LA97_0>=RULE_STRING && LA97_0<=RULE_DECIMAL)||(LA97_0>=19 && LA97_0<=20)||LA97_0==32||LA97_0==43||(LA97_0>=48 && LA97_0<=53)||LA97_0==75||(LA97_0>=134 && LA97_0<=135)||(LA97_0>=139 && LA97_0<=140)||LA97_0==142||LA97_0==144||(LA97_0>=147 && LA97_0<=155)||LA97_0==157||LA97_0==181) ) {
+                alt97=1;
             }
-            switch (alt99) {
+            switch (alt97) {
                 case 1 :
-                    // InternalTableDSL.g:13480:3: rule__XAnnotationElementValue__Group_0_1__0
+                    // InternalTableDSL.g:12859:3: rule__XAnnotationElementValue__Group_0_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValue__Group_0_1__0();
@@ -45309,14 +43351,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__2"
-    // InternalTableDSL.g:13488:1: rule__XAnnotationElementValue__Group_0__2 : rule__XAnnotationElementValue__Group_0__2__Impl ;
+    // InternalTableDSL.g:12867:1: rule__XAnnotationElementValue__Group_0__2 : rule__XAnnotationElementValue__Group_0__2__Impl ;
     public final void rule__XAnnotationElementValue__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13492:1: ( rule__XAnnotationElementValue__Group_0__2__Impl )
-            // InternalTableDSL.g:13493:2: rule__XAnnotationElementValue__Group_0__2__Impl
+            // InternalTableDSL.g:12871:1: ( rule__XAnnotationElementValue__Group_0__2__Impl )
+            // InternalTableDSL.g:12872:2: rule__XAnnotationElementValue__Group_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0__2__Impl();
@@ -45342,17 +43384,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__2__Impl"
-    // InternalTableDSL.g:13499:1: rule__XAnnotationElementValue__Group_0__2__Impl : ( ']' ) ;
+    // InternalTableDSL.g:12878:1: rule__XAnnotationElementValue__Group_0__2__Impl : ( ']' ) ;
     public final void rule__XAnnotationElementValue__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13503:1: ( ( ']' ) )
-            // InternalTableDSL.g:13504:1: ( ']' )
+            // InternalTableDSL.g:12882:1: ( ( ']' ) )
+            // InternalTableDSL.g:12883:1: ( ']' )
             {
-            // InternalTableDSL.g:13504:1: ( ']' )
-            // InternalTableDSL.g:13505:2: ']'
+            // InternalTableDSL.g:12883:1: ( ']' )
+            // InternalTableDSL.g:12884:2: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2()); 
@@ -45383,14 +43425,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0__0"
-    // InternalTableDSL.g:13515:1: rule__XAnnotationElementValue__Group_0_0__0 : rule__XAnnotationElementValue__Group_0_0__0__Impl ;
+    // InternalTableDSL.g:12894:1: rule__XAnnotationElementValue__Group_0_0__0 : rule__XAnnotationElementValue__Group_0_0__0__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13519:1: ( rule__XAnnotationElementValue__Group_0_0__0__Impl )
-            // InternalTableDSL.g:13520:2: rule__XAnnotationElementValue__Group_0_0__0__Impl
+            // InternalTableDSL.g:12898:1: ( rule__XAnnotationElementValue__Group_0_0__0__Impl )
+            // InternalTableDSL.g:12899:2: rule__XAnnotationElementValue__Group_0_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0__0__Impl();
@@ -45416,23 +43458,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0__0__Impl"
-    // InternalTableDSL.g:13526:1: rule__XAnnotationElementValue__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) ;
+    // InternalTableDSL.g:12905:1: rule__XAnnotationElementValue__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13530:1: ( ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) )
-            // InternalTableDSL.g:13531:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
+            // InternalTableDSL.g:12909:1: ( ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) )
+            // InternalTableDSL.g:12910:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
             {
-            // InternalTableDSL.g:13531:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
-            // InternalTableDSL.g:13532:2: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
+            // InternalTableDSL.g:12910:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
+            // InternalTableDSL.g:12911:2: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_0_0()); 
             }
-            // InternalTableDSL.g:13533:2: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
-            // InternalTableDSL.g:13533:3: rule__XAnnotationElementValue__Group_0_0_0__0
+            // InternalTableDSL.g:12912:2: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
+            // InternalTableDSL.g:12912:3: rule__XAnnotationElementValue__Group_0_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0_0__0();
@@ -45467,16 +43509,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__0"
-    // InternalTableDSL.g:13542:1: rule__XAnnotationElementValue__Group_0_0_0__0 : rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 ;
+    // InternalTableDSL.g:12921:1: rule__XAnnotationElementValue__Group_0_0_0__0 : rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13546:1: ( rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 )
-            // InternalTableDSL.g:13547:2: rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1
+            // InternalTableDSL.g:12925:1: ( rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 )
+            // InternalTableDSL.g:12926:2: rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1
             {
-            pushFollow(FOLLOW_103);
+            pushFollow(FOLLOW_102);
             rule__XAnnotationElementValue__Group_0_0_0__0__Impl();
 
             state._fsp--;
@@ -45505,23 +43547,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__0__Impl"
-    // InternalTableDSL.g:13554:1: rule__XAnnotationElementValue__Group_0_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:12933:1: rule__XAnnotationElementValue__Group_0_0_0__0__Impl : ( () ) ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13558:1: ( ( () ) )
-            // InternalTableDSL.g:13559:1: ( () )
+            // InternalTableDSL.g:12937:1: ( ( () ) )
+            // InternalTableDSL.g:12938:1: ( () )
             {
-            // InternalTableDSL.g:13559:1: ( () )
-            // InternalTableDSL.g:13560:2: ()
+            // InternalTableDSL.g:12938:1: ( () )
+            // InternalTableDSL.g:12939:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getXListLiteralAction_0_0_0_0()); 
             }
-            // InternalTableDSL.g:13561:2: ()
-            // InternalTableDSL.g:13561:3: 
+            // InternalTableDSL.g:12940:2: ()
+            // InternalTableDSL.g:12940:3: 
             {
             }
 
@@ -45546,16 +43588,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__1"
-    // InternalTableDSL.g:13569:1: rule__XAnnotationElementValue__Group_0_0_0__1 : rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 ;
+    // InternalTableDSL.g:12948:1: rule__XAnnotationElementValue__Group_0_0_0__1 : rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13573:1: ( rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 )
-            // InternalTableDSL.g:13574:2: rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2
+            // InternalTableDSL.g:12952:1: ( rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 )
+            // InternalTableDSL.g:12953:2: rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2
             {
-            pushFollow(FOLLOW_104);
+            pushFollow(FOLLOW_103);
             rule__XAnnotationElementValue__Group_0_0_0__1__Impl();
 
             state._fsp--;
@@ -45584,17 +43626,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__1__Impl"
-    // InternalTableDSL.g:13581:1: rule__XAnnotationElementValue__Group_0_0_0__1__Impl : ( '#' ) ;
+    // InternalTableDSL.g:12960:1: rule__XAnnotationElementValue__Group_0_0_0__1__Impl : ( '#' ) ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13585:1: ( ( '#' ) )
-            // InternalTableDSL.g:13586:1: ( '#' )
+            // InternalTableDSL.g:12964:1: ( ( '#' ) )
+            // InternalTableDSL.g:12965:1: ( '#' )
             {
-            // InternalTableDSL.g:13586:1: ( '#' )
-            // InternalTableDSL.g:13587:2: '#'
+            // InternalTableDSL.g:12965:1: ( '#' )
+            // InternalTableDSL.g:12966:2: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1()); 
@@ -45625,14 +43667,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__2"
-    // InternalTableDSL.g:13596:1: rule__XAnnotationElementValue__Group_0_0_0__2 : rule__XAnnotationElementValue__Group_0_0_0__2__Impl ;
+    // InternalTableDSL.g:12975:1: rule__XAnnotationElementValue__Group_0_0_0__2 : rule__XAnnotationElementValue__Group_0_0_0__2__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13600:1: ( rule__XAnnotationElementValue__Group_0_0_0__2__Impl )
-            // InternalTableDSL.g:13601:2: rule__XAnnotationElementValue__Group_0_0_0__2__Impl
+            // InternalTableDSL.g:12979:1: ( rule__XAnnotationElementValue__Group_0_0_0__2__Impl )
+            // InternalTableDSL.g:12980:2: rule__XAnnotationElementValue__Group_0_0_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0_0__2__Impl();
@@ -45658,17 +43700,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__2__Impl"
-    // InternalTableDSL.g:13607:1: rule__XAnnotationElementValue__Group_0_0_0__2__Impl : ( '[' ) ;
+    // InternalTableDSL.g:12986:1: rule__XAnnotationElementValue__Group_0_0_0__2__Impl : ( '[' ) ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13611:1: ( ( '[' ) )
-            // InternalTableDSL.g:13612:1: ( '[' )
+            // InternalTableDSL.g:12990:1: ( ( '[' ) )
+            // InternalTableDSL.g:12991:1: ( '[' )
             {
-            // InternalTableDSL.g:13612:1: ( '[' )
-            // InternalTableDSL.g:13613:2: '['
+            // InternalTableDSL.g:12991:1: ( '[' )
+            // InternalTableDSL.g:12992:2: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
@@ -45699,16 +43741,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__0"
-    // InternalTableDSL.g:13623:1: rule__XAnnotationElementValue__Group_0_1__0 : rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 ;
+    // InternalTableDSL.g:13002:1: rule__XAnnotationElementValue__Group_0_1__0 : rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 ;
     public final void rule__XAnnotationElementValue__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13627:1: ( rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 )
-            // InternalTableDSL.g:13628:2: rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1
+            // InternalTableDSL.g:13006:1: ( rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 )
+            // InternalTableDSL.g:13007:2: rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_97);
             rule__XAnnotationElementValue__Group_0_1__0__Impl();
 
             state._fsp--;
@@ -45737,23 +43779,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__0__Impl"
-    // InternalTableDSL.g:13635:1: rule__XAnnotationElementValue__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) ;
+    // InternalTableDSL.g:13014:1: rule__XAnnotationElementValue__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13639:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) )
-            // InternalTableDSL.g:13640:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
+            // InternalTableDSL.g:13018:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) )
+            // InternalTableDSL.g:13019:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
             {
-            // InternalTableDSL.g:13640:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
-            // InternalTableDSL.g:13641:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
+            // InternalTableDSL.g:13019:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
+            // InternalTableDSL.g:13020:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsAssignment_0_1_0()); 
             }
-            // InternalTableDSL.g:13642:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
-            // InternalTableDSL.g:13642:3: rule__XAnnotationElementValue__ElementsAssignment_0_1_0
+            // InternalTableDSL.g:13021:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
+            // InternalTableDSL.g:13021:3: rule__XAnnotationElementValue__ElementsAssignment_0_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__ElementsAssignment_0_1_0();
@@ -45788,14 +43830,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__1"
-    // InternalTableDSL.g:13650:1: rule__XAnnotationElementValue__Group_0_1__1 : rule__XAnnotationElementValue__Group_0_1__1__Impl ;
+    // InternalTableDSL.g:13029:1: rule__XAnnotationElementValue__Group_0_1__1 : rule__XAnnotationElementValue__Group_0_1__1__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13654:1: ( rule__XAnnotationElementValue__Group_0_1__1__Impl )
-            // InternalTableDSL.g:13655:2: rule__XAnnotationElementValue__Group_0_1__1__Impl
+            // InternalTableDSL.g:13033:1: ( rule__XAnnotationElementValue__Group_0_1__1__Impl )
+            // InternalTableDSL.g:13034:2: rule__XAnnotationElementValue__Group_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_1__1__Impl();
@@ -45821,37 +43863,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__1__Impl"
-    // InternalTableDSL.g:13661:1: rule__XAnnotationElementValue__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) ;
+    // InternalTableDSL.g:13040:1: rule__XAnnotationElementValue__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) ;
     public final void rule__XAnnotationElementValue__Group_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13665:1: ( ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) )
-            // InternalTableDSL.g:13666:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
+            // InternalTableDSL.g:13044:1: ( ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) )
+            // InternalTableDSL.g:13045:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
             {
-            // InternalTableDSL.g:13666:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
-            // InternalTableDSL.g:13667:2: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
+            // InternalTableDSL.g:13045:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
+            // InternalTableDSL.g:13046:2: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_1_1()); 
             }
-            // InternalTableDSL.g:13668:2: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
-            loop100:
+            // InternalTableDSL.g:13047:2: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
+            loop98:
             do {
-                int alt100=2;
-                int LA100_0 = input.LA(1);
+                int alt98=2;
+                int LA98_0 = input.LA(1);
 
-                if ( (LA100_0==137) ) {
-                    alt100=1;
+                if ( (LA98_0==137) ) {
+                    alt98=1;
                 }
 
 
-                switch (alt100) {
+                switch (alt98) {
             	case 1 :
-            	    // InternalTableDSL.g:13668:3: rule__XAnnotationElementValue__Group_0_1_1__0
+            	    // InternalTableDSL.g:13047:3: rule__XAnnotationElementValue__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XAnnotationElementValue__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -45861,7 +43903,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop100;
+            	    break loop98;
                 }
             } while (true);
 
@@ -45890,16 +43932,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__0"
-    // InternalTableDSL.g:13677:1: rule__XAnnotationElementValue__Group_0_1_1__0 : rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 ;
+    // InternalTableDSL.g:13056:1: rule__XAnnotationElementValue__Group_0_1_1__0 : rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13681:1: ( rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 )
-            // InternalTableDSL.g:13682:2: rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1
+            // InternalTableDSL.g:13060:1: ( rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 )
+            // InternalTableDSL.g:13061:2: rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XAnnotationElementValue__Group_0_1_1__0__Impl();
 
             state._fsp--;
@@ -45928,17 +43970,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__0__Impl"
-    // InternalTableDSL.g:13689:1: rule__XAnnotationElementValue__Group_0_1_1__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:13068:1: rule__XAnnotationElementValue__Group_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13693:1: ( ( ',' ) )
-            // InternalTableDSL.g:13694:1: ( ',' )
+            // InternalTableDSL.g:13072:1: ( ( ',' ) )
+            // InternalTableDSL.g:13073:1: ( ',' )
             {
-            // InternalTableDSL.g:13694:1: ( ',' )
-            // InternalTableDSL.g:13695:2: ','
+            // InternalTableDSL.g:13073:1: ( ',' )
+            // InternalTableDSL.g:13074:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0()); 
@@ -45969,14 +44011,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__1"
-    // InternalTableDSL.g:13704:1: rule__XAnnotationElementValue__Group_0_1_1__1 : rule__XAnnotationElementValue__Group_0_1_1__1__Impl ;
+    // InternalTableDSL.g:13083:1: rule__XAnnotationElementValue__Group_0_1_1__1 : rule__XAnnotationElementValue__Group_0_1_1__1__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13708:1: ( rule__XAnnotationElementValue__Group_0_1_1__1__Impl )
-            // InternalTableDSL.g:13709:2: rule__XAnnotationElementValue__Group_0_1_1__1__Impl
+            // InternalTableDSL.g:13087:1: ( rule__XAnnotationElementValue__Group_0_1_1__1__Impl )
+            // InternalTableDSL.g:13088:2: rule__XAnnotationElementValue__Group_0_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_1_1__1__Impl();
@@ -46002,23 +44044,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__1__Impl"
-    // InternalTableDSL.g:13715:1: rule__XAnnotationElementValue__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) ;
+    // InternalTableDSL.g:13094:1: rule__XAnnotationElementValue__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13719:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) )
-            // InternalTableDSL.g:13720:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
+            // InternalTableDSL.g:13098:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) )
+            // InternalTableDSL.g:13099:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
             {
-            // InternalTableDSL.g:13720:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
-            // InternalTableDSL.g:13721:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
+            // InternalTableDSL.g:13099:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
+            // InternalTableDSL.g:13100:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsAssignment_0_1_1_1()); 
             }
-            // InternalTableDSL.g:13722:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
-            // InternalTableDSL.g:13722:3: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1
+            // InternalTableDSL.g:13101:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
+            // InternalTableDSL.g:13101:3: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1();
@@ -46053,16 +44095,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_0__0"
-    // InternalTableDSL.g:13731:1: rule__XAssignment__Group_0__0 : rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 ;
+    // InternalTableDSL.g:13110:1: rule__XAssignment__Group_0__0 : rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 ;
     public final void rule__XAssignment__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13735:1: ( rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 )
-            // InternalTableDSL.g:13736:2: rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1
+            // InternalTableDSL.g:13114:1: ( rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 )
+            // InternalTableDSL.g:13115:2: rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1
             {
-            pushFollow(FOLLOW_105);
+            pushFollow(FOLLOW_104);
             rule__XAssignment__Group_0__0__Impl();
 
             state._fsp--;
@@ -46091,23 +44133,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_0__0__Impl"
-    // InternalTableDSL.g:13743:1: rule__XAssignment__Group_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:13122:1: rule__XAssignment__Group_0__0__Impl : ( () ) ;
     public final void rule__XAssignment__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13747:1: ( ( () ) )
-            // InternalTableDSL.g:13748:1: ( () )
+            // InternalTableDSL.g:13126:1: ( ( () ) )
+            // InternalTableDSL.g:13127:1: ( () )
             {
-            // InternalTableDSL.g:13748:1: ( () )
-            // InternalTableDSL.g:13749:2: ()
+            // InternalTableDSL.g:13127:1: ( () )
+            // InternalTableDSL.g:13128:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXAssignmentAction_0_0()); 
             }
-            // InternalTableDSL.g:13750:2: ()
-            // InternalTableDSL.g:13750:3: 
+            // InternalTableDSL.g:13129:2: ()
+            // InternalTableDSL.g:13129:3: 
             {
             }
 
@@ -46132,16 +44174,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_0__1"
-    // InternalTableDSL.g:13758:1: rule__XAssignment__Group_0__1 : rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 ;
+    // InternalTableDSL.g:13137:1: rule__XAssignment__Group_0__1 : rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 ;
     public final void rule__XAssignment__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13762:1: ( rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 )
-            // InternalTableDSL.g:13763:2: rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2
+            // InternalTableDSL.g:13141:1: ( rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 )
+            // InternalTableDSL.g:13142:2: rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2
             {
-            pushFollow(FOLLOW_101);
+            pushFollow(FOLLOW_100);
             rule__XAssignment__Group_0__1__Impl();
 
             state._fsp--;
@@ -46170,23 +44212,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_0__1__Impl"
-    // InternalTableDSL.g:13770:1: rule__XAssignment__Group_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) ;
+    // InternalTableDSL.g:13149:1: rule__XAssignment__Group_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) ;
     public final void rule__XAssignment__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13774:1: ( ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) )
-            // InternalTableDSL.g:13775:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
+            // InternalTableDSL.g:13153:1: ( ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) )
+            // InternalTableDSL.g:13154:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
             {
-            // InternalTableDSL.g:13775:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
-            // InternalTableDSL.g:13776:2: ( rule__XAssignment__FeatureAssignment_0_1 )
+            // InternalTableDSL.g:13154:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
+            // InternalTableDSL.g:13155:2: ( rule__XAssignment__FeatureAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureAssignment_0_1()); 
             }
-            // InternalTableDSL.g:13777:2: ( rule__XAssignment__FeatureAssignment_0_1 )
-            // InternalTableDSL.g:13777:3: rule__XAssignment__FeatureAssignment_0_1
+            // InternalTableDSL.g:13156:2: ( rule__XAssignment__FeatureAssignment_0_1 )
+            // InternalTableDSL.g:13156:3: rule__XAssignment__FeatureAssignment_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__FeatureAssignment_0_1();
@@ -46221,16 +44263,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_0__2"
-    // InternalTableDSL.g:13785:1: rule__XAssignment__Group_0__2 : rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 ;
+    // InternalTableDSL.g:13164:1: rule__XAssignment__Group_0__2 : rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 ;
     public final void rule__XAssignment__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13789:1: ( rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 )
-            // InternalTableDSL.g:13790:2: rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3
+            // InternalTableDSL.g:13168:1: ( rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 )
+            // InternalTableDSL.g:13169:2: rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XAssignment__Group_0__2__Impl();
 
             state._fsp--;
@@ -46259,17 +44301,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_0__2__Impl"
-    // InternalTableDSL.g:13797:1: rule__XAssignment__Group_0__2__Impl : ( ruleOpSingleAssign ) ;
+    // InternalTableDSL.g:13176:1: rule__XAssignment__Group_0__2__Impl : ( ruleOpSingleAssign ) ;
     public final void rule__XAssignment__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13801:1: ( ( ruleOpSingleAssign ) )
-            // InternalTableDSL.g:13802:1: ( ruleOpSingleAssign )
+            // InternalTableDSL.g:13180:1: ( ( ruleOpSingleAssign ) )
+            // InternalTableDSL.g:13181:1: ( ruleOpSingleAssign )
             {
-            // InternalTableDSL.g:13802:1: ( ruleOpSingleAssign )
-            // InternalTableDSL.g:13803:2: ruleOpSingleAssign
+            // InternalTableDSL.g:13181:1: ( ruleOpSingleAssign )
+            // InternalTableDSL.g:13182:2: ruleOpSingleAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getOpSingleAssignParserRuleCall_0_2()); 
@@ -46304,14 +44346,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_0__3"
-    // InternalTableDSL.g:13812:1: rule__XAssignment__Group_0__3 : rule__XAssignment__Group_0__3__Impl ;
+    // InternalTableDSL.g:13191:1: rule__XAssignment__Group_0__3 : rule__XAssignment__Group_0__3__Impl ;
     public final void rule__XAssignment__Group_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13816:1: ( rule__XAssignment__Group_0__3__Impl )
-            // InternalTableDSL.g:13817:2: rule__XAssignment__Group_0__3__Impl
+            // InternalTableDSL.g:13195:1: ( rule__XAssignment__Group_0__3__Impl )
+            // InternalTableDSL.g:13196:2: rule__XAssignment__Group_0__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__Group_0__3__Impl();
@@ -46337,23 +44379,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_0__3__Impl"
-    // InternalTableDSL.g:13823:1: rule__XAssignment__Group_0__3__Impl : ( ( rule__XAssignment__ValueAssignment_0_3 ) ) ;
+    // InternalTableDSL.g:13202:1: rule__XAssignment__Group_0__3__Impl : ( ( rule__XAssignment__ValueAssignment_0_3 ) ) ;
     public final void rule__XAssignment__Group_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13827:1: ( ( ( rule__XAssignment__ValueAssignment_0_3 ) ) )
-            // InternalTableDSL.g:13828:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
+            // InternalTableDSL.g:13206:1: ( ( ( rule__XAssignment__ValueAssignment_0_3 ) ) )
+            // InternalTableDSL.g:13207:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
             {
-            // InternalTableDSL.g:13828:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
-            // InternalTableDSL.g:13829:2: ( rule__XAssignment__ValueAssignment_0_3 )
+            // InternalTableDSL.g:13207:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
+            // InternalTableDSL.g:13208:2: ( rule__XAssignment__ValueAssignment_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getValueAssignment_0_3()); 
             }
-            // InternalTableDSL.g:13830:2: ( rule__XAssignment__ValueAssignment_0_3 )
-            // InternalTableDSL.g:13830:3: rule__XAssignment__ValueAssignment_0_3
+            // InternalTableDSL.g:13209:2: ( rule__XAssignment__ValueAssignment_0_3 )
+            // InternalTableDSL.g:13209:3: rule__XAssignment__ValueAssignment_0_3
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__ValueAssignment_0_3();
@@ -46388,16 +44430,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_1__0"
-    // InternalTableDSL.g:13839:1: rule__XAssignment__Group_1__0 : rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 ;
+    // InternalTableDSL.g:13218:1: rule__XAssignment__Group_1__0 : rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 ;
     public final void rule__XAssignment__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13843:1: ( rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 )
-            // InternalTableDSL.g:13844:2: rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1
+            // InternalTableDSL.g:13222:1: ( rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 )
+            // InternalTableDSL.g:13223:2: rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1
             {
-            pushFollow(FOLLOW_106);
+            pushFollow(FOLLOW_105);
             rule__XAssignment__Group_1__0__Impl();
 
             state._fsp--;
@@ -46426,17 +44468,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_1__0__Impl"
-    // InternalTableDSL.g:13851:1: rule__XAssignment__Group_1__0__Impl : ( ruleXOrExpression ) ;
+    // InternalTableDSL.g:13230:1: rule__XAssignment__Group_1__0__Impl : ( ruleXOrExpression ) ;
     public final void rule__XAssignment__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13855:1: ( ( ruleXOrExpression ) )
-            // InternalTableDSL.g:13856:1: ( ruleXOrExpression )
+            // InternalTableDSL.g:13234:1: ( ( ruleXOrExpression ) )
+            // InternalTableDSL.g:13235:1: ( ruleXOrExpression )
             {
-            // InternalTableDSL.g:13856:1: ( ruleXOrExpression )
-            // InternalTableDSL.g:13857:2: ruleXOrExpression
+            // InternalTableDSL.g:13235:1: ( ruleXOrExpression )
+            // InternalTableDSL.g:13236:2: ruleXOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXOrExpressionParserRuleCall_1_0()); 
@@ -46471,14 +44513,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_1__1"
-    // InternalTableDSL.g:13866:1: rule__XAssignment__Group_1__1 : rule__XAssignment__Group_1__1__Impl ;
+    // InternalTableDSL.g:13245:1: rule__XAssignment__Group_1__1 : rule__XAssignment__Group_1__1__Impl ;
     public final void rule__XAssignment__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13870:1: ( rule__XAssignment__Group_1__1__Impl )
-            // InternalTableDSL.g:13871:2: rule__XAssignment__Group_1__1__Impl
+            // InternalTableDSL.g:13249:1: ( rule__XAssignment__Group_1__1__Impl )
+            // InternalTableDSL.g:13250:2: rule__XAssignment__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1__1__Impl();
@@ -46504,27 +44546,27 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_1__1__Impl"
-    // InternalTableDSL.g:13877:1: rule__XAssignment__Group_1__1__Impl : ( ( rule__XAssignment__Group_1_1__0 )? ) ;
+    // InternalTableDSL.g:13256:1: rule__XAssignment__Group_1__1__Impl : ( ( rule__XAssignment__Group_1_1__0 )? ) ;
     public final void rule__XAssignment__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13881:1: ( ( ( rule__XAssignment__Group_1_1__0 )? ) )
-            // InternalTableDSL.g:13882:1: ( ( rule__XAssignment__Group_1_1__0 )? )
+            // InternalTableDSL.g:13260:1: ( ( ( rule__XAssignment__Group_1_1__0 )? ) )
+            // InternalTableDSL.g:13261:1: ( ( rule__XAssignment__Group_1_1__0 )? )
             {
-            // InternalTableDSL.g:13882:1: ( ( rule__XAssignment__Group_1_1__0 )? )
-            // InternalTableDSL.g:13883:2: ( rule__XAssignment__Group_1_1__0 )?
+            // InternalTableDSL.g:13261:1: ( ( rule__XAssignment__Group_1_1__0 )? )
+            // InternalTableDSL.g:13262:2: ( rule__XAssignment__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1()); 
             }
-            // InternalTableDSL.g:13884:2: ( rule__XAssignment__Group_1_1__0 )?
-            int alt101=2;
-            alt101 = dfa101.predict(input);
-            switch (alt101) {
+            // InternalTableDSL.g:13263:2: ( rule__XAssignment__Group_1_1__0 )?
+            int alt99=2;
+            alt99 = dfa99.predict(input);
+            switch (alt99) {
                 case 1 :
-                    // InternalTableDSL.g:13884:3: rule__XAssignment__Group_1_1__0
+                    // InternalTableDSL.g:13263:3: rule__XAssignment__Group_1_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAssignment__Group_1_1__0();
@@ -46562,16 +44604,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__0"
-    // InternalTableDSL.g:13893:1: rule__XAssignment__Group_1_1__0 : rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 ;
+    // InternalTableDSL.g:13272:1: rule__XAssignment__Group_1_1__0 : rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 ;
     public final void rule__XAssignment__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13897:1: ( rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 )
-            // InternalTableDSL.g:13898:2: rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1
+            // InternalTableDSL.g:13276:1: ( rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 )
+            // InternalTableDSL.g:13277:2: rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XAssignment__Group_1_1__0__Impl();
 
             state._fsp--;
@@ -46600,23 +44642,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__0__Impl"
-    // InternalTableDSL.g:13905:1: rule__XAssignment__Group_1_1__0__Impl : ( ( rule__XAssignment__Group_1_1_0__0 ) ) ;
+    // InternalTableDSL.g:13284:1: rule__XAssignment__Group_1_1__0__Impl : ( ( rule__XAssignment__Group_1_1_0__0 ) ) ;
     public final void rule__XAssignment__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13909:1: ( ( ( rule__XAssignment__Group_1_1_0__0 ) ) )
-            // InternalTableDSL.g:13910:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
+            // InternalTableDSL.g:13288:1: ( ( ( rule__XAssignment__Group_1_1_0__0 ) ) )
+            // InternalTableDSL.g:13289:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
             {
-            // InternalTableDSL.g:13910:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
-            // InternalTableDSL.g:13911:2: ( rule__XAssignment__Group_1_1_0__0 )
+            // InternalTableDSL.g:13289:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
+            // InternalTableDSL.g:13290:2: ( rule__XAssignment__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1_0()); 
             }
-            // InternalTableDSL.g:13912:2: ( rule__XAssignment__Group_1_1_0__0 )
-            // InternalTableDSL.g:13912:3: rule__XAssignment__Group_1_1_0__0
+            // InternalTableDSL.g:13291:2: ( rule__XAssignment__Group_1_1_0__0 )
+            // InternalTableDSL.g:13291:3: rule__XAssignment__Group_1_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0__0();
@@ -46651,14 +44693,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__1"
-    // InternalTableDSL.g:13920:1: rule__XAssignment__Group_1_1__1 : rule__XAssignment__Group_1_1__1__Impl ;
+    // InternalTableDSL.g:13299:1: rule__XAssignment__Group_1_1__1 : rule__XAssignment__Group_1_1__1__Impl ;
     public final void rule__XAssignment__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13924:1: ( rule__XAssignment__Group_1_1__1__Impl )
-            // InternalTableDSL.g:13925:2: rule__XAssignment__Group_1_1__1__Impl
+            // InternalTableDSL.g:13303:1: ( rule__XAssignment__Group_1_1__1__Impl )
+            // InternalTableDSL.g:13304:2: rule__XAssignment__Group_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1__1__Impl();
@@ -46684,23 +44726,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__1__Impl"
-    // InternalTableDSL.g:13931:1: rule__XAssignment__Group_1_1__1__Impl : ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) ;
+    // InternalTableDSL.g:13310:1: rule__XAssignment__Group_1_1__1__Impl : ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) ;
     public final void rule__XAssignment__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13935:1: ( ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) )
-            // InternalTableDSL.g:13936:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
+            // InternalTableDSL.g:13314:1: ( ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) )
+            // InternalTableDSL.g:13315:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
             {
-            // InternalTableDSL.g:13936:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
-            // InternalTableDSL.g:13937:2: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
+            // InternalTableDSL.g:13315:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
+            // InternalTableDSL.g:13316:2: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getRightOperandAssignment_1_1_1()); 
             }
-            // InternalTableDSL.g:13938:2: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
-            // InternalTableDSL.g:13938:3: rule__XAssignment__RightOperandAssignment_1_1_1
+            // InternalTableDSL.g:13317:2: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
+            // InternalTableDSL.g:13317:3: rule__XAssignment__RightOperandAssignment_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__RightOperandAssignment_1_1_1();
@@ -46735,14 +44777,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0__0"
-    // InternalTableDSL.g:13947:1: rule__XAssignment__Group_1_1_0__0 : rule__XAssignment__Group_1_1_0__0__Impl ;
+    // InternalTableDSL.g:13326:1: rule__XAssignment__Group_1_1_0__0 : rule__XAssignment__Group_1_1_0__0__Impl ;
     public final void rule__XAssignment__Group_1_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13951:1: ( rule__XAssignment__Group_1_1_0__0__Impl )
-            // InternalTableDSL.g:13952:2: rule__XAssignment__Group_1_1_0__0__Impl
+            // InternalTableDSL.g:13330:1: ( rule__XAssignment__Group_1_1_0__0__Impl )
+            // InternalTableDSL.g:13331:2: rule__XAssignment__Group_1_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0__0__Impl();
@@ -46768,23 +44810,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0__0__Impl"
-    // InternalTableDSL.g:13958:1: rule__XAssignment__Group_1_1_0__0__Impl : ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) ;
+    // InternalTableDSL.g:13337:1: rule__XAssignment__Group_1_1_0__0__Impl : ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) ;
     public final void rule__XAssignment__Group_1_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13962:1: ( ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) )
-            // InternalTableDSL.g:13963:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
+            // InternalTableDSL.g:13341:1: ( ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) )
+            // InternalTableDSL.g:13342:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
             {
-            // InternalTableDSL.g:13963:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
-            // InternalTableDSL.g:13964:2: ( rule__XAssignment__Group_1_1_0_0__0 )
+            // InternalTableDSL.g:13342:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
+            // InternalTableDSL.g:13343:2: ( rule__XAssignment__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1_0_0()); 
             }
-            // InternalTableDSL.g:13965:2: ( rule__XAssignment__Group_1_1_0_0__0 )
-            // InternalTableDSL.g:13965:3: rule__XAssignment__Group_1_1_0_0__0
+            // InternalTableDSL.g:13344:2: ( rule__XAssignment__Group_1_1_0_0__0 )
+            // InternalTableDSL.g:13344:3: rule__XAssignment__Group_1_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0_0__0();
@@ -46819,16 +44861,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__0"
-    // InternalTableDSL.g:13974:1: rule__XAssignment__Group_1_1_0_0__0 : rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 ;
+    // InternalTableDSL.g:13353:1: rule__XAssignment__Group_1_1_0_0__0 : rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 ;
     public final void rule__XAssignment__Group_1_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13978:1: ( rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 )
-            // InternalTableDSL.g:13979:2: rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1
+            // InternalTableDSL.g:13357:1: ( rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 )
+            // InternalTableDSL.g:13358:2: rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_106);
+            pushFollow(FOLLOW_105);
             rule__XAssignment__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
@@ -46857,23 +44899,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__0__Impl"
-    // InternalTableDSL.g:13986:1: rule__XAssignment__Group_1_1_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:13365:1: rule__XAssignment__Group_1_1_0_0__0__Impl : ( () ) ;
     public final void rule__XAssignment__Group_1_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:13990:1: ( ( () ) )
-            // InternalTableDSL.g:13991:1: ( () )
+            // InternalTableDSL.g:13369:1: ( ( () ) )
+            // InternalTableDSL.g:13370:1: ( () )
             {
-            // InternalTableDSL.g:13991:1: ( () )
-            // InternalTableDSL.g:13992:2: ()
+            // InternalTableDSL.g:13370:1: ( () )
+            // InternalTableDSL.g:13371:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()); 
             }
-            // InternalTableDSL.g:13993:2: ()
-            // InternalTableDSL.g:13993:3: 
+            // InternalTableDSL.g:13372:2: ()
+            // InternalTableDSL.g:13372:3: 
             {
             }
 
@@ -46898,14 +44940,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__1"
-    // InternalTableDSL.g:14001:1: rule__XAssignment__Group_1_1_0_0__1 : rule__XAssignment__Group_1_1_0_0__1__Impl ;
+    // InternalTableDSL.g:13380:1: rule__XAssignment__Group_1_1_0_0__1 : rule__XAssignment__Group_1_1_0_0__1__Impl ;
     public final void rule__XAssignment__Group_1_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14005:1: ( rule__XAssignment__Group_1_1_0_0__1__Impl )
-            // InternalTableDSL.g:14006:2: rule__XAssignment__Group_1_1_0_0__1__Impl
+            // InternalTableDSL.g:13384:1: ( rule__XAssignment__Group_1_1_0_0__1__Impl )
+            // InternalTableDSL.g:13385:2: rule__XAssignment__Group_1_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0_0__1__Impl();
@@ -46931,23 +44973,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__1__Impl"
-    // InternalTableDSL.g:14012:1: rule__XAssignment__Group_1_1_0_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) ;
+    // InternalTableDSL.g:13391:1: rule__XAssignment__Group_1_1_0_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) ;
     public final void rule__XAssignment__Group_1_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14016:1: ( ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) )
-            // InternalTableDSL.g:14017:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalTableDSL.g:13395:1: ( ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) )
+            // InternalTableDSL.g:13396:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
             {
-            // InternalTableDSL.g:14017:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
-            // InternalTableDSL.g:14018:2: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
+            // InternalTableDSL.g:13396:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalTableDSL.g:13397:2: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureAssignment_1_1_0_0_1()); 
             }
-            // InternalTableDSL.g:14019:2: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
-            // InternalTableDSL.g:14019:3: rule__XAssignment__FeatureAssignment_1_1_0_0_1
+            // InternalTableDSL.g:13398:2: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
+            // InternalTableDSL.g:13398:3: rule__XAssignment__FeatureAssignment_1_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__FeatureAssignment_1_1_0_0_1();
@@ -46982,16 +45024,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__0"
-    // InternalTableDSL.g:14028:1: rule__OpMultiAssign__Group_5__0 : rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 ;
+    // InternalTableDSL.g:13407:1: rule__OpMultiAssign__Group_5__0 : rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 ;
     public final void rule__OpMultiAssign__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14032:1: ( rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 )
-            // InternalTableDSL.g:14033:2: rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1
+            // InternalTableDSL.g:13411:1: ( rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 )
+            // InternalTableDSL.g:13412:2: rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1
             {
-            pushFollow(FOLLOW_107);
+            pushFollow(FOLLOW_106);
             rule__OpMultiAssign__Group_5__0__Impl();
 
             state._fsp--;
@@ -47020,17 +45062,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__0__Impl"
-    // InternalTableDSL.g:14040:1: rule__OpMultiAssign__Group_5__0__Impl : ( '<' ) ;
+    // InternalTableDSL.g:13419:1: rule__OpMultiAssign__Group_5__0__Impl : ( '<' ) ;
     public final void rule__OpMultiAssign__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14044:1: ( ( '<' ) )
-            // InternalTableDSL.g:14045:1: ( '<' )
+            // InternalTableDSL.g:13423:1: ( ( '<' ) )
+            // InternalTableDSL.g:13424:1: ( '<' )
             {
-            // InternalTableDSL.g:14045:1: ( '<' )
-            // InternalTableDSL.g:14046:2: '<'
+            // InternalTableDSL.g:13424:1: ( '<' )
+            // InternalTableDSL.g:13425:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0()); 
@@ -47061,16 +45103,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__1"
-    // InternalTableDSL.g:14055:1: rule__OpMultiAssign__Group_5__1 : rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 ;
+    // InternalTableDSL.g:13434:1: rule__OpMultiAssign__Group_5__1 : rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 ;
     public final void rule__OpMultiAssign__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14059:1: ( rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 )
-            // InternalTableDSL.g:14060:2: rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2
+            // InternalTableDSL.g:13438:1: ( rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 )
+            // InternalTableDSL.g:13439:2: rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2
             {
-            pushFollow(FOLLOW_101);
+            pushFollow(FOLLOW_100);
             rule__OpMultiAssign__Group_5__1__Impl();
 
             state._fsp--;
@@ -47099,17 +45141,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__1__Impl"
-    // InternalTableDSL.g:14067:1: rule__OpMultiAssign__Group_5__1__Impl : ( '<' ) ;
+    // InternalTableDSL.g:13446:1: rule__OpMultiAssign__Group_5__1__Impl : ( '<' ) ;
     public final void rule__OpMultiAssign__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14071:1: ( ( '<' ) )
-            // InternalTableDSL.g:14072:1: ( '<' )
+            // InternalTableDSL.g:13450:1: ( ( '<' ) )
+            // InternalTableDSL.g:13451:1: ( '<' )
             {
-            // InternalTableDSL.g:14072:1: ( '<' )
-            // InternalTableDSL.g:14073:2: '<'
+            // InternalTableDSL.g:13451:1: ( '<' )
+            // InternalTableDSL.g:13452:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1()); 
@@ -47140,14 +45182,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__2"
-    // InternalTableDSL.g:14082:1: rule__OpMultiAssign__Group_5__2 : rule__OpMultiAssign__Group_5__2__Impl ;
+    // InternalTableDSL.g:13461:1: rule__OpMultiAssign__Group_5__2 : rule__OpMultiAssign__Group_5__2__Impl ;
     public final void rule__OpMultiAssign__Group_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14086:1: ( rule__OpMultiAssign__Group_5__2__Impl )
-            // InternalTableDSL.g:14087:2: rule__OpMultiAssign__Group_5__2__Impl
+            // InternalTableDSL.g:13465:1: ( rule__OpMultiAssign__Group_5__2__Impl )
+            // InternalTableDSL.g:13466:2: rule__OpMultiAssign__Group_5__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_5__2__Impl();
@@ -47173,17 +45215,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__2__Impl"
-    // InternalTableDSL.g:14093:1: rule__OpMultiAssign__Group_5__2__Impl : ( '=' ) ;
+    // InternalTableDSL.g:13472:1: rule__OpMultiAssign__Group_5__2__Impl : ( '=' ) ;
     public final void rule__OpMultiAssign__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14097:1: ( ( '=' ) )
-            // InternalTableDSL.g:14098:1: ( '=' )
+            // InternalTableDSL.g:13476:1: ( ( '=' ) )
+            // InternalTableDSL.g:13477:1: ( '=' )
             {
-            // InternalTableDSL.g:14098:1: ( '=' )
-            // InternalTableDSL.g:14099:2: '='
+            // InternalTableDSL.g:13477:1: ( '=' )
+            // InternalTableDSL.g:13478:2: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getEqualsSignKeyword_5_2()); 
@@ -47214,16 +45256,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__0"
-    // InternalTableDSL.g:14109:1: rule__OpMultiAssign__Group_6__0 : rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 ;
+    // InternalTableDSL.g:13488:1: rule__OpMultiAssign__Group_6__0 : rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 ;
     public final void rule__OpMultiAssign__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14113:1: ( rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 )
-            // InternalTableDSL.g:14114:2: rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1
+            // InternalTableDSL.g:13492:1: ( rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 )
+            // InternalTableDSL.g:13493:2: rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1
             {
-            pushFollow(FOLLOW_108);
+            pushFollow(FOLLOW_107);
             rule__OpMultiAssign__Group_6__0__Impl();
 
             state._fsp--;
@@ -47252,17 +45294,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__0__Impl"
-    // InternalTableDSL.g:14121:1: rule__OpMultiAssign__Group_6__0__Impl : ( '>' ) ;
+    // InternalTableDSL.g:13500:1: rule__OpMultiAssign__Group_6__0__Impl : ( '>' ) ;
     public final void rule__OpMultiAssign__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14125:1: ( ( '>' ) )
-            // InternalTableDSL.g:14126:1: ( '>' )
+            // InternalTableDSL.g:13504:1: ( ( '>' ) )
+            // InternalTableDSL.g:13505:1: ( '>' )
             {
-            // InternalTableDSL.g:14126:1: ( '>' )
-            // InternalTableDSL.g:14127:2: '>'
+            // InternalTableDSL.g:13505:1: ( '>' )
+            // InternalTableDSL.g:13506:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0()); 
@@ -47293,16 +45335,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__1"
-    // InternalTableDSL.g:14136:1: rule__OpMultiAssign__Group_6__1 : rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 ;
+    // InternalTableDSL.g:13515:1: rule__OpMultiAssign__Group_6__1 : rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 ;
     public final void rule__OpMultiAssign__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14140:1: ( rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 )
-            // InternalTableDSL.g:14141:2: rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2
+            // InternalTableDSL.g:13519:1: ( rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 )
+            // InternalTableDSL.g:13520:2: rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2
             {
-            pushFollow(FOLLOW_108);
+            pushFollow(FOLLOW_107);
             rule__OpMultiAssign__Group_6__1__Impl();
 
             state._fsp--;
@@ -47331,31 +45373,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__1__Impl"
-    // InternalTableDSL.g:14148:1: rule__OpMultiAssign__Group_6__1__Impl : ( ( '>' )? ) ;
+    // InternalTableDSL.g:13527:1: rule__OpMultiAssign__Group_6__1__Impl : ( ( '>' )? ) ;
     public final void rule__OpMultiAssign__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14152:1: ( ( ( '>' )? ) )
-            // InternalTableDSL.g:14153:1: ( ( '>' )? )
+            // InternalTableDSL.g:13531:1: ( ( ( '>' )? ) )
+            // InternalTableDSL.g:13532:1: ( ( '>' )? )
             {
-            // InternalTableDSL.g:14153:1: ( ( '>' )? )
-            // InternalTableDSL.g:14154:2: ( '>' )?
+            // InternalTableDSL.g:13532:1: ( ( '>' )? )
+            // InternalTableDSL.g:13533:2: ( '>' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_1()); 
             }
-            // InternalTableDSL.g:14155:2: ( '>' )?
-            int alt102=2;
-            int LA102_0 = input.LA(1);
+            // InternalTableDSL.g:13534:2: ( '>' )?
+            int alt100=2;
+            int LA100_0 = input.LA(1);
 
-            if ( (LA102_0==31) ) {
-                alt102=1;
+            if ( (LA100_0==31) ) {
+                alt100=1;
             }
-            switch (alt102) {
+            switch (alt100) {
                 case 1 :
-                    // InternalTableDSL.g:14155:3: '>'
+                    // InternalTableDSL.g:13534:3: '>'
                     {
                     match(input,31,FOLLOW_2); if (state.failed) return ;
 
@@ -47389,14 +45431,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__2"
-    // InternalTableDSL.g:14163:1: rule__OpMultiAssign__Group_6__2 : rule__OpMultiAssign__Group_6__2__Impl ;
+    // InternalTableDSL.g:13542:1: rule__OpMultiAssign__Group_6__2 : rule__OpMultiAssign__Group_6__2__Impl ;
     public final void rule__OpMultiAssign__Group_6__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14167:1: ( rule__OpMultiAssign__Group_6__2__Impl )
-            // InternalTableDSL.g:14168:2: rule__OpMultiAssign__Group_6__2__Impl
+            // InternalTableDSL.g:13546:1: ( rule__OpMultiAssign__Group_6__2__Impl )
+            // InternalTableDSL.g:13547:2: rule__OpMultiAssign__Group_6__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_6__2__Impl();
@@ -47422,17 +45464,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__2__Impl"
-    // InternalTableDSL.g:14174:1: rule__OpMultiAssign__Group_6__2__Impl : ( '>=' ) ;
+    // InternalTableDSL.g:13553:1: rule__OpMultiAssign__Group_6__2__Impl : ( '>=' ) ;
     public final void rule__OpMultiAssign__Group_6__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14178:1: ( ( '>=' ) )
-            // InternalTableDSL.g:14179:1: ( '>=' )
+            // InternalTableDSL.g:13557:1: ( ( '>=' ) )
+            // InternalTableDSL.g:13558:1: ( '>=' )
             {
-            // InternalTableDSL.g:14179:1: ( '>=' )
-            // InternalTableDSL.g:14180:2: '>='
+            // InternalTableDSL.g:13558:1: ( '>=' )
+            // InternalTableDSL.g:13559:2: '>='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignEqualsSignKeyword_6_2()); 
@@ -47463,16 +45505,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__Group__0"
-    // InternalTableDSL.g:14190:1: rule__XOrExpression__Group__0 : rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 ;
+    // InternalTableDSL.g:13569:1: rule__XOrExpression__Group__0 : rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 ;
     public final void rule__XOrExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14194:1: ( rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 )
-            // InternalTableDSL.g:14195:2: rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1
+            // InternalTableDSL.g:13573:1: ( rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 )
+            // InternalTableDSL.g:13574:2: rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1
             {
-            pushFollow(FOLLOW_109);
+            pushFollow(FOLLOW_108);
             rule__XOrExpression__Group__0__Impl();
 
             state._fsp--;
@@ -47501,17 +45543,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__Group__0__Impl"
-    // InternalTableDSL.g:14202:1: rule__XOrExpression__Group__0__Impl : ( ruleXAndExpression ) ;
+    // InternalTableDSL.g:13581:1: rule__XOrExpression__Group__0__Impl : ( ruleXAndExpression ) ;
     public final void rule__XOrExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14206:1: ( ( ruleXAndExpression ) )
-            // InternalTableDSL.g:14207:1: ( ruleXAndExpression )
+            // InternalTableDSL.g:13585:1: ( ( ruleXAndExpression ) )
+            // InternalTableDSL.g:13586:1: ( ruleXAndExpression )
             {
-            // InternalTableDSL.g:14207:1: ( ruleXAndExpression )
-            // InternalTableDSL.g:14208:2: ruleXAndExpression
+            // InternalTableDSL.g:13586:1: ( ruleXAndExpression )
+            // InternalTableDSL.g:13587:2: ruleXAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getXAndExpressionParserRuleCall_0()); 
@@ -47546,14 +45588,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__Group__1"
-    // InternalTableDSL.g:14217:1: rule__XOrExpression__Group__1 : rule__XOrExpression__Group__1__Impl ;
+    // InternalTableDSL.g:13596:1: rule__XOrExpression__Group__1 : rule__XOrExpression__Group__1__Impl ;
     public final void rule__XOrExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14221:1: ( rule__XOrExpression__Group__1__Impl )
-            // InternalTableDSL.g:14222:2: rule__XOrExpression__Group__1__Impl
+            // InternalTableDSL.g:13600:1: ( rule__XOrExpression__Group__1__Impl )
+            // InternalTableDSL.g:13601:2: rule__XOrExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__Group__1__Impl();
@@ -47579,43 +45621,43 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__Group__1__Impl"
-    // InternalTableDSL.g:14228:1: rule__XOrExpression__Group__1__Impl : ( ( rule__XOrExpression__Group_1__0 )* ) ;
+    // InternalTableDSL.g:13607:1: rule__XOrExpression__Group__1__Impl : ( ( rule__XOrExpression__Group_1__0 )* ) ;
     public final void rule__XOrExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14232:1: ( ( ( rule__XOrExpression__Group_1__0 )* ) )
-            // InternalTableDSL.g:14233:1: ( ( rule__XOrExpression__Group_1__0 )* )
+            // InternalTableDSL.g:13611:1: ( ( ( rule__XOrExpression__Group_1__0 )* ) )
+            // InternalTableDSL.g:13612:1: ( ( rule__XOrExpression__Group_1__0 )* )
             {
-            // InternalTableDSL.g:14233:1: ( ( rule__XOrExpression__Group_1__0 )* )
-            // InternalTableDSL.g:14234:2: ( rule__XOrExpression__Group_1__0 )*
+            // InternalTableDSL.g:13612:1: ( ( rule__XOrExpression__Group_1__0 )* )
+            // InternalTableDSL.g:13613:2: ( rule__XOrExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1()); 
             }
-            // InternalTableDSL.g:14235:2: ( rule__XOrExpression__Group_1__0 )*
-            loop103:
+            // InternalTableDSL.g:13614:2: ( rule__XOrExpression__Group_1__0 )*
+            loop101:
             do {
-                int alt103=2;
-                int LA103_0 = input.LA(1);
+                int alt101=2;
+                int LA101_0 = input.LA(1);
 
-                if ( (LA103_0==16) ) {
-                    int LA103_2 = input.LA(2);
+                if ( (LA101_0==16) ) {
+                    int LA101_2 = input.LA(2);
 
-                    if ( (synpred181_InternalTableDSL()) ) {
-                        alt103=1;
+                    if ( (synpred179_InternalTableDSL()) ) {
+                        alt101=1;
                     }
 
 
                 }
 
 
-                switch (alt103) {
+                switch (alt101) {
             	case 1 :
-            	    // InternalTableDSL.g:14235:3: rule__XOrExpression__Group_1__0
+            	    // InternalTableDSL.g:13614:3: rule__XOrExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_110);
+            	    pushFollow(FOLLOW_109);
             	    rule__XOrExpression__Group_1__0();
 
             	    state._fsp--;
@@ -47625,7 +45667,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop103;
+            	    break loop101;
                 }
             } while (true);
 
@@ -47654,16 +45696,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__0"
-    // InternalTableDSL.g:14244:1: rule__XOrExpression__Group_1__0 : rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 ;
+    // InternalTableDSL.g:13623:1: rule__XOrExpression__Group_1__0 : rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 ;
     public final void rule__XOrExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14248:1: ( rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 )
-            // InternalTableDSL.g:14249:2: rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1
+            // InternalTableDSL.g:13627:1: ( rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 )
+            // InternalTableDSL.g:13628:2: rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XOrExpression__Group_1__0__Impl();
 
             state._fsp--;
@@ -47692,23 +45734,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__0__Impl"
-    // InternalTableDSL.g:14256:1: rule__XOrExpression__Group_1__0__Impl : ( ( rule__XOrExpression__Group_1_0__0 ) ) ;
+    // InternalTableDSL.g:13635:1: rule__XOrExpression__Group_1__0__Impl : ( ( rule__XOrExpression__Group_1_0__0 ) ) ;
     public final void rule__XOrExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14260:1: ( ( ( rule__XOrExpression__Group_1_0__0 ) ) )
-            // InternalTableDSL.g:14261:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
+            // InternalTableDSL.g:13639:1: ( ( ( rule__XOrExpression__Group_1_0__0 ) ) )
+            // InternalTableDSL.g:13640:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
             {
-            // InternalTableDSL.g:14261:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
-            // InternalTableDSL.g:14262:2: ( rule__XOrExpression__Group_1_0__0 )
+            // InternalTableDSL.g:13640:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
+            // InternalTableDSL.g:13641:2: ( rule__XOrExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1_0()); 
             }
-            // InternalTableDSL.g:14263:2: ( rule__XOrExpression__Group_1_0__0 )
-            // InternalTableDSL.g:14263:3: rule__XOrExpression__Group_1_0__0
+            // InternalTableDSL.g:13642:2: ( rule__XOrExpression__Group_1_0__0 )
+            // InternalTableDSL.g:13642:3: rule__XOrExpression__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0__0();
@@ -47743,14 +45785,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__1"
-    // InternalTableDSL.g:14271:1: rule__XOrExpression__Group_1__1 : rule__XOrExpression__Group_1__1__Impl ;
+    // InternalTableDSL.g:13650:1: rule__XOrExpression__Group_1__1 : rule__XOrExpression__Group_1__1__Impl ;
     public final void rule__XOrExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14275:1: ( rule__XOrExpression__Group_1__1__Impl )
-            // InternalTableDSL.g:14276:2: rule__XOrExpression__Group_1__1__Impl
+            // InternalTableDSL.g:13654:1: ( rule__XOrExpression__Group_1__1__Impl )
+            // InternalTableDSL.g:13655:2: rule__XOrExpression__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1__1__Impl();
@@ -47776,23 +45818,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__1__Impl"
-    // InternalTableDSL.g:14282:1: rule__XOrExpression__Group_1__1__Impl : ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalTableDSL.g:13661:1: rule__XOrExpression__Group_1__1__Impl : ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XOrExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14286:1: ( ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) )
-            // InternalTableDSL.g:14287:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
+            // InternalTableDSL.g:13665:1: ( ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalTableDSL.g:13666:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
             {
-            // InternalTableDSL.g:14287:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
-            // InternalTableDSL.g:14288:2: ( rule__XOrExpression__RightOperandAssignment_1_1 )
+            // InternalTableDSL.g:13666:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
+            // InternalTableDSL.g:13667:2: ( rule__XOrExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // InternalTableDSL.g:14289:2: ( rule__XOrExpression__RightOperandAssignment_1_1 )
-            // InternalTableDSL.g:14289:3: rule__XOrExpression__RightOperandAssignment_1_1
+            // InternalTableDSL.g:13668:2: ( rule__XOrExpression__RightOperandAssignment_1_1 )
+            // InternalTableDSL.g:13668:3: rule__XOrExpression__RightOperandAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__RightOperandAssignment_1_1();
@@ -47827,14 +45869,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0__0"
-    // InternalTableDSL.g:14298:1: rule__XOrExpression__Group_1_0__0 : rule__XOrExpression__Group_1_0__0__Impl ;
+    // InternalTableDSL.g:13677:1: rule__XOrExpression__Group_1_0__0 : rule__XOrExpression__Group_1_0__0__Impl ;
     public final void rule__XOrExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14302:1: ( rule__XOrExpression__Group_1_0__0__Impl )
-            // InternalTableDSL.g:14303:2: rule__XOrExpression__Group_1_0__0__Impl
+            // InternalTableDSL.g:13681:1: ( rule__XOrExpression__Group_1_0__0__Impl )
+            // InternalTableDSL.g:13682:2: rule__XOrExpression__Group_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0__0__Impl();
@@ -47860,23 +45902,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0__0__Impl"
-    // InternalTableDSL.g:14309:1: rule__XOrExpression__Group_1_0__0__Impl : ( ( rule__XOrExpression__Group_1_0_0__0 ) ) ;
+    // InternalTableDSL.g:13688:1: rule__XOrExpression__Group_1_0__0__Impl : ( ( rule__XOrExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XOrExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14313:1: ( ( ( rule__XOrExpression__Group_1_0_0__0 ) ) )
-            // InternalTableDSL.g:14314:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:13692:1: ( ( ( rule__XOrExpression__Group_1_0_0__0 ) ) )
+            // InternalTableDSL.g:13693:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
             {
-            // InternalTableDSL.g:14314:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
-            // InternalTableDSL.g:14315:2: ( rule__XOrExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:13693:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:13694:2: ( rule__XOrExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalTableDSL.g:14316:2: ( rule__XOrExpression__Group_1_0_0__0 )
-            // InternalTableDSL.g:14316:3: rule__XOrExpression__Group_1_0_0__0
+            // InternalTableDSL.g:13695:2: ( rule__XOrExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:13695:3: rule__XOrExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0_0__0();
@@ -47911,16 +45953,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__0"
-    // InternalTableDSL.g:14325:1: rule__XOrExpression__Group_1_0_0__0 : rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 ;
+    // InternalTableDSL.g:13704:1: rule__XOrExpression__Group_1_0_0__0 : rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 ;
     public final void rule__XOrExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14329:1: ( rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 )
-            // InternalTableDSL.g:14330:2: rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1
+            // InternalTableDSL.g:13708:1: ( rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 )
+            // InternalTableDSL.g:13709:2: rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_109);
+            pushFollow(FOLLOW_108);
             rule__XOrExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -47949,23 +45991,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__0__Impl"
-    // InternalTableDSL.g:14337:1: rule__XOrExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:13716:1: rule__XOrExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XOrExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14341:1: ( ( () ) )
-            // InternalTableDSL.g:14342:1: ( () )
+            // InternalTableDSL.g:13720:1: ( ( () ) )
+            // InternalTableDSL.g:13721:1: ( () )
             {
-            // InternalTableDSL.g:14342:1: ( () )
-            // InternalTableDSL.g:14343:2: ()
+            // InternalTableDSL.g:13721:1: ( () )
+            // InternalTableDSL.g:13722:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // InternalTableDSL.g:14344:2: ()
-            // InternalTableDSL.g:14344:3: 
+            // InternalTableDSL.g:13723:2: ()
+            // InternalTableDSL.g:13723:3: 
             {
             }
 
@@ -47990,14 +46032,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__1"
-    // InternalTableDSL.g:14352:1: rule__XOrExpression__Group_1_0_0__1 : rule__XOrExpression__Group_1_0_0__1__Impl ;
+    // InternalTableDSL.g:13731:1: rule__XOrExpression__Group_1_0_0__1 : rule__XOrExpression__Group_1_0_0__1__Impl ;
     public final void rule__XOrExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14356:1: ( rule__XOrExpression__Group_1_0_0__1__Impl )
-            // InternalTableDSL.g:14357:2: rule__XOrExpression__Group_1_0_0__1__Impl
+            // InternalTableDSL.g:13735:1: ( rule__XOrExpression__Group_1_0_0__1__Impl )
+            // InternalTableDSL.g:13736:2: rule__XOrExpression__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0_0__1__Impl();
@@ -48023,23 +46065,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__1__Impl"
-    // InternalTableDSL.g:14363:1: rule__XOrExpression__Group_1_0_0__1__Impl : ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalTableDSL.g:13742:1: rule__XOrExpression__Group_1_0_0__1__Impl : ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XOrExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14367:1: ( ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // InternalTableDSL.g:14368:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalTableDSL.g:13746:1: ( ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalTableDSL.g:13747:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // InternalTableDSL.g:14368:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
-            // InternalTableDSL.g:14369:2: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
+            // InternalTableDSL.g:13747:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalTableDSL.g:13748:2: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // InternalTableDSL.g:14370:2: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
-            // InternalTableDSL.g:14370:3: rule__XOrExpression__FeatureAssignment_1_0_0_1
+            // InternalTableDSL.g:13749:2: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
+            // InternalTableDSL.g:13749:3: rule__XOrExpression__FeatureAssignment_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__FeatureAssignment_1_0_0_1();
@@ -48074,16 +46116,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__Group__0"
-    // InternalTableDSL.g:14379:1: rule__XAndExpression__Group__0 : rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 ;
+    // InternalTableDSL.g:13758:1: rule__XAndExpression__Group__0 : rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 ;
     public final void rule__XAndExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14383:1: ( rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 )
-            // InternalTableDSL.g:14384:2: rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1
+            // InternalTableDSL.g:13762:1: ( rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 )
+            // InternalTableDSL.g:13763:2: rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1
             {
-            pushFollow(FOLLOW_111);
+            pushFollow(FOLLOW_110);
             rule__XAndExpression__Group__0__Impl();
 
             state._fsp--;
@@ -48112,17 +46154,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__Group__0__Impl"
-    // InternalTableDSL.g:14391:1: rule__XAndExpression__Group__0__Impl : ( ruleXEqualityExpression ) ;
+    // InternalTableDSL.g:13770:1: rule__XAndExpression__Group__0__Impl : ( ruleXEqualityExpression ) ;
     public final void rule__XAndExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14395:1: ( ( ruleXEqualityExpression ) )
-            // InternalTableDSL.g:14396:1: ( ruleXEqualityExpression )
+            // InternalTableDSL.g:13774:1: ( ( ruleXEqualityExpression ) )
+            // InternalTableDSL.g:13775:1: ( ruleXEqualityExpression )
             {
-            // InternalTableDSL.g:14396:1: ( ruleXEqualityExpression )
-            // InternalTableDSL.g:14397:2: ruleXEqualityExpression
+            // InternalTableDSL.g:13775:1: ( ruleXEqualityExpression )
+            // InternalTableDSL.g:13776:2: ruleXEqualityExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getXEqualityExpressionParserRuleCall_0()); 
@@ -48157,14 +46199,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__Group__1"
-    // InternalTableDSL.g:14406:1: rule__XAndExpression__Group__1 : rule__XAndExpression__Group__1__Impl ;
+    // InternalTableDSL.g:13785:1: rule__XAndExpression__Group__1 : rule__XAndExpression__Group__1__Impl ;
     public final void rule__XAndExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14410:1: ( rule__XAndExpression__Group__1__Impl )
-            // InternalTableDSL.g:14411:2: rule__XAndExpression__Group__1__Impl
+            // InternalTableDSL.g:13789:1: ( rule__XAndExpression__Group__1__Impl )
+            // InternalTableDSL.g:13790:2: rule__XAndExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__Group__1__Impl();
@@ -48190,43 +46232,43 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__Group__1__Impl"
-    // InternalTableDSL.g:14417:1: rule__XAndExpression__Group__1__Impl : ( ( rule__XAndExpression__Group_1__0 )* ) ;
+    // InternalTableDSL.g:13796:1: rule__XAndExpression__Group__1__Impl : ( ( rule__XAndExpression__Group_1__0 )* ) ;
     public final void rule__XAndExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14421:1: ( ( ( rule__XAndExpression__Group_1__0 )* ) )
-            // InternalTableDSL.g:14422:1: ( ( rule__XAndExpression__Group_1__0 )* )
+            // InternalTableDSL.g:13800:1: ( ( ( rule__XAndExpression__Group_1__0 )* ) )
+            // InternalTableDSL.g:13801:1: ( ( rule__XAndExpression__Group_1__0 )* )
             {
-            // InternalTableDSL.g:14422:1: ( ( rule__XAndExpression__Group_1__0 )* )
-            // InternalTableDSL.g:14423:2: ( rule__XAndExpression__Group_1__0 )*
+            // InternalTableDSL.g:13801:1: ( ( rule__XAndExpression__Group_1__0 )* )
+            // InternalTableDSL.g:13802:2: ( rule__XAndExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1()); 
             }
-            // InternalTableDSL.g:14424:2: ( rule__XAndExpression__Group_1__0 )*
-            loop104:
+            // InternalTableDSL.g:13803:2: ( rule__XAndExpression__Group_1__0 )*
+            loop102:
             do {
-                int alt104=2;
-                int LA104_0 = input.LA(1);
+                int alt102=2;
+                int LA102_0 = input.LA(1);
 
-                if ( (LA104_0==17) ) {
-                    int LA104_2 = input.LA(2);
+                if ( (LA102_0==17) ) {
+                    int LA102_2 = input.LA(2);
 
-                    if ( (synpred182_InternalTableDSL()) ) {
-                        alt104=1;
+                    if ( (synpred180_InternalTableDSL()) ) {
+                        alt102=1;
                     }
 
 
                 }
 
 
-                switch (alt104) {
+                switch (alt102) {
             	case 1 :
-            	    // InternalTableDSL.g:14424:3: rule__XAndExpression__Group_1__0
+            	    // InternalTableDSL.g:13803:3: rule__XAndExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_112);
+            	    pushFollow(FOLLOW_111);
             	    rule__XAndExpression__Group_1__0();
 
             	    state._fsp--;
@@ -48236,7 +46278,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop104;
+            	    break loop102;
                 }
             } while (true);
 
@@ -48265,16 +46307,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__0"
-    // InternalTableDSL.g:14433:1: rule__XAndExpression__Group_1__0 : rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 ;
+    // InternalTableDSL.g:13812:1: rule__XAndExpression__Group_1__0 : rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 ;
     public final void rule__XAndExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14437:1: ( rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 )
-            // InternalTableDSL.g:14438:2: rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1
+            // InternalTableDSL.g:13816:1: ( rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 )
+            // InternalTableDSL.g:13817:2: rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XAndExpression__Group_1__0__Impl();
 
             state._fsp--;
@@ -48303,23 +46345,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__0__Impl"
-    // InternalTableDSL.g:14445:1: rule__XAndExpression__Group_1__0__Impl : ( ( rule__XAndExpression__Group_1_0__0 ) ) ;
+    // InternalTableDSL.g:13824:1: rule__XAndExpression__Group_1__0__Impl : ( ( rule__XAndExpression__Group_1_0__0 ) ) ;
     public final void rule__XAndExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14449:1: ( ( ( rule__XAndExpression__Group_1_0__0 ) ) )
-            // InternalTableDSL.g:14450:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
+            // InternalTableDSL.g:13828:1: ( ( ( rule__XAndExpression__Group_1_0__0 ) ) )
+            // InternalTableDSL.g:13829:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
             {
-            // InternalTableDSL.g:14450:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
-            // InternalTableDSL.g:14451:2: ( rule__XAndExpression__Group_1_0__0 )
+            // InternalTableDSL.g:13829:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
+            // InternalTableDSL.g:13830:2: ( rule__XAndExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1_0()); 
             }
-            // InternalTableDSL.g:14452:2: ( rule__XAndExpression__Group_1_0__0 )
-            // InternalTableDSL.g:14452:3: rule__XAndExpression__Group_1_0__0
+            // InternalTableDSL.g:13831:2: ( rule__XAndExpression__Group_1_0__0 )
+            // InternalTableDSL.g:13831:3: rule__XAndExpression__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0__0();
@@ -48354,14 +46396,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__1"
-    // InternalTableDSL.g:14460:1: rule__XAndExpression__Group_1__1 : rule__XAndExpression__Group_1__1__Impl ;
+    // InternalTableDSL.g:13839:1: rule__XAndExpression__Group_1__1 : rule__XAndExpression__Group_1__1__Impl ;
     public final void rule__XAndExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14464:1: ( rule__XAndExpression__Group_1__1__Impl )
-            // InternalTableDSL.g:14465:2: rule__XAndExpression__Group_1__1__Impl
+            // InternalTableDSL.g:13843:1: ( rule__XAndExpression__Group_1__1__Impl )
+            // InternalTableDSL.g:13844:2: rule__XAndExpression__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1__1__Impl();
@@ -48387,23 +46429,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__1__Impl"
-    // InternalTableDSL.g:14471:1: rule__XAndExpression__Group_1__1__Impl : ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalTableDSL.g:13850:1: rule__XAndExpression__Group_1__1__Impl : ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XAndExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14475:1: ( ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) )
-            // InternalTableDSL.g:14476:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
+            // InternalTableDSL.g:13854:1: ( ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalTableDSL.g:13855:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
             {
-            // InternalTableDSL.g:14476:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
-            // InternalTableDSL.g:14477:2: ( rule__XAndExpression__RightOperandAssignment_1_1 )
+            // InternalTableDSL.g:13855:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
+            // InternalTableDSL.g:13856:2: ( rule__XAndExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // InternalTableDSL.g:14478:2: ( rule__XAndExpression__RightOperandAssignment_1_1 )
-            // InternalTableDSL.g:14478:3: rule__XAndExpression__RightOperandAssignment_1_1
+            // InternalTableDSL.g:13857:2: ( rule__XAndExpression__RightOperandAssignment_1_1 )
+            // InternalTableDSL.g:13857:3: rule__XAndExpression__RightOperandAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__RightOperandAssignment_1_1();
@@ -48438,14 +46480,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0__0"
-    // InternalTableDSL.g:14487:1: rule__XAndExpression__Group_1_0__0 : rule__XAndExpression__Group_1_0__0__Impl ;
+    // InternalTableDSL.g:13866:1: rule__XAndExpression__Group_1_0__0 : rule__XAndExpression__Group_1_0__0__Impl ;
     public final void rule__XAndExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14491:1: ( rule__XAndExpression__Group_1_0__0__Impl )
-            // InternalTableDSL.g:14492:2: rule__XAndExpression__Group_1_0__0__Impl
+            // InternalTableDSL.g:13870:1: ( rule__XAndExpression__Group_1_0__0__Impl )
+            // InternalTableDSL.g:13871:2: rule__XAndExpression__Group_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0__0__Impl();
@@ -48471,23 +46513,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0__0__Impl"
-    // InternalTableDSL.g:14498:1: rule__XAndExpression__Group_1_0__0__Impl : ( ( rule__XAndExpression__Group_1_0_0__0 ) ) ;
+    // InternalTableDSL.g:13877:1: rule__XAndExpression__Group_1_0__0__Impl : ( ( rule__XAndExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XAndExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14502:1: ( ( ( rule__XAndExpression__Group_1_0_0__0 ) ) )
-            // InternalTableDSL.g:14503:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:13881:1: ( ( ( rule__XAndExpression__Group_1_0_0__0 ) ) )
+            // InternalTableDSL.g:13882:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
             {
-            // InternalTableDSL.g:14503:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
-            // InternalTableDSL.g:14504:2: ( rule__XAndExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:13882:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:13883:2: ( rule__XAndExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalTableDSL.g:14505:2: ( rule__XAndExpression__Group_1_0_0__0 )
-            // InternalTableDSL.g:14505:3: rule__XAndExpression__Group_1_0_0__0
+            // InternalTableDSL.g:13884:2: ( rule__XAndExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:13884:3: rule__XAndExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0_0__0();
@@ -48522,16 +46564,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__0"
-    // InternalTableDSL.g:14514:1: rule__XAndExpression__Group_1_0_0__0 : rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 ;
+    // InternalTableDSL.g:13893:1: rule__XAndExpression__Group_1_0_0__0 : rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 ;
     public final void rule__XAndExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14518:1: ( rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 )
-            // InternalTableDSL.g:14519:2: rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1
+            // InternalTableDSL.g:13897:1: ( rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 )
+            // InternalTableDSL.g:13898:2: rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_111);
+            pushFollow(FOLLOW_110);
             rule__XAndExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -48560,23 +46602,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__0__Impl"
-    // InternalTableDSL.g:14526:1: rule__XAndExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:13905:1: rule__XAndExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XAndExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14530:1: ( ( () ) )
-            // InternalTableDSL.g:14531:1: ( () )
+            // InternalTableDSL.g:13909:1: ( ( () ) )
+            // InternalTableDSL.g:13910:1: ( () )
             {
-            // InternalTableDSL.g:14531:1: ( () )
-            // InternalTableDSL.g:14532:2: ()
+            // InternalTableDSL.g:13910:1: ( () )
+            // InternalTableDSL.g:13911:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // InternalTableDSL.g:14533:2: ()
-            // InternalTableDSL.g:14533:3: 
+            // InternalTableDSL.g:13912:2: ()
+            // InternalTableDSL.g:13912:3: 
             {
             }
 
@@ -48601,14 +46643,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__1"
-    // InternalTableDSL.g:14541:1: rule__XAndExpression__Group_1_0_0__1 : rule__XAndExpression__Group_1_0_0__1__Impl ;
+    // InternalTableDSL.g:13920:1: rule__XAndExpression__Group_1_0_0__1 : rule__XAndExpression__Group_1_0_0__1__Impl ;
     public final void rule__XAndExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14545:1: ( rule__XAndExpression__Group_1_0_0__1__Impl )
-            // InternalTableDSL.g:14546:2: rule__XAndExpression__Group_1_0_0__1__Impl
+            // InternalTableDSL.g:13924:1: ( rule__XAndExpression__Group_1_0_0__1__Impl )
+            // InternalTableDSL.g:13925:2: rule__XAndExpression__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0_0__1__Impl();
@@ -48634,23 +46676,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__1__Impl"
-    // InternalTableDSL.g:14552:1: rule__XAndExpression__Group_1_0_0__1__Impl : ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalTableDSL.g:13931:1: rule__XAndExpression__Group_1_0_0__1__Impl : ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XAndExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14556:1: ( ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // InternalTableDSL.g:14557:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalTableDSL.g:13935:1: ( ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalTableDSL.g:13936:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // InternalTableDSL.g:14557:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
-            // InternalTableDSL.g:14558:2: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
+            // InternalTableDSL.g:13936:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalTableDSL.g:13937:2: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // InternalTableDSL.g:14559:2: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
-            // InternalTableDSL.g:14559:3: rule__XAndExpression__FeatureAssignment_1_0_0_1
+            // InternalTableDSL.g:13938:2: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
+            // InternalTableDSL.g:13938:3: rule__XAndExpression__FeatureAssignment_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__FeatureAssignment_1_0_0_1();
@@ -48685,16 +46727,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__0"
-    // InternalTableDSL.g:14568:1: rule__XEqualityExpression__Group__0 : rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 ;
+    // InternalTableDSL.g:13947:1: rule__XEqualityExpression__Group__0 : rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 ;
     public final void rule__XEqualityExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14572:1: ( rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 )
-            // InternalTableDSL.g:14573:2: rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1
+            // InternalTableDSL.g:13951:1: ( rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 )
+            // InternalTableDSL.g:13952:2: rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1
             {
-            pushFollow(FOLLOW_113);
+            pushFollow(FOLLOW_112);
             rule__XEqualityExpression__Group__0__Impl();
 
             state._fsp--;
@@ -48723,17 +46765,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__0__Impl"
-    // InternalTableDSL.g:14580:1: rule__XEqualityExpression__Group__0__Impl : ( ruleXRelationalExpression ) ;
+    // InternalTableDSL.g:13959:1: rule__XEqualityExpression__Group__0__Impl : ( ruleXRelationalExpression ) ;
     public final void rule__XEqualityExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14584:1: ( ( ruleXRelationalExpression ) )
-            // InternalTableDSL.g:14585:1: ( ruleXRelationalExpression )
+            // InternalTableDSL.g:13963:1: ( ( ruleXRelationalExpression ) )
+            // InternalTableDSL.g:13964:1: ( ruleXRelationalExpression )
             {
-            // InternalTableDSL.g:14585:1: ( ruleXRelationalExpression )
-            // InternalTableDSL.g:14586:2: ruleXRelationalExpression
+            // InternalTableDSL.g:13964:1: ( ruleXRelationalExpression )
+            // InternalTableDSL.g:13965:2: ruleXRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getXRelationalExpressionParserRuleCall_0()); 
@@ -48768,14 +46810,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__1"
-    // InternalTableDSL.g:14595:1: rule__XEqualityExpression__Group__1 : rule__XEqualityExpression__Group__1__Impl ;
+    // InternalTableDSL.g:13974:1: rule__XEqualityExpression__Group__1 : rule__XEqualityExpression__Group__1__Impl ;
     public final void rule__XEqualityExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14599:1: ( rule__XEqualityExpression__Group__1__Impl )
-            // InternalTableDSL.g:14600:2: rule__XEqualityExpression__Group__1__Impl
+            // InternalTableDSL.g:13978:1: ( rule__XEqualityExpression__Group__1__Impl )
+            // InternalTableDSL.g:13979:2: rule__XEqualityExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group__1__Impl();
@@ -48801,32 +46843,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__1__Impl"
-    // InternalTableDSL.g:14606:1: rule__XEqualityExpression__Group__1__Impl : ( ( rule__XEqualityExpression__Group_1__0 )* ) ;
+    // InternalTableDSL.g:13985:1: rule__XEqualityExpression__Group__1__Impl : ( ( rule__XEqualityExpression__Group_1__0 )* ) ;
     public final void rule__XEqualityExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14610:1: ( ( ( rule__XEqualityExpression__Group_1__0 )* ) )
-            // InternalTableDSL.g:14611:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
+            // InternalTableDSL.g:13989:1: ( ( ( rule__XEqualityExpression__Group_1__0 )* ) )
+            // InternalTableDSL.g:13990:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
             {
-            // InternalTableDSL.g:14611:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
-            // InternalTableDSL.g:14612:2: ( rule__XEqualityExpression__Group_1__0 )*
+            // InternalTableDSL.g:13990:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
+            // InternalTableDSL.g:13991:2: ( rule__XEqualityExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1()); 
             }
-            // InternalTableDSL.g:14613:2: ( rule__XEqualityExpression__Group_1__0 )*
-            loop105:
+            // InternalTableDSL.g:13992:2: ( rule__XEqualityExpression__Group_1__0 )*
+            loop103:
             do {
-                int alt105=2;
+                int alt103=2;
                 switch ( input.LA(1) ) {
                 case 26:
                     {
-                    int LA105_2 = input.LA(2);
+                    int LA103_2 = input.LA(2);
 
-                    if ( (synpred183_InternalTableDSL()) ) {
-                        alt105=1;
+                    if ( (synpred181_InternalTableDSL()) ) {
+                        alt103=1;
                     }
 
 
@@ -48834,10 +46876,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     break;
                 case 27:
                     {
-                    int LA105_3 = input.LA(2);
+                    int LA103_3 = input.LA(2);
 
-                    if ( (synpred183_InternalTableDSL()) ) {
-                        alt105=1;
+                    if ( (synpred181_InternalTableDSL()) ) {
+                        alt103=1;
                     }
 
 
@@ -48845,10 +46887,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     break;
                 case 28:
                     {
-                    int LA105_4 = input.LA(2);
+                    int LA103_4 = input.LA(2);
 
-                    if ( (synpred183_InternalTableDSL()) ) {
-                        alt105=1;
+                    if ( (synpred181_InternalTableDSL()) ) {
+                        alt103=1;
                     }
 
 
@@ -48856,10 +46898,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     break;
                 case 29:
                     {
-                    int LA105_5 = input.LA(2);
+                    int LA103_5 = input.LA(2);
 
-                    if ( (synpred183_InternalTableDSL()) ) {
-                        alt105=1;
+                    if ( (synpred181_InternalTableDSL()) ) {
+                        alt103=1;
                     }
 
 
@@ -48868,11 +46910,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
                 }
 
-                switch (alt105) {
+                switch (alt103) {
             	case 1 :
-            	    // InternalTableDSL.g:14613:3: rule__XEqualityExpression__Group_1__0
+            	    // InternalTableDSL.g:13992:3: rule__XEqualityExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_114);
+            	    pushFollow(FOLLOW_113);
             	    rule__XEqualityExpression__Group_1__0();
 
             	    state._fsp--;
@@ -48882,7 +46924,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop105;
+            	    break loop103;
                 }
             } while (true);
 
@@ -48911,16 +46953,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__0"
-    // InternalTableDSL.g:14622:1: rule__XEqualityExpression__Group_1__0 : rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 ;
+    // InternalTableDSL.g:14001:1: rule__XEqualityExpression__Group_1__0 : rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 ;
     public final void rule__XEqualityExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14626:1: ( rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 )
-            // InternalTableDSL.g:14627:2: rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1
+            // InternalTableDSL.g:14005:1: ( rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 )
+            // InternalTableDSL.g:14006:2: rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XEqualityExpression__Group_1__0__Impl();
 
             state._fsp--;
@@ -48949,23 +46991,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__0__Impl"
-    // InternalTableDSL.g:14634:1: rule__XEqualityExpression__Group_1__0__Impl : ( ( rule__XEqualityExpression__Group_1_0__0 ) ) ;
+    // InternalTableDSL.g:14013:1: rule__XEqualityExpression__Group_1__0__Impl : ( ( rule__XEqualityExpression__Group_1_0__0 ) ) ;
     public final void rule__XEqualityExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14638:1: ( ( ( rule__XEqualityExpression__Group_1_0__0 ) ) )
-            // InternalTableDSL.g:14639:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
+            // InternalTableDSL.g:14017:1: ( ( ( rule__XEqualityExpression__Group_1_0__0 ) ) )
+            // InternalTableDSL.g:14018:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
             {
-            // InternalTableDSL.g:14639:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
-            // InternalTableDSL.g:14640:2: ( rule__XEqualityExpression__Group_1_0__0 )
+            // InternalTableDSL.g:14018:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
+            // InternalTableDSL.g:14019:2: ( rule__XEqualityExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1_0()); 
             }
-            // InternalTableDSL.g:14641:2: ( rule__XEqualityExpression__Group_1_0__0 )
-            // InternalTableDSL.g:14641:3: rule__XEqualityExpression__Group_1_0__0
+            // InternalTableDSL.g:14020:2: ( rule__XEqualityExpression__Group_1_0__0 )
+            // InternalTableDSL.g:14020:3: rule__XEqualityExpression__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0__0();
@@ -49000,14 +47042,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__1"
-    // InternalTableDSL.g:14649:1: rule__XEqualityExpression__Group_1__1 : rule__XEqualityExpression__Group_1__1__Impl ;
+    // InternalTableDSL.g:14028:1: rule__XEqualityExpression__Group_1__1 : rule__XEqualityExpression__Group_1__1__Impl ;
     public final void rule__XEqualityExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14653:1: ( rule__XEqualityExpression__Group_1__1__Impl )
-            // InternalTableDSL.g:14654:2: rule__XEqualityExpression__Group_1__1__Impl
+            // InternalTableDSL.g:14032:1: ( rule__XEqualityExpression__Group_1__1__Impl )
+            // InternalTableDSL.g:14033:2: rule__XEqualityExpression__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1__1__Impl();
@@ -49033,23 +47075,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__1__Impl"
-    // InternalTableDSL.g:14660:1: rule__XEqualityExpression__Group_1__1__Impl : ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalTableDSL.g:14039:1: rule__XEqualityExpression__Group_1__1__Impl : ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XEqualityExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14664:1: ( ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) )
-            // InternalTableDSL.g:14665:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
+            // InternalTableDSL.g:14043:1: ( ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalTableDSL.g:14044:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
             {
-            // InternalTableDSL.g:14665:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
-            // InternalTableDSL.g:14666:2: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
+            // InternalTableDSL.g:14044:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
+            // InternalTableDSL.g:14045:2: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // InternalTableDSL.g:14667:2: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
-            // InternalTableDSL.g:14667:3: rule__XEqualityExpression__RightOperandAssignment_1_1
+            // InternalTableDSL.g:14046:2: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
+            // InternalTableDSL.g:14046:3: rule__XEqualityExpression__RightOperandAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__RightOperandAssignment_1_1();
@@ -49084,14 +47126,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0__0"
-    // InternalTableDSL.g:14676:1: rule__XEqualityExpression__Group_1_0__0 : rule__XEqualityExpression__Group_1_0__0__Impl ;
+    // InternalTableDSL.g:14055:1: rule__XEqualityExpression__Group_1_0__0 : rule__XEqualityExpression__Group_1_0__0__Impl ;
     public final void rule__XEqualityExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14680:1: ( rule__XEqualityExpression__Group_1_0__0__Impl )
-            // InternalTableDSL.g:14681:2: rule__XEqualityExpression__Group_1_0__0__Impl
+            // InternalTableDSL.g:14059:1: ( rule__XEqualityExpression__Group_1_0__0__Impl )
+            // InternalTableDSL.g:14060:2: rule__XEqualityExpression__Group_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0__0__Impl();
@@ -49117,23 +47159,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0__0__Impl"
-    // InternalTableDSL.g:14687:1: rule__XEqualityExpression__Group_1_0__0__Impl : ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) ;
+    // InternalTableDSL.g:14066:1: rule__XEqualityExpression__Group_1_0__0__Impl : ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XEqualityExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14691:1: ( ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) )
-            // InternalTableDSL.g:14692:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:14070:1: ( ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) )
+            // InternalTableDSL.g:14071:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
             {
-            // InternalTableDSL.g:14692:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
-            // InternalTableDSL.g:14693:2: ( rule__XEqualityExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:14071:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:14072:2: ( rule__XEqualityExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalTableDSL.g:14694:2: ( rule__XEqualityExpression__Group_1_0_0__0 )
-            // InternalTableDSL.g:14694:3: rule__XEqualityExpression__Group_1_0_0__0
+            // InternalTableDSL.g:14073:2: ( rule__XEqualityExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:14073:3: rule__XEqualityExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0_0__0();
@@ -49168,16 +47210,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__0"
-    // InternalTableDSL.g:14703:1: rule__XEqualityExpression__Group_1_0_0__0 : rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 ;
+    // InternalTableDSL.g:14082:1: rule__XEqualityExpression__Group_1_0_0__0 : rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 ;
     public final void rule__XEqualityExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14707:1: ( rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 )
-            // InternalTableDSL.g:14708:2: rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1
+            // InternalTableDSL.g:14086:1: ( rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 )
+            // InternalTableDSL.g:14087:2: rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_113);
+            pushFollow(FOLLOW_112);
             rule__XEqualityExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -49206,23 +47248,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__0__Impl"
-    // InternalTableDSL.g:14715:1: rule__XEqualityExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:14094:1: rule__XEqualityExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XEqualityExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14719:1: ( ( () ) )
-            // InternalTableDSL.g:14720:1: ( () )
+            // InternalTableDSL.g:14098:1: ( ( () ) )
+            // InternalTableDSL.g:14099:1: ( () )
             {
-            // InternalTableDSL.g:14720:1: ( () )
-            // InternalTableDSL.g:14721:2: ()
+            // InternalTableDSL.g:14099:1: ( () )
+            // InternalTableDSL.g:14100:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // InternalTableDSL.g:14722:2: ()
-            // InternalTableDSL.g:14722:3: 
+            // InternalTableDSL.g:14101:2: ()
+            // InternalTableDSL.g:14101:3: 
             {
             }
 
@@ -49247,14 +47289,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__1"
-    // InternalTableDSL.g:14730:1: rule__XEqualityExpression__Group_1_0_0__1 : rule__XEqualityExpression__Group_1_0_0__1__Impl ;
+    // InternalTableDSL.g:14109:1: rule__XEqualityExpression__Group_1_0_0__1 : rule__XEqualityExpression__Group_1_0_0__1__Impl ;
     public final void rule__XEqualityExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14734:1: ( rule__XEqualityExpression__Group_1_0_0__1__Impl )
-            // InternalTableDSL.g:14735:2: rule__XEqualityExpression__Group_1_0_0__1__Impl
+            // InternalTableDSL.g:14113:1: ( rule__XEqualityExpression__Group_1_0_0__1__Impl )
+            // InternalTableDSL.g:14114:2: rule__XEqualityExpression__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0_0__1__Impl();
@@ -49280,23 +47322,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__1__Impl"
-    // InternalTableDSL.g:14741:1: rule__XEqualityExpression__Group_1_0_0__1__Impl : ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalTableDSL.g:14120:1: rule__XEqualityExpression__Group_1_0_0__1__Impl : ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XEqualityExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14745:1: ( ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // InternalTableDSL.g:14746:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalTableDSL.g:14124:1: ( ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalTableDSL.g:14125:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // InternalTableDSL.g:14746:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
-            // InternalTableDSL.g:14747:2: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
+            // InternalTableDSL.g:14125:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalTableDSL.g:14126:2: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // InternalTableDSL.g:14748:2: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
-            // InternalTableDSL.g:14748:3: rule__XEqualityExpression__FeatureAssignment_1_0_0_1
+            // InternalTableDSL.g:14127:2: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
+            // InternalTableDSL.g:14127:3: rule__XEqualityExpression__FeatureAssignment_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__FeatureAssignment_1_0_0_1();
@@ -49331,16 +47373,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__0"
-    // InternalTableDSL.g:14757:1: rule__XRelationalExpression__Group__0 : rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 ;
+    // InternalTableDSL.g:14136:1: rule__XRelationalExpression__Group__0 : rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 ;
     public final void rule__XRelationalExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14761:1: ( rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 )
-            // InternalTableDSL.g:14762:2: rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1
+            // InternalTableDSL.g:14140:1: ( rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 )
+            // InternalTableDSL.g:14141:2: rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1
             {
-            pushFollow(FOLLOW_115);
+            pushFollow(FOLLOW_114);
             rule__XRelationalExpression__Group__0__Impl();
 
             state._fsp--;
@@ -49369,17 +47411,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__0__Impl"
-    // InternalTableDSL.g:14769:1: rule__XRelationalExpression__Group__0__Impl : ( ruleXOtherOperatorExpression ) ;
+    // InternalTableDSL.g:14148:1: rule__XRelationalExpression__Group__0__Impl : ( ruleXOtherOperatorExpression ) ;
     public final void rule__XRelationalExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14773:1: ( ( ruleXOtherOperatorExpression ) )
-            // InternalTableDSL.g:14774:1: ( ruleXOtherOperatorExpression )
+            // InternalTableDSL.g:14152:1: ( ( ruleXOtherOperatorExpression ) )
+            // InternalTableDSL.g:14153:1: ( ruleXOtherOperatorExpression )
             {
-            // InternalTableDSL.g:14774:1: ( ruleXOtherOperatorExpression )
-            // InternalTableDSL.g:14775:2: ruleXOtherOperatorExpression
+            // InternalTableDSL.g:14153:1: ( ruleXOtherOperatorExpression )
+            // InternalTableDSL.g:14154:2: ruleXOtherOperatorExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXOtherOperatorExpressionParserRuleCall_0()); 
@@ -49414,14 +47456,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__1"
-    // InternalTableDSL.g:14784:1: rule__XRelationalExpression__Group__1 : rule__XRelationalExpression__Group__1__Impl ;
+    // InternalTableDSL.g:14163:1: rule__XRelationalExpression__Group__1 : rule__XRelationalExpression__Group__1__Impl ;
     public final void rule__XRelationalExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14788:1: ( rule__XRelationalExpression__Group__1__Impl )
-            // InternalTableDSL.g:14789:2: rule__XRelationalExpression__Group__1__Impl
+            // InternalTableDSL.g:14167:1: ( rule__XRelationalExpression__Group__1__Impl )
+            // InternalTableDSL.g:14168:2: rule__XRelationalExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group__1__Impl();
@@ -49447,32 +47489,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__1__Impl"
-    // InternalTableDSL.g:14795:1: rule__XRelationalExpression__Group__1__Impl : ( ( rule__XRelationalExpression__Alternatives_1 )* ) ;
+    // InternalTableDSL.g:14174:1: rule__XRelationalExpression__Group__1__Impl : ( ( rule__XRelationalExpression__Alternatives_1 )* ) ;
     public final void rule__XRelationalExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14799:1: ( ( ( rule__XRelationalExpression__Alternatives_1 )* ) )
-            // InternalTableDSL.g:14800:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
+            // InternalTableDSL.g:14178:1: ( ( ( rule__XRelationalExpression__Alternatives_1 )* ) )
+            // InternalTableDSL.g:14179:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
             {
-            // InternalTableDSL.g:14800:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
-            // InternalTableDSL.g:14801:2: ( rule__XRelationalExpression__Alternatives_1 )*
+            // InternalTableDSL.g:14179:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
+            // InternalTableDSL.g:14180:2: ( rule__XRelationalExpression__Alternatives_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getAlternatives_1()); 
             }
-            // InternalTableDSL.g:14802:2: ( rule__XRelationalExpression__Alternatives_1 )*
-            loop106:
+            // InternalTableDSL.g:14181:2: ( rule__XRelationalExpression__Alternatives_1 )*
+            loop104:
             do {
-                int alt106=2;
+                int alt104=2;
                 switch ( input.LA(1) ) {
                 case 32:
                     {
-                    int LA106_2 = input.LA(2);
+                    int LA104_2 = input.LA(2);
 
-                    if ( (synpred184_InternalTableDSL()) ) {
-                        alt106=1;
+                    if ( (synpred182_InternalTableDSL()) ) {
+                        alt104=1;
                     }
 
 
@@ -49480,10 +47522,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     break;
                 case 31:
                     {
-                    int LA106_3 = input.LA(2);
+                    int LA104_3 = input.LA(2);
 
-                    if ( (synpred184_InternalTableDSL()) ) {
-                        alt106=1;
+                    if ( (synpred182_InternalTableDSL()) ) {
+                        alt104=1;
                     }
 
 
@@ -49491,10 +47533,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     break;
                 case 141:
                     {
-                    int LA106_4 = input.LA(2);
+                    int LA104_4 = input.LA(2);
 
-                    if ( (synpred184_InternalTableDSL()) ) {
-                        alt106=1;
+                    if ( (synpred182_InternalTableDSL()) ) {
+                        alt104=1;
                     }
 
 
@@ -49502,10 +47544,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     break;
                 case 30:
                     {
-                    int LA106_5 = input.LA(2);
+                    int LA104_5 = input.LA(2);
 
-                    if ( (synpred184_InternalTableDSL()) ) {
-                        alt106=1;
+                    if ( (synpred182_InternalTableDSL()) ) {
+                        alt104=1;
                     }
 
 
@@ -49514,11 +47556,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
                 }
 
-                switch (alt106) {
+                switch (alt104) {
             	case 1 :
-            	    // InternalTableDSL.g:14802:3: rule__XRelationalExpression__Alternatives_1
+            	    // InternalTableDSL.g:14181:3: rule__XRelationalExpression__Alternatives_1
             	    {
-            	    pushFollow(FOLLOW_116);
+            	    pushFollow(FOLLOW_115);
             	    rule__XRelationalExpression__Alternatives_1();
 
             	    state._fsp--;
@@ -49528,7 +47570,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop106;
+            	    break loop104;
                 }
             } while (true);
 
@@ -49557,16 +47599,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__0"
-    // InternalTableDSL.g:14811:1: rule__XRelationalExpression__Group_1_0__0 : rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 ;
+    // InternalTableDSL.g:14190:1: rule__XRelationalExpression__Group_1_0__0 : rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 ;
     public final void rule__XRelationalExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14815:1: ( rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 )
-            // InternalTableDSL.g:14816:2: rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1
+            // InternalTableDSL.g:14194:1: ( rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 )
+            // InternalTableDSL.g:14195:2: rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__XRelationalExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -49595,23 +47637,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__0__Impl"
-    // InternalTableDSL.g:14823:1: rule__XRelationalExpression__Group_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) ;
+    // InternalTableDSL.g:14202:1: rule__XRelationalExpression__Group_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14827:1: ( ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) )
-            // InternalTableDSL.g:14828:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:14206:1: ( ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) )
+            // InternalTableDSL.g:14207:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
             {
-            // InternalTableDSL.g:14828:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
-            // InternalTableDSL.g:14829:2: ( rule__XRelationalExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:14207:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:14208:2: ( rule__XRelationalExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalTableDSL.g:14830:2: ( rule__XRelationalExpression__Group_1_0_0__0 )
-            // InternalTableDSL.g:14830:3: rule__XRelationalExpression__Group_1_0_0__0
+            // InternalTableDSL.g:14209:2: ( rule__XRelationalExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:14209:3: rule__XRelationalExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0__0();
@@ -49646,14 +47688,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__1"
-    // InternalTableDSL.g:14838:1: rule__XRelationalExpression__Group_1_0__1 : rule__XRelationalExpression__Group_1_0__1__Impl ;
+    // InternalTableDSL.g:14217:1: rule__XRelationalExpression__Group_1_0__1 : rule__XRelationalExpression__Group_1_0__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14842:1: ( rule__XRelationalExpression__Group_1_0__1__Impl )
-            // InternalTableDSL.g:14843:2: rule__XRelationalExpression__Group_1_0__1__Impl
+            // InternalTableDSL.g:14221:1: ( rule__XRelationalExpression__Group_1_0__1__Impl )
+            // InternalTableDSL.g:14222:2: rule__XRelationalExpression__Group_1_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0__1__Impl();
@@ -49679,23 +47721,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__1__Impl"
-    // InternalTableDSL.g:14849:1: rule__XRelationalExpression__Group_1_0__1__Impl : ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) ;
+    // InternalTableDSL.g:14228:1: rule__XRelationalExpression__Group_1_0__1__Impl : ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) ;
     public final void rule__XRelationalExpression__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14853:1: ( ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) )
-            // InternalTableDSL.g:14854:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
+            // InternalTableDSL.g:14232:1: ( ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) )
+            // InternalTableDSL.g:14233:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
             {
-            // InternalTableDSL.g:14854:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
-            // InternalTableDSL.g:14855:2: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
+            // InternalTableDSL.g:14233:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
+            // InternalTableDSL.g:14234:2: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getTypeAssignment_1_0_1()); 
             }
-            // InternalTableDSL.g:14856:2: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
-            // InternalTableDSL.g:14856:3: rule__XRelationalExpression__TypeAssignment_1_0_1
+            // InternalTableDSL.g:14235:2: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
+            // InternalTableDSL.g:14235:3: rule__XRelationalExpression__TypeAssignment_1_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__TypeAssignment_1_0_1();
@@ -49730,14 +47772,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0__0"
-    // InternalTableDSL.g:14865:1: rule__XRelationalExpression__Group_1_0_0__0 : rule__XRelationalExpression__Group_1_0_0__0__Impl ;
+    // InternalTableDSL.g:14244:1: rule__XRelationalExpression__Group_1_0_0__0 : rule__XRelationalExpression__Group_1_0_0__0__Impl ;
     public final void rule__XRelationalExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14869:1: ( rule__XRelationalExpression__Group_1_0_0__0__Impl )
-            // InternalTableDSL.g:14870:2: rule__XRelationalExpression__Group_1_0_0__0__Impl
+            // InternalTableDSL.g:14248:1: ( rule__XRelationalExpression__Group_1_0_0__0__Impl )
+            // InternalTableDSL.g:14249:2: rule__XRelationalExpression__Group_1_0_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0__0__Impl();
@@ -49763,23 +47805,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0__0__Impl"
-    // InternalTableDSL.g:14876:1: rule__XRelationalExpression__Group_1_0_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) ;
+    // InternalTableDSL.g:14255:1: rule__XRelationalExpression__Group_1_0_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14880:1: ( ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) )
-            // InternalTableDSL.g:14881:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
+            // InternalTableDSL.g:14259:1: ( ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) )
+            // InternalTableDSL.g:14260:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
             {
-            // InternalTableDSL.g:14881:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
-            // InternalTableDSL.g:14882:2: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
+            // InternalTableDSL.g:14260:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
+            // InternalTableDSL.g:14261:2: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0_0_0()); 
             }
-            // InternalTableDSL.g:14883:2: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
-            // InternalTableDSL.g:14883:3: rule__XRelationalExpression__Group_1_0_0_0__0
+            // InternalTableDSL.g:14262:2: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
+            // InternalTableDSL.g:14262:3: rule__XRelationalExpression__Group_1_0_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0_0__0();
@@ -49814,16 +47856,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__0"
-    // InternalTableDSL.g:14892:1: rule__XRelationalExpression__Group_1_0_0_0__0 : rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 ;
+    // InternalTableDSL.g:14271:1: rule__XRelationalExpression__Group_1_0_0_0__0 : rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14896:1: ( rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 )
-            // InternalTableDSL.g:14897:2: rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1
+            // InternalTableDSL.g:14275:1: ( rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 )
+            // InternalTableDSL.g:14276:2: rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1
             {
-            pushFollow(FOLLOW_118);
+            pushFollow(FOLLOW_117);
             rule__XRelationalExpression__Group_1_0_0_0__0__Impl();
 
             state._fsp--;
@@ -49852,23 +47894,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__0__Impl"
-    // InternalTableDSL.g:14904:1: rule__XRelationalExpression__Group_1_0_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:14283:1: rule__XRelationalExpression__Group_1_0_0_0__0__Impl : ( () ) ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14908:1: ( ( () ) )
-            // InternalTableDSL.g:14909:1: ( () )
+            // InternalTableDSL.g:14287:1: ( ( () ) )
+            // InternalTableDSL.g:14288:1: ( () )
             {
-            // InternalTableDSL.g:14909:1: ( () )
-            // InternalTableDSL.g:14910:2: ()
+            // InternalTableDSL.g:14288:1: ( () )
+            // InternalTableDSL.g:14289:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()); 
             }
-            // InternalTableDSL.g:14911:2: ()
-            // InternalTableDSL.g:14911:3: 
+            // InternalTableDSL.g:14290:2: ()
+            // InternalTableDSL.g:14290:3: 
             {
             }
 
@@ -49893,14 +47935,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__1"
-    // InternalTableDSL.g:14919:1: rule__XRelationalExpression__Group_1_0_0_0__1 : rule__XRelationalExpression__Group_1_0_0_0__1__Impl ;
+    // InternalTableDSL.g:14298:1: rule__XRelationalExpression__Group_1_0_0_0__1 : rule__XRelationalExpression__Group_1_0_0_0__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14923:1: ( rule__XRelationalExpression__Group_1_0_0_0__1__Impl )
-            // InternalTableDSL.g:14924:2: rule__XRelationalExpression__Group_1_0_0_0__1__Impl
+            // InternalTableDSL.g:14302:1: ( rule__XRelationalExpression__Group_1_0_0_0__1__Impl )
+            // InternalTableDSL.g:14303:2: rule__XRelationalExpression__Group_1_0_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0_0__1__Impl();
@@ -49926,17 +47968,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__1__Impl"
-    // InternalTableDSL.g:14930:1: rule__XRelationalExpression__Group_1_0_0_0__1__Impl : ( 'instanceof' ) ;
+    // InternalTableDSL.g:14309:1: rule__XRelationalExpression__Group_1_0_0_0__1__Impl : ( 'instanceof' ) ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14934:1: ( ( 'instanceof' ) )
-            // InternalTableDSL.g:14935:1: ( 'instanceof' )
+            // InternalTableDSL.g:14313:1: ( ( 'instanceof' ) )
+            // InternalTableDSL.g:14314:1: ( 'instanceof' )
             {
-            // InternalTableDSL.g:14935:1: ( 'instanceof' )
-            // InternalTableDSL.g:14936:2: 'instanceof'
+            // InternalTableDSL.g:14314:1: ( 'instanceof' )
+            // InternalTableDSL.g:14315:2: 'instanceof'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1()); 
@@ -49967,16 +48009,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__0"
-    // InternalTableDSL.g:14946:1: rule__XRelationalExpression__Group_1_1__0 : rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 ;
+    // InternalTableDSL.g:14325:1: rule__XRelationalExpression__Group_1_1__0 : rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 ;
     public final void rule__XRelationalExpression__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14950:1: ( rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 )
-            // InternalTableDSL.g:14951:2: rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1
+            // InternalTableDSL.g:14329:1: ( rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 )
+            // InternalTableDSL.g:14330:2: rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XRelationalExpression__Group_1_1__0__Impl();
 
             state._fsp--;
@@ -50005,23 +48047,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__0__Impl"
-    // InternalTableDSL.g:14958:1: rule__XRelationalExpression__Group_1_1__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) ;
+    // InternalTableDSL.g:14337:1: rule__XRelationalExpression__Group_1_1__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14962:1: ( ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) )
-            // InternalTableDSL.g:14963:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
+            // InternalTableDSL.g:14341:1: ( ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) )
+            // InternalTableDSL.g:14342:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
             {
-            // InternalTableDSL.g:14963:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
-            // InternalTableDSL.g:14964:2: ( rule__XRelationalExpression__Group_1_1_0__0 )
+            // InternalTableDSL.g:14342:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
+            // InternalTableDSL.g:14343:2: ( rule__XRelationalExpression__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1_0()); 
             }
-            // InternalTableDSL.g:14965:2: ( rule__XRelationalExpression__Group_1_1_0__0 )
-            // InternalTableDSL.g:14965:3: rule__XRelationalExpression__Group_1_1_0__0
+            // InternalTableDSL.g:14344:2: ( rule__XRelationalExpression__Group_1_1_0__0 )
+            // InternalTableDSL.g:14344:3: rule__XRelationalExpression__Group_1_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0__0();
@@ -50056,14 +48098,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__1"
-    // InternalTableDSL.g:14973:1: rule__XRelationalExpression__Group_1_1__1 : rule__XRelationalExpression__Group_1_1__1__Impl ;
+    // InternalTableDSL.g:14352:1: rule__XRelationalExpression__Group_1_1__1 : rule__XRelationalExpression__Group_1_1__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14977:1: ( rule__XRelationalExpression__Group_1_1__1__Impl )
-            // InternalTableDSL.g:14978:2: rule__XRelationalExpression__Group_1_1__1__Impl
+            // InternalTableDSL.g:14356:1: ( rule__XRelationalExpression__Group_1_1__1__Impl )
+            // InternalTableDSL.g:14357:2: rule__XRelationalExpression__Group_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1__1__Impl();
@@ -50089,23 +48131,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__1__Impl"
-    // InternalTableDSL.g:14984:1: rule__XRelationalExpression__Group_1_1__1__Impl : ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) ;
+    // InternalTableDSL.g:14363:1: rule__XRelationalExpression__Group_1_1__1__Impl : ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:14988:1: ( ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) )
-            // InternalTableDSL.g:14989:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
+            // InternalTableDSL.g:14367:1: ( ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) )
+            // InternalTableDSL.g:14368:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
             {
-            // InternalTableDSL.g:14989:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
-            // InternalTableDSL.g:14990:2: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
+            // InternalTableDSL.g:14368:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
+            // InternalTableDSL.g:14369:2: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getRightOperandAssignment_1_1_1()); 
             }
-            // InternalTableDSL.g:14991:2: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
-            // InternalTableDSL.g:14991:3: rule__XRelationalExpression__RightOperandAssignment_1_1_1
+            // InternalTableDSL.g:14370:2: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
+            // InternalTableDSL.g:14370:3: rule__XRelationalExpression__RightOperandAssignment_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__RightOperandAssignment_1_1_1();
@@ -50140,14 +48182,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0__0"
-    // InternalTableDSL.g:15000:1: rule__XRelationalExpression__Group_1_1_0__0 : rule__XRelationalExpression__Group_1_1_0__0__Impl ;
+    // InternalTableDSL.g:14379:1: rule__XRelationalExpression__Group_1_1_0__0 : rule__XRelationalExpression__Group_1_1_0__0__Impl ;
     public final void rule__XRelationalExpression__Group_1_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15004:1: ( rule__XRelationalExpression__Group_1_1_0__0__Impl )
-            // InternalTableDSL.g:15005:2: rule__XRelationalExpression__Group_1_1_0__0__Impl
+            // InternalTableDSL.g:14383:1: ( rule__XRelationalExpression__Group_1_1_0__0__Impl )
+            // InternalTableDSL.g:14384:2: rule__XRelationalExpression__Group_1_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0__0__Impl();
@@ -50173,23 +48215,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0__0__Impl"
-    // InternalTableDSL.g:15011:1: rule__XRelationalExpression__Group_1_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) ;
+    // InternalTableDSL.g:14390:1: rule__XRelationalExpression__Group_1_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15015:1: ( ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) )
-            // InternalTableDSL.g:15016:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
+            // InternalTableDSL.g:14394:1: ( ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) )
+            // InternalTableDSL.g:14395:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
             {
-            // InternalTableDSL.g:15016:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
-            // InternalTableDSL.g:15017:2: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
+            // InternalTableDSL.g:14395:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
+            // InternalTableDSL.g:14396:2: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1_0_0()); 
             }
-            // InternalTableDSL.g:15018:2: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
-            // InternalTableDSL.g:15018:3: rule__XRelationalExpression__Group_1_1_0_0__0
+            // InternalTableDSL.g:14397:2: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
+            // InternalTableDSL.g:14397:3: rule__XRelationalExpression__Group_1_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0_0__0();
@@ -50224,16 +48266,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__0"
-    // InternalTableDSL.g:15027:1: rule__XRelationalExpression__Group_1_1_0_0__0 : rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 ;
+    // InternalTableDSL.g:14406:1: rule__XRelationalExpression__Group_1_1_0_0__0 : rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15031:1: ( rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 )
-            // InternalTableDSL.g:15032:2: rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1
+            // InternalTableDSL.g:14410:1: ( rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 )
+            // InternalTableDSL.g:14411:2: rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_115);
+            pushFollow(FOLLOW_114);
             rule__XRelationalExpression__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
@@ -50262,23 +48304,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__0__Impl"
-    // InternalTableDSL.g:15039:1: rule__XRelationalExpression__Group_1_1_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:14418:1: rule__XRelationalExpression__Group_1_1_0_0__0__Impl : ( () ) ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15043:1: ( ( () ) )
-            // InternalTableDSL.g:15044:1: ( () )
+            // InternalTableDSL.g:14422:1: ( ( () ) )
+            // InternalTableDSL.g:14423:1: ( () )
             {
-            // InternalTableDSL.g:15044:1: ( () )
-            // InternalTableDSL.g:15045:2: ()
+            // InternalTableDSL.g:14423:1: ( () )
+            // InternalTableDSL.g:14424:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()); 
             }
-            // InternalTableDSL.g:15046:2: ()
-            // InternalTableDSL.g:15046:3: 
+            // InternalTableDSL.g:14425:2: ()
+            // InternalTableDSL.g:14425:3: 
             {
             }
 
@@ -50303,14 +48345,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__1"
-    // InternalTableDSL.g:15054:1: rule__XRelationalExpression__Group_1_1_0_0__1 : rule__XRelationalExpression__Group_1_1_0_0__1__Impl ;
+    // InternalTableDSL.g:14433:1: rule__XRelationalExpression__Group_1_1_0_0__1 : rule__XRelationalExpression__Group_1_1_0_0__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15058:1: ( rule__XRelationalExpression__Group_1_1_0_0__1__Impl )
-            // InternalTableDSL.g:15059:2: rule__XRelationalExpression__Group_1_1_0_0__1__Impl
+            // InternalTableDSL.g:14437:1: ( rule__XRelationalExpression__Group_1_1_0_0__1__Impl )
+            // InternalTableDSL.g:14438:2: rule__XRelationalExpression__Group_1_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0_0__1__Impl();
@@ -50336,23 +48378,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__1__Impl"
-    // InternalTableDSL.g:15065:1: rule__XRelationalExpression__Group_1_1_0_0__1__Impl : ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) ;
+    // InternalTableDSL.g:14444:1: rule__XRelationalExpression__Group_1_1_0_0__1__Impl : ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15069:1: ( ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) )
-            // InternalTableDSL.g:15070:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalTableDSL.g:14448:1: ( ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) )
+            // InternalTableDSL.g:14449:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
             {
-            // InternalTableDSL.g:15070:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
-            // InternalTableDSL.g:15071:2: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
+            // InternalTableDSL.g:14449:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalTableDSL.g:14450:2: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureAssignment_1_1_0_0_1()); 
             }
-            // InternalTableDSL.g:15072:2: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
-            // InternalTableDSL.g:15072:3: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1
+            // InternalTableDSL.g:14451:2: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
+            // InternalTableDSL.g:14451:3: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1();
@@ -50387,16 +48429,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpCompare__Group_1__0"
-    // InternalTableDSL.g:15081:1: rule__OpCompare__Group_1__0 : rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 ;
+    // InternalTableDSL.g:14460:1: rule__OpCompare__Group_1__0 : rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 ;
     public final void rule__OpCompare__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15085:1: ( rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 )
-            // InternalTableDSL.g:15086:2: rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1
+            // InternalTableDSL.g:14464:1: ( rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 )
+            // InternalTableDSL.g:14465:2: rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1
             {
-            pushFollow(FOLLOW_101);
+            pushFollow(FOLLOW_100);
             rule__OpCompare__Group_1__0__Impl();
 
             state._fsp--;
@@ -50425,17 +48467,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpCompare__Group_1__0__Impl"
-    // InternalTableDSL.g:15093:1: rule__OpCompare__Group_1__0__Impl : ( '<' ) ;
+    // InternalTableDSL.g:14472:1: rule__OpCompare__Group_1__0__Impl : ( '<' ) ;
     public final void rule__OpCompare__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15097:1: ( ( '<' ) )
-            // InternalTableDSL.g:15098:1: ( '<' )
+            // InternalTableDSL.g:14476:1: ( ( '<' ) )
+            // InternalTableDSL.g:14477:1: ( '<' )
             {
-            // InternalTableDSL.g:15098:1: ( '<' )
-            // InternalTableDSL.g:15099:2: '<'
+            // InternalTableDSL.g:14477:1: ( '<' )
+            // InternalTableDSL.g:14478:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0()); 
@@ -50466,14 +48508,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpCompare__Group_1__1"
-    // InternalTableDSL.g:15108:1: rule__OpCompare__Group_1__1 : rule__OpCompare__Group_1__1__Impl ;
+    // InternalTableDSL.g:14487:1: rule__OpCompare__Group_1__1 : rule__OpCompare__Group_1__1__Impl ;
     public final void rule__OpCompare__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15112:1: ( rule__OpCompare__Group_1__1__Impl )
-            // InternalTableDSL.g:15113:2: rule__OpCompare__Group_1__1__Impl
+            // InternalTableDSL.g:14491:1: ( rule__OpCompare__Group_1__1__Impl )
+            // InternalTableDSL.g:14492:2: rule__OpCompare__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpCompare__Group_1__1__Impl();
@@ -50499,17 +48541,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpCompare__Group_1__1__Impl"
-    // InternalTableDSL.g:15119:1: rule__OpCompare__Group_1__1__Impl : ( '=' ) ;
+    // InternalTableDSL.g:14498:1: rule__OpCompare__Group_1__1__Impl : ( '=' ) ;
     public final void rule__OpCompare__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15123:1: ( ( '=' ) )
-            // InternalTableDSL.g:15124:1: ( '=' )
+            // InternalTableDSL.g:14502:1: ( ( '=' ) )
+            // InternalTableDSL.g:14503:1: ( '=' )
             {
-            // InternalTableDSL.g:15124:1: ( '=' )
-            // InternalTableDSL.g:15125:2: '='
+            // InternalTableDSL.g:14503:1: ( '=' )
+            // InternalTableDSL.g:14504:2: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getEqualsSignKeyword_1_1()); 
@@ -50540,16 +48582,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__0"
-    // InternalTableDSL.g:15135:1: rule__XOtherOperatorExpression__Group__0 : rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 ;
+    // InternalTableDSL.g:14514:1: rule__XOtherOperatorExpression__Group__0 : rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 ;
     public final void rule__XOtherOperatorExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15139:1: ( rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 )
-            // InternalTableDSL.g:15140:2: rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1
+            // InternalTableDSL.g:14518:1: ( rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 )
+            // InternalTableDSL.g:14519:2: rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1
             {
-            pushFollow(FOLLOW_119);
+            pushFollow(FOLLOW_118);
             rule__XOtherOperatorExpression__Group__0__Impl();
 
             state._fsp--;
@@ -50578,17 +48620,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__0__Impl"
-    // InternalTableDSL.g:15147:1: rule__XOtherOperatorExpression__Group__0__Impl : ( ruleXAdditiveExpression ) ;
+    // InternalTableDSL.g:14526:1: rule__XOtherOperatorExpression__Group__0__Impl : ( ruleXAdditiveExpression ) ;
     public final void rule__XOtherOperatorExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15151:1: ( ( ruleXAdditiveExpression ) )
-            // InternalTableDSL.g:15152:1: ( ruleXAdditiveExpression )
+            // InternalTableDSL.g:14530:1: ( ( ruleXAdditiveExpression ) )
+            // InternalTableDSL.g:14531:1: ( ruleXAdditiveExpression )
             {
-            // InternalTableDSL.g:15152:1: ( ruleXAdditiveExpression )
-            // InternalTableDSL.g:15153:2: ruleXAdditiveExpression
+            // InternalTableDSL.g:14531:1: ( ruleXAdditiveExpression )
+            // InternalTableDSL.g:14532:2: ruleXAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getXAdditiveExpressionParserRuleCall_0()); 
@@ -50623,14 +48665,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__1"
-    // InternalTableDSL.g:15162:1: rule__XOtherOperatorExpression__Group__1 : rule__XOtherOperatorExpression__Group__1__Impl ;
+    // InternalTableDSL.g:14541:1: rule__XOtherOperatorExpression__Group__1 : rule__XOtherOperatorExpression__Group__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15166:1: ( rule__XOtherOperatorExpression__Group__1__Impl )
-            // InternalTableDSL.g:15167:2: rule__XOtherOperatorExpression__Group__1__Impl
+            // InternalTableDSL.g:14545:1: ( rule__XOtherOperatorExpression__Group__1__Impl )
+            // InternalTableDSL.g:14546:2: rule__XOtherOperatorExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group__1__Impl();
@@ -50656,31 +48698,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__1__Impl"
-    // InternalTableDSL.g:15173:1: rule__XOtherOperatorExpression__Group__1__Impl : ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) ;
+    // InternalTableDSL.g:14552:1: rule__XOtherOperatorExpression__Group__1__Impl : ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) ;
     public final void rule__XOtherOperatorExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15177:1: ( ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) )
-            // InternalTableDSL.g:15178:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
+            // InternalTableDSL.g:14556:1: ( ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) )
+            // InternalTableDSL.g:14557:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
             {
-            // InternalTableDSL.g:15178:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
-            // InternalTableDSL.g:15179:2: ( rule__XOtherOperatorExpression__Group_1__0 )*
+            // InternalTableDSL.g:14557:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
+            // InternalTableDSL.g:14558:2: ( rule__XOtherOperatorExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1()); 
             }
-            // InternalTableDSL.g:15180:2: ( rule__XOtherOperatorExpression__Group_1__0 )*
-            loop107:
+            // InternalTableDSL.g:14559:2: ( rule__XOtherOperatorExpression__Group_1__0 )*
+            loop105:
             do {
-                int alt107=2;
-                alt107 = dfa107.predict(input);
-                switch (alt107) {
+                int alt105=2;
+                alt105 = dfa105.predict(input);
+                switch (alt105) {
             	case 1 :
-            	    // InternalTableDSL.g:15180:3: rule__XOtherOperatorExpression__Group_1__0
+            	    // InternalTableDSL.g:14559:3: rule__XOtherOperatorExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_120);
+            	    pushFollow(FOLLOW_119);
             	    rule__XOtherOperatorExpression__Group_1__0();
 
             	    state._fsp--;
@@ -50690,7 +48732,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop107;
+            	    break loop105;
                 }
             } while (true);
 
@@ -50719,16 +48761,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__0"
-    // InternalTableDSL.g:15189:1: rule__XOtherOperatorExpression__Group_1__0 : rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 ;
+    // InternalTableDSL.g:14568:1: rule__XOtherOperatorExpression__Group_1__0 : rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 ;
     public final void rule__XOtherOperatorExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15193:1: ( rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 )
-            // InternalTableDSL.g:15194:2: rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1
+            // InternalTableDSL.g:14572:1: ( rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 )
+            // InternalTableDSL.g:14573:2: rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XOtherOperatorExpression__Group_1__0__Impl();
 
             state._fsp--;
@@ -50757,23 +48799,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__0__Impl"
-    // InternalTableDSL.g:15201:1: rule__XOtherOperatorExpression__Group_1__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) ;
+    // InternalTableDSL.g:14580:1: rule__XOtherOperatorExpression__Group_1__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15205:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) )
-            // InternalTableDSL.g:15206:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
+            // InternalTableDSL.g:14584:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) )
+            // InternalTableDSL.g:14585:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
             {
-            // InternalTableDSL.g:15206:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
-            // InternalTableDSL.g:15207:2: ( rule__XOtherOperatorExpression__Group_1_0__0 )
+            // InternalTableDSL.g:14585:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
+            // InternalTableDSL.g:14586:2: ( rule__XOtherOperatorExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1_0()); 
             }
-            // InternalTableDSL.g:15208:2: ( rule__XOtherOperatorExpression__Group_1_0__0 )
-            // InternalTableDSL.g:15208:3: rule__XOtherOperatorExpression__Group_1_0__0
+            // InternalTableDSL.g:14587:2: ( rule__XOtherOperatorExpression__Group_1_0__0 )
+            // InternalTableDSL.g:14587:3: rule__XOtherOperatorExpression__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0__0();
@@ -50808,14 +48850,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__1"
-    // InternalTableDSL.g:15216:1: rule__XOtherOperatorExpression__Group_1__1 : rule__XOtherOperatorExpression__Group_1__1__Impl ;
+    // InternalTableDSL.g:14595:1: rule__XOtherOperatorExpression__Group_1__1 : rule__XOtherOperatorExpression__Group_1__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15220:1: ( rule__XOtherOperatorExpression__Group_1__1__Impl )
-            // InternalTableDSL.g:15221:2: rule__XOtherOperatorExpression__Group_1__1__Impl
+            // InternalTableDSL.g:14599:1: ( rule__XOtherOperatorExpression__Group_1__1__Impl )
+            // InternalTableDSL.g:14600:2: rule__XOtherOperatorExpression__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1__1__Impl();
@@ -50841,23 +48883,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__1__Impl"
-    // InternalTableDSL.g:15227:1: rule__XOtherOperatorExpression__Group_1__1__Impl : ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalTableDSL.g:14606:1: rule__XOtherOperatorExpression__Group_1__1__Impl : ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15231:1: ( ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) )
-            // InternalTableDSL.g:15232:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
+            // InternalTableDSL.g:14610:1: ( ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalTableDSL.g:14611:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
             {
-            // InternalTableDSL.g:15232:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
-            // InternalTableDSL.g:15233:2: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
+            // InternalTableDSL.g:14611:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
+            // InternalTableDSL.g:14612:2: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // InternalTableDSL.g:15234:2: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
-            // InternalTableDSL.g:15234:3: rule__XOtherOperatorExpression__RightOperandAssignment_1_1
+            // InternalTableDSL.g:14613:2: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
+            // InternalTableDSL.g:14613:3: rule__XOtherOperatorExpression__RightOperandAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__RightOperandAssignment_1_1();
@@ -50892,14 +48934,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0__0"
-    // InternalTableDSL.g:15243:1: rule__XOtherOperatorExpression__Group_1_0__0 : rule__XOtherOperatorExpression__Group_1_0__0__Impl ;
+    // InternalTableDSL.g:14622:1: rule__XOtherOperatorExpression__Group_1_0__0 : rule__XOtherOperatorExpression__Group_1_0__0__Impl ;
     public final void rule__XOtherOperatorExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15247:1: ( rule__XOtherOperatorExpression__Group_1_0__0__Impl )
-            // InternalTableDSL.g:15248:2: rule__XOtherOperatorExpression__Group_1_0__0__Impl
+            // InternalTableDSL.g:14626:1: ( rule__XOtherOperatorExpression__Group_1_0__0__Impl )
+            // InternalTableDSL.g:14627:2: rule__XOtherOperatorExpression__Group_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0__0__Impl();
@@ -50925,23 +48967,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0__0__Impl"
-    // InternalTableDSL.g:15254:1: rule__XOtherOperatorExpression__Group_1_0__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) ;
+    // InternalTableDSL.g:14633:1: rule__XOtherOperatorExpression__Group_1_0__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15258:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) )
-            // InternalTableDSL.g:15259:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:14637:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) )
+            // InternalTableDSL.g:14638:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
             {
-            // InternalTableDSL.g:15259:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
-            // InternalTableDSL.g:15260:2: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:14638:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:14639:2: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalTableDSL.g:15261:2: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
-            // InternalTableDSL.g:15261:3: rule__XOtherOperatorExpression__Group_1_0_0__0
+            // InternalTableDSL.g:14640:2: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:14640:3: rule__XOtherOperatorExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0_0__0();
@@ -50976,16 +49018,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__0"
-    // InternalTableDSL.g:15270:1: rule__XOtherOperatorExpression__Group_1_0_0__0 : rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 ;
+    // InternalTableDSL.g:14649:1: rule__XOtherOperatorExpression__Group_1_0_0__0 : rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15274:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 )
-            // InternalTableDSL.g:15275:2: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1
+            // InternalTableDSL.g:14653:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 )
+            // InternalTableDSL.g:14654:2: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_119);
+            pushFollow(FOLLOW_118);
             rule__XOtherOperatorExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -51014,23 +49056,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__0__Impl"
-    // InternalTableDSL.g:15282:1: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:14661:1: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15286:1: ( ( () ) )
-            // InternalTableDSL.g:15287:1: ( () )
+            // InternalTableDSL.g:14665:1: ( ( () ) )
+            // InternalTableDSL.g:14666:1: ( () )
             {
-            // InternalTableDSL.g:15287:1: ( () )
-            // InternalTableDSL.g:15288:2: ()
+            // InternalTableDSL.g:14666:1: ( () )
+            // InternalTableDSL.g:14667:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // InternalTableDSL.g:15289:2: ()
-            // InternalTableDSL.g:15289:3: 
+            // InternalTableDSL.g:14668:2: ()
+            // InternalTableDSL.g:14668:3: 
             {
             }
 
@@ -51055,14 +49097,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__1"
-    // InternalTableDSL.g:15297:1: rule__XOtherOperatorExpression__Group_1_0_0__1 : rule__XOtherOperatorExpression__Group_1_0_0__1__Impl ;
+    // InternalTableDSL.g:14676:1: rule__XOtherOperatorExpression__Group_1_0_0__1 : rule__XOtherOperatorExpression__Group_1_0_0__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15301:1: ( rule__XOtherOperatorExpression__Group_1_0_0__1__Impl )
-            // InternalTableDSL.g:15302:2: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl
+            // InternalTableDSL.g:14680:1: ( rule__XOtherOperatorExpression__Group_1_0_0__1__Impl )
+            // InternalTableDSL.g:14681:2: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0_0__1__Impl();
@@ -51088,23 +49130,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__1__Impl"
-    // InternalTableDSL.g:15308:1: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl : ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalTableDSL.g:14687:1: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl : ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15312:1: ( ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // InternalTableDSL.g:15313:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalTableDSL.g:14691:1: ( ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalTableDSL.g:14692:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // InternalTableDSL.g:15313:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
-            // InternalTableDSL.g:15314:2: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
+            // InternalTableDSL.g:14692:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalTableDSL.g:14693:2: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // InternalTableDSL.g:15315:2: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
-            // InternalTableDSL.g:15315:3: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1
+            // InternalTableDSL.g:14694:2: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
+            // InternalTableDSL.g:14694:3: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1();
@@ -51139,16 +49181,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_2__0"
-    // InternalTableDSL.g:15324:1: rule__OpOther__Group_2__0 : rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 ;
+    // InternalTableDSL.g:14703:1: rule__OpOther__Group_2__0 : rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 ;
     public final void rule__OpOther__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15328:1: ( rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 )
-            // InternalTableDSL.g:15329:2: rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1
+            // InternalTableDSL.g:14707:1: ( rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 )
+            // InternalTableDSL.g:14708:2: rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1
             {
-            pushFollow(FOLLOW_121);
+            pushFollow(FOLLOW_120);
             rule__OpOther__Group_2__0__Impl();
 
             state._fsp--;
@@ -51177,17 +49219,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_2__0__Impl"
-    // InternalTableDSL.g:15336:1: rule__OpOther__Group_2__0__Impl : ( '>' ) ;
+    // InternalTableDSL.g:14715:1: rule__OpOther__Group_2__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15340:1: ( ( '>' ) )
-            // InternalTableDSL.g:15341:1: ( '>' )
+            // InternalTableDSL.g:14719:1: ( ( '>' ) )
+            // InternalTableDSL.g:14720:1: ( '>' )
             {
-            // InternalTableDSL.g:15341:1: ( '>' )
-            // InternalTableDSL.g:15342:2: '>'
+            // InternalTableDSL.g:14720:1: ( '>' )
+            // InternalTableDSL.g:14721:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0()); 
@@ -51218,14 +49260,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_2__1"
-    // InternalTableDSL.g:15351:1: rule__OpOther__Group_2__1 : rule__OpOther__Group_2__1__Impl ;
+    // InternalTableDSL.g:14730:1: rule__OpOther__Group_2__1 : rule__OpOther__Group_2__1__Impl ;
     public final void rule__OpOther__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15355:1: ( rule__OpOther__Group_2__1__Impl )
-            // InternalTableDSL.g:15356:2: rule__OpOther__Group_2__1__Impl
+            // InternalTableDSL.g:14734:1: ( rule__OpOther__Group_2__1__Impl )
+            // InternalTableDSL.g:14735:2: rule__OpOther__Group_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_2__1__Impl();
@@ -51251,17 +49293,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_2__1__Impl"
-    // InternalTableDSL.g:15362:1: rule__OpOther__Group_2__1__Impl : ( '..' ) ;
+    // InternalTableDSL.g:14741:1: rule__OpOther__Group_2__1__Impl : ( '..' ) ;
     public final void rule__OpOther__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15366:1: ( ( '..' ) )
-            // InternalTableDSL.g:15367:1: ( '..' )
+            // InternalTableDSL.g:14745:1: ( ( '..' ) )
+            // InternalTableDSL.g:14746:1: ( '..' )
             {
-            // InternalTableDSL.g:15367:1: ( '..' )
-            // InternalTableDSL.g:15368:2: '..'
+            // InternalTableDSL.g:14746:1: ( '..' )
+            // InternalTableDSL.g:14747:2: '..'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_2_1()); 
@@ -51292,16 +49334,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_5__0"
-    // InternalTableDSL.g:15378:1: rule__OpOther__Group_5__0 : rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 ;
+    // InternalTableDSL.g:14757:1: rule__OpOther__Group_5__0 : rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 ;
     public final void rule__OpOther__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15382:1: ( rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 )
-            // InternalTableDSL.g:15383:2: rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1
+            // InternalTableDSL.g:14761:1: ( rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 )
+            // InternalTableDSL.g:14762:2: rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1
             {
-            pushFollow(FOLLOW_122);
+            pushFollow(FOLLOW_121);
             rule__OpOther__Group_5__0__Impl();
 
             state._fsp--;
@@ -51330,17 +49372,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_5__0__Impl"
-    // InternalTableDSL.g:15390:1: rule__OpOther__Group_5__0__Impl : ( '>' ) ;
+    // InternalTableDSL.g:14769:1: rule__OpOther__Group_5__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15394:1: ( ( '>' ) )
-            // InternalTableDSL.g:15395:1: ( '>' )
+            // InternalTableDSL.g:14773:1: ( ( '>' ) )
+            // InternalTableDSL.g:14774:1: ( '>' )
             {
-            // InternalTableDSL.g:15395:1: ( '>' )
-            // InternalTableDSL.g:15396:2: '>'
+            // InternalTableDSL.g:14774:1: ( '>' )
+            // InternalTableDSL.g:14775:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0()); 
@@ -51371,14 +49413,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_5__1"
-    // InternalTableDSL.g:15405:1: rule__OpOther__Group_5__1 : rule__OpOther__Group_5__1__Impl ;
+    // InternalTableDSL.g:14784:1: rule__OpOther__Group_5__1 : rule__OpOther__Group_5__1__Impl ;
     public final void rule__OpOther__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15409:1: ( rule__OpOther__Group_5__1__Impl )
-            // InternalTableDSL.g:15410:2: rule__OpOther__Group_5__1__Impl
+            // InternalTableDSL.g:14788:1: ( rule__OpOther__Group_5__1__Impl )
+            // InternalTableDSL.g:14789:2: rule__OpOther__Group_5__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_5__1__Impl();
@@ -51404,23 +49446,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_5__1__Impl"
-    // InternalTableDSL.g:15416:1: rule__OpOther__Group_5__1__Impl : ( ( rule__OpOther__Alternatives_5_1 ) ) ;
+    // InternalTableDSL.g:14795:1: rule__OpOther__Group_5__1__Impl : ( ( rule__OpOther__Alternatives_5_1 ) ) ;
     public final void rule__OpOther__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15420:1: ( ( ( rule__OpOther__Alternatives_5_1 ) ) )
-            // InternalTableDSL.g:15421:1: ( ( rule__OpOther__Alternatives_5_1 ) )
+            // InternalTableDSL.g:14799:1: ( ( ( rule__OpOther__Alternatives_5_1 ) ) )
+            // InternalTableDSL.g:14800:1: ( ( rule__OpOther__Alternatives_5_1 ) )
             {
-            // InternalTableDSL.g:15421:1: ( ( rule__OpOther__Alternatives_5_1 ) )
-            // InternalTableDSL.g:15422:2: ( rule__OpOther__Alternatives_5_1 )
+            // InternalTableDSL.g:14800:1: ( ( rule__OpOther__Alternatives_5_1 ) )
+            // InternalTableDSL.g:14801:2: ( rule__OpOther__Alternatives_5_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives_5_1()); 
             }
-            // InternalTableDSL.g:15423:2: ( rule__OpOther__Alternatives_5_1 )
-            // InternalTableDSL.g:15423:3: rule__OpOther__Alternatives_5_1
+            // InternalTableDSL.g:14802:2: ( rule__OpOther__Alternatives_5_1 )
+            // InternalTableDSL.g:14802:3: rule__OpOther__Alternatives_5_1
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Alternatives_5_1();
@@ -51455,14 +49497,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0__0"
-    // InternalTableDSL.g:15432:1: rule__OpOther__Group_5_1_0__0 : rule__OpOther__Group_5_1_0__0__Impl ;
+    // InternalTableDSL.g:14811:1: rule__OpOther__Group_5_1_0__0 : rule__OpOther__Group_5_1_0__0__Impl ;
     public final void rule__OpOther__Group_5_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15436:1: ( rule__OpOther__Group_5_1_0__0__Impl )
-            // InternalTableDSL.g:15437:2: rule__OpOther__Group_5_1_0__0__Impl
+            // InternalTableDSL.g:14815:1: ( rule__OpOther__Group_5_1_0__0__Impl )
+            // InternalTableDSL.g:14816:2: rule__OpOther__Group_5_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0__0__Impl();
@@ -51488,23 +49530,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0__0__Impl"
-    // InternalTableDSL.g:15443:1: rule__OpOther__Group_5_1_0__0__Impl : ( ( rule__OpOther__Group_5_1_0_0__0 ) ) ;
+    // InternalTableDSL.g:14822:1: rule__OpOther__Group_5_1_0__0__Impl : ( ( rule__OpOther__Group_5_1_0_0__0 ) ) ;
     public final void rule__OpOther__Group_5_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15447:1: ( ( ( rule__OpOther__Group_5_1_0_0__0 ) ) )
-            // InternalTableDSL.g:15448:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
+            // InternalTableDSL.g:14826:1: ( ( ( rule__OpOther__Group_5_1_0_0__0 ) ) )
+            // InternalTableDSL.g:14827:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
             {
-            // InternalTableDSL.g:15448:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
-            // InternalTableDSL.g:15449:2: ( rule__OpOther__Group_5_1_0_0__0 )
+            // InternalTableDSL.g:14827:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
+            // InternalTableDSL.g:14828:2: ( rule__OpOther__Group_5_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGroup_5_1_0_0()); 
             }
-            // InternalTableDSL.g:15450:2: ( rule__OpOther__Group_5_1_0_0__0 )
-            // InternalTableDSL.g:15450:3: rule__OpOther__Group_5_1_0_0__0
+            // InternalTableDSL.g:14829:2: ( rule__OpOther__Group_5_1_0_0__0 )
+            // InternalTableDSL.g:14829:3: rule__OpOther__Group_5_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0_0__0();
@@ -51539,16 +49581,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__0"
-    // InternalTableDSL.g:15459:1: rule__OpOther__Group_5_1_0_0__0 : rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 ;
+    // InternalTableDSL.g:14838:1: rule__OpOther__Group_5_1_0_0__0 : rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 ;
     public final void rule__OpOther__Group_5_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15463:1: ( rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 )
-            // InternalTableDSL.g:15464:2: rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1
+            // InternalTableDSL.g:14842:1: ( rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 )
+            // InternalTableDSL.g:14843:2: rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1
             {
-            pushFollow(FOLLOW_122);
+            pushFollow(FOLLOW_121);
             rule__OpOther__Group_5_1_0_0__0__Impl();
 
             state._fsp--;
@@ -51577,17 +49619,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__0__Impl"
-    // InternalTableDSL.g:15471:1: rule__OpOther__Group_5_1_0_0__0__Impl : ( '>' ) ;
+    // InternalTableDSL.g:14850:1: rule__OpOther__Group_5_1_0_0__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15475:1: ( ( '>' ) )
-            // InternalTableDSL.g:15476:1: ( '>' )
+            // InternalTableDSL.g:14854:1: ( ( '>' ) )
+            // InternalTableDSL.g:14855:1: ( '>' )
             {
-            // InternalTableDSL.g:15476:1: ( '>' )
-            // InternalTableDSL.g:15477:2: '>'
+            // InternalTableDSL.g:14855:1: ( '>' )
+            // InternalTableDSL.g:14856:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0()); 
@@ -51618,14 +49660,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__1"
-    // InternalTableDSL.g:15486:1: rule__OpOther__Group_5_1_0_0__1 : rule__OpOther__Group_5_1_0_0__1__Impl ;
+    // InternalTableDSL.g:14865:1: rule__OpOther__Group_5_1_0_0__1 : rule__OpOther__Group_5_1_0_0__1__Impl ;
     public final void rule__OpOther__Group_5_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15490:1: ( rule__OpOther__Group_5_1_0_0__1__Impl )
-            // InternalTableDSL.g:15491:2: rule__OpOther__Group_5_1_0_0__1__Impl
+            // InternalTableDSL.g:14869:1: ( rule__OpOther__Group_5_1_0_0__1__Impl )
+            // InternalTableDSL.g:14870:2: rule__OpOther__Group_5_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0_0__1__Impl();
@@ -51651,17 +49693,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__1__Impl"
-    // InternalTableDSL.g:15497:1: rule__OpOther__Group_5_1_0_0__1__Impl : ( '>' ) ;
+    // InternalTableDSL.g:14876:1: rule__OpOther__Group_5_1_0_0__1__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15501:1: ( ( '>' ) )
-            // InternalTableDSL.g:15502:1: ( '>' )
+            // InternalTableDSL.g:14880:1: ( ( '>' ) )
+            // InternalTableDSL.g:14881:1: ( '>' )
             {
-            // InternalTableDSL.g:15502:1: ( '>' )
-            // InternalTableDSL.g:15503:2: '>'
+            // InternalTableDSL.g:14881:1: ( '>' )
+            // InternalTableDSL.g:14882:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_1()); 
@@ -51692,16 +49734,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_6__0"
-    // InternalTableDSL.g:15513:1: rule__OpOther__Group_6__0 : rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 ;
+    // InternalTableDSL.g:14892:1: rule__OpOther__Group_6__0 : rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 ;
     public final void rule__OpOther__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15517:1: ( rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 )
-            // InternalTableDSL.g:15518:2: rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1
+            // InternalTableDSL.g:14896:1: ( rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 )
+            // InternalTableDSL.g:14897:2: rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1
             {
-            pushFollow(FOLLOW_123);
+            pushFollow(FOLLOW_122);
             rule__OpOther__Group_6__0__Impl();
 
             state._fsp--;
@@ -51730,17 +49772,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_6__0__Impl"
-    // InternalTableDSL.g:15525:1: rule__OpOther__Group_6__0__Impl : ( '<' ) ;
+    // InternalTableDSL.g:14904:1: rule__OpOther__Group_6__0__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15529:1: ( ( '<' ) )
-            // InternalTableDSL.g:15530:1: ( '<' )
+            // InternalTableDSL.g:14908:1: ( ( '<' ) )
+            // InternalTableDSL.g:14909:1: ( '<' )
             {
-            // InternalTableDSL.g:15530:1: ( '<' )
-            // InternalTableDSL.g:15531:2: '<'
+            // InternalTableDSL.g:14909:1: ( '<' )
+            // InternalTableDSL.g:14910:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0()); 
@@ -51771,14 +49813,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_6__1"
-    // InternalTableDSL.g:15540:1: rule__OpOther__Group_6__1 : rule__OpOther__Group_6__1__Impl ;
+    // InternalTableDSL.g:14919:1: rule__OpOther__Group_6__1 : rule__OpOther__Group_6__1__Impl ;
     public final void rule__OpOther__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15544:1: ( rule__OpOther__Group_6__1__Impl )
-            // InternalTableDSL.g:15545:2: rule__OpOther__Group_6__1__Impl
+            // InternalTableDSL.g:14923:1: ( rule__OpOther__Group_6__1__Impl )
+            // InternalTableDSL.g:14924:2: rule__OpOther__Group_6__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_6__1__Impl();
@@ -51804,23 +49846,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_6__1__Impl"
-    // InternalTableDSL.g:15551:1: rule__OpOther__Group_6__1__Impl : ( ( rule__OpOther__Alternatives_6_1 ) ) ;
+    // InternalTableDSL.g:14930:1: rule__OpOther__Group_6__1__Impl : ( ( rule__OpOther__Alternatives_6_1 ) ) ;
     public final void rule__OpOther__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15555:1: ( ( ( rule__OpOther__Alternatives_6_1 ) ) )
-            // InternalTableDSL.g:15556:1: ( ( rule__OpOther__Alternatives_6_1 ) )
+            // InternalTableDSL.g:14934:1: ( ( ( rule__OpOther__Alternatives_6_1 ) ) )
+            // InternalTableDSL.g:14935:1: ( ( rule__OpOther__Alternatives_6_1 ) )
             {
-            // InternalTableDSL.g:15556:1: ( ( rule__OpOther__Alternatives_6_1 ) )
-            // InternalTableDSL.g:15557:2: ( rule__OpOther__Alternatives_6_1 )
+            // InternalTableDSL.g:14935:1: ( ( rule__OpOther__Alternatives_6_1 ) )
+            // InternalTableDSL.g:14936:2: ( rule__OpOther__Alternatives_6_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives_6_1()); 
             }
-            // InternalTableDSL.g:15558:2: ( rule__OpOther__Alternatives_6_1 )
-            // InternalTableDSL.g:15558:3: rule__OpOther__Alternatives_6_1
+            // InternalTableDSL.g:14937:2: ( rule__OpOther__Alternatives_6_1 )
+            // InternalTableDSL.g:14937:3: rule__OpOther__Alternatives_6_1
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Alternatives_6_1();
@@ -51855,14 +49897,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0__0"
-    // InternalTableDSL.g:15567:1: rule__OpOther__Group_6_1_0__0 : rule__OpOther__Group_6_1_0__0__Impl ;
+    // InternalTableDSL.g:14946:1: rule__OpOther__Group_6_1_0__0 : rule__OpOther__Group_6_1_0__0__Impl ;
     public final void rule__OpOther__Group_6_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15571:1: ( rule__OpOther__Group_6_1_0__0__Impl )
-            // InternalTableDSL.g:15572:2: rule__OpOther__Group_6_1_0__0__Impl
+            // InternalTableDSL.g:14950:1: ( rule__OpOther__Group_6_1_0__0__Impl )
+            // InternalTableDSL.g:14951:2: rule__OpOther__Group_6_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0__0__Impl();
@@ -51888,23 +49930,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0__0__Impl"
-    // InternalTableDSL.g:15578:1: rule__OpOther__Group_6_1_0__0__Impl : ( ( rule__OpOther__Group_6_1_0_0__0 ) ) ;
+    // InternalTableDSL.g:14957:1: rule__OpOther__Group_6_1_0__0__Impl : ( ( rule__OpOther__Group_6_1_0_0__0 ) ) ;
     public final void rule__OpOther__Group_6_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15582:1: ( ( ( rule__OpOther__Group_6_1_0_0__0 ) ) )
-            // InternalTableDSL.g:15583:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
+            // InternalTableDSL.g:14961:1: ( ( ( rule__OpOther__Group_6_1_0_0__0 ) ) )
+            // InternalTableDSL.g:14962:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
             {
-            // InternalTableDSL.g:15583:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
-            // InternalTableDSL.g:15584:2: ( rule__OpOther__Group_6_1_0_0__0 )
+            // InternalTableDSL.g:14962:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
+            // InternalTableDSL.g:14963:2: ( rule__OpOther__Group_6_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGroup_6_1_0_0()); 
             }
-            // InternalTableDSL.g:15585:2: ( rule__OpOther__Group_6_1_0_0__0 )
-            // InternalTableDSL.g:15585:3: rule__OpOther__Group_6_1_0_0__0
+            // InternalTableDSL.g:14964:2: ( rule__OpOther__Group_6_1_0_0__0 )
+            // InternalTableDSL.g:14964:3: rule__OpOther__Group_6_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0_0__0();
@@ -51939,16 +49981,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__0"
-    // InternalTableDSL.g:15594:1: rule__OpOther__Group_6_1_0_0__0 : rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 ;
+    // InternalTableDSL.g:14973:1: rule__OpOther__Group_6_1_0_0__0 : rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 ;
     public final void rule__OpOther__Group_6_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15598:1: ( rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 )
-            // InternalTableDSL.g:15599:2: rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1
+            // InternalTableDSL.g:14977:1: ( rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 )
+            // InternalTableDSL.g:14978:2: rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1
             {
-            pushFollow(FOLLOW_107);
+            pushFollow(FOLLOW_106);
             rule__OpOther__Group_6_1_0_0__0__Impl();
 
             state._fsp--;
@@ -51977,17 +50019,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__0__Impl"
-    // InternalTableDSL.g:15606:1: rule__OpOther__Group_6_1_0_0__0__Impl : ( '<' ) ;
+    // InternalTableDSL.g:14985:1: rule__OpOther__Group_6_1_0_0__0__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15610:1: ( ( '<' ) )
-            // InternalTableDSL.g:15611:1: ( '<' )
+            // InternalTableDSL.g:14989:1: ( ( '<' ) )
+            // InternalTableDSL.g:14990:1: ( '<' )
             {
-            // InternalTableDSL.g:15611:1: ( '<' )
-            // InternalTableDSL.g:15612:2: '<'
+            // InternalTableDSL.g:14990:1: ( '<' )
+            // InternalTableDSL.g:14991:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0()); 
@@ -52018,14 +50060,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__1"
-    // InternalTableDSL.g:15621:1: rule__OpOther__Group_6_1_0_0__1 : rule__OpOther__Group_6_1_0_0__1__Impl ;
+    // InternalTableDSL.g:15000:1: rule__OpOther__Group_6_1_0_0__1 : rule__OpOther__Group_6_1_0_0__1__Impl ;
     public final void rule__OpOther__Group_6_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15625:1: ( rule__OpOther__Group_6_1_0_0__1__Impl )
-            // InternalTableDSL.g:15626:2: rule__OpOther__Group_6_1_0_0__1__Impl
+            // InternalTableDSL.g:15004:1: ( rule__OpOther__Group_6_1_0_0__1__Impl )
+            // InternalTableDSL.g:15005:2: rule__OpOther__Group_6_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0_0__1__Impl();
@@ -52051,17 +50093,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__1__Impl"
-    // InternalTableDSL.g:15632:1: rule__OpOther__Group_6_1_0_0__1__Impl : ( '<' ) ;
+    // InternalTableDSL.g:15011:1: rule__OpOther__Group_6_1_0_0__1__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15636:1: ( ( '<' ) )
-            // InternalTableDSL.g:15637:1: ( '<' )
+            // InternalTableDSL.g:15015:1: ( ( '<' ) )
+            // InternalTableDSL.g:15016:1: ( '<' )
             {
-            // InternalTableDSL.g:15637:1: ( '<' )
-            // InternalTableDSL.g:15638:2: '<'
+            // InternalTableDSL.g:15016:1: ( '<' )
+            // InternalTableDSL.g:15017:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_1()); 
@@ -52092,16 +50134,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__0"
-    // InternalTableDSL.g:15648:1: rule__XAdditiveExpression__Group__0 : rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 ;
+    // InternalTableDSL.g:15027:1: rule__XAdditiveExpression__Group__0 : rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 ;
     public final void rule__XAdditiveExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15652:1: ( rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 )
-            // InternalTableDSL.g:15653:2: rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1
+            // InternalTableDSL.g:15031:1: ( rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 )
+            // InternalTableDSL.g:15032:2: rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1
             {
-            pushFollow(FOLLOW_124);
+            pushFollow(FOLLOW_123);
             rule__XAdditiveExpression__Group__0__Impl();
 
             state._fsp--;
@@ -52130,17 +50172,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__0__Impl"
-    // InternalTableDSL.g:15660:1: rule__XAdditiveExpression__Group__0__Impl : ( ruleXMultiplicativeExpression ) ;
+    // InternalTableDSL.g:15039:1: rule__XAdditiveExpression__Group__0__Impl : ( ruleXMultiplicativeExpression ) ;
     public final void rule__XAdditiveExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15664:1: ( ( ruleXMultiplicativeExpression ) )
-            // InternalTableDSL.g:15665:1: ( ruleXMultiplicativeExpression )
+            // InternalTableDSL.g:15043:1: ( ( ruleXMultiplicativeExpression ) )
+            // InternalTableDSL.g:15044:1: ( ruleXMultiplicativeExpression )
             {
-            // InternalTableDSL.g:15665:1: ( ruleXMultiplicativeExpression )
-            // InternalTableDSL.g:15666:2: ruleXMultiplicativeExpression
+            // InternalTableDSL.g:15044:1: ( ruleXMultiplicativeExpression )
+            // InternalTableDSL.g:15045:2: ruleXMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getXMultiplicativeExpressionParserRuleCall_0()); 
@@ -52175,14 +50217,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__1"
-    // InternalTableDSL.g:15675:1: rule__XAdditiveExpression__Group__1 : rule__XAdditiveExpression__Group__1__Impl ;
+    // InternalTableDSL.g:15054:1: rule__XAdditiveExpression__Group__1 : rule__XAdditiveExpression__Group__1__Impl ;
     public final void rule__XAdditiveExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15679:1: ( rule__XAdditiveExpression__Group__1__Impl )
-            // InternalTableDSL.g:15680:2: rule__XAdditiveExpression__Group__1__Impl
+            // InternalTableDSL.g:15058:1: ( rule__XAdditiveExpression__Group__1__Impl )
+            // InternalTableDSL.g:15059:2: rule__XAdditiveExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group__1__Impl();
@@ -52208,52 +50250,52 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__1__Impl"
-    // InternalTableDSL.g:15686:1: rule__XAdditiveExpression__Group__1__Impl : ( ( rule__XAdditiveExpression__Group_1__0 )* ) ;
+    // InternalTableDSL.g:15065:1: rule__XAdditiveExpression__Group__1__Impl : ( ( rule__XAdditiveExpression__Group_1__0 )* ) ;
     public final void rule__XAdditiveExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15690:1: ( ( ( rule__XAdditiveExpression__Group_1__0 )* ) )
-            // InternalTableDSL.g:15691:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
+            // InternalTableDSL.g:15069:1: ( ( ( rule__XAdditiveExpression__Group_1__0 )* ) )
+            // InternalTableDSL.g:15070:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
             {
-            // InternalTableDSL.g:15691:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
-            // InternalTableDSL.g:15692:2: ( rule__XAdditiveExpression__Group_1__0 )*
+            // InternalTableDSL.g:15070:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
+            // InternalTableDSL.g:15071:2: ( rule__XAdditiveExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1()); 
             }
-            // InternalTableDSL.g:15693:2: ( rule__XAdditiveExpression__Group_1__0 )*
-            loop108:
+            // InternalTableDSL.g:15072:2: ( rule__XAdditiveExpression__Group_1__0 )*
+            loop106:
             do {
-                int alt108=2;
-                int LA108_0 = input.LA(1);
+                int alt106=2;
+                int LA106_0 = input.LA(1);
 
-                if ( (LA108_0==20) ) {
-                    int LA108_2 = input.LA(2);
+                if ( (LA106_0==20) ) {
+                    int LA106_2 = input.LA(2);
 
-                    if ( (synpred186_InternalTableDSL()) ) {
-                        alt108=1;
+                    if ( (synpred184_InternalTableDSL()) ) {
+                        alt106=1;
                     }
 
 
                 }
-                else if ( (LA108_0==19) ) {
-                    int LA108_3 = input.LA(2);
+                else if ( (LA106_0==19) ) {
+                    int LA106_3 = input.LA(2);
 
-                    if ( (synpred186_InternalTableDSL()) ) {
-                        alt108=1;
+                    if ( (synpred184_InternalTableDSL()) ) {
+                        alt106=1;
                     }
 
 
                 }
 
 
-                switch (alt108) {
+                switch (alt106) {
             	case 1 :
-            	    // InternalTableDSL.g:15693:3: rule__XAdditiveExpression__Group_1__0
+            	    // InternalTableDSL.g:15072:3: rule__XAdditiveExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_125);
+            	    pushFollow(FOLLOW_124);
             	    rule__XAdditiveExpression__Group_1__0();
 
             	    state._fsp--;
@@ -52263,7 +50305,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop108;
+            	    break loop106;
                 }
             } while (true);
 
@@ -52292,16 +50334,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__0"
-    // InternalTableDSL.g:15702:1: rule__XAdditiveExpression__Group_1__0 : rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 ;
+    // InternalTableDSL.g:15081:1: rule__XAdditiveExpression__Group_1__0 : rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 ;
     public final void rule__XAdditiveExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15706:1: ( rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 )
-            // InternalTableDSL.g:15707:2: rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1
+            // InternalTableDSL.g:15085:1: ( rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 )
+            // InternalTableDSL.g:15086:2: rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XAdditiveExpression__Group_1__0__Impl();
 
             state._fsp--;
@@ -52330,23 +50372,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__0__Impl"
-    // InternalTableDSL.g:15714:1: rule__XAdditiveExpression__Group_1__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) ;
+    // InternalTableDSL.g:15093:1: rule__XAdditiveExpression__Group_1__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) ;
     public final void rule__XAdditiveExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15718:1: ( ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) )
-            // InternalTableDSL.g:15719:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
+            // InternalTableDSL.g:15097:1: ( ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) )
+            // InternalTableDSL.g:15098:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
             {
-            // InternalTableDSL.g:15719:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
-            // InternalTableDSL.g:15720:2: ( rule__XAdditiveExpression__Group_1_0__0 )
+            // InternalTableDSL.g:15098:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
+            // InternalTableDSL.g:15099:2: ( rule__XAdditiveExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1_0()); 
             }
-            // InternalTableDSL.g:15721:2: ( rule__XAdditiveExpression__Group_1_0__0 )
-            // InternalTableDSL.g:15721:3: rule__XAdditiveExpression__Group_1_0__0
+            // InternalTableDSL.g:15100:2: ( rule__XAdditiveExpression__Group_1_0__0 )
+            // InternalTableDSL.g:15100:3: rule__XAdditiveExpression__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0__0();
@@ -52381,14 +50423,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__1"
-    // InternalTableDSL.g:15729:1: rule__XAdditiveExpression__Group_1__1 : rule__XAdditiveExpression__Group_1__1__Impl ;
+    // InternalTableDSL.g:15108:1: rule__XAdditiveExpression__Group_1__1 : rule__XAdditiveExpression__Group_1__1__Impl ;
     public final void rule__XAdditiveExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15733:1: ( rule__XAdditiveExpression__Group_1__1__Impl )
-            // InternalTableDSL.g:15734:2: rule__XAdditiveExpression__Group_1__1__Impl
+            // InternalTableDSL.g:15112:1: ( rule__XAdditiveExpression__Group_1__1__Impl )
+            // InternalTableDSL.g:15113:2: rule__XAdditiveExpression__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1__1__Impl();
@@ -52414,23 +50456,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__1__Impl"
-    // InternalTableDSL.g:15740:1: rule__XAdditiveExpression__Group_1__1__Impl : ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalTableDSL.g:15119:1: rule__XAdditiveExpression__Group_1__1__Impl : ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XAdditiveExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15744:1: ( ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) )
-            // InternalTableDSL.g:15745:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
+            // InternalTableDSL.g:15123:1: ( ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalTableDSL.g:15124:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
             {
-            // InternalTableDSL.g:15745:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
-            // InternalTableDSL.g:15746:2: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
+            // InternalTableDSL.g:15124:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
+            // InternalTableDSL.g:15125:2: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // InternalTableDSL.g:15747:2: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
-            // InternalTableDSL.g:15747:3: rule__XAdditiveExpression__RightOperandAssignment_1_1
+            // InternalTableDSL.g:15126:2: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
+            // InternalTableDSL.g:15126:3: rule__XAdditiveExpression__RightOperandAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__RightOperandAssignment_1_1();
@@ -52465,14 +50507,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0__0"
-    // InternalTableDSL.g:15756:1: rule__XAdditiveExpression__Group_1_0__0 : rule__XAdditiveExpression__Group_1_0__0__Impl ;
+    // InternalTableDSL.g:15135:1: rule__XAdditiveExpression__Group_1_0__0 : rule__XAdditiveExpression__Group_1_0__0__Impl ;
     public final void rule__XAdditiveExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15760:1: ( rule__XAdditiveExpression__Group_1_0__0__Impl )
-            // InternalTableDSL.g:15761:2: rule__XAdditiveExpression__Group_1_0__0__Impl
+            // InternalTableDSL.g:15139:1: ( rule__XAdditiveExpression__Group_1_0__0__Impl )
+            // InternalTableDSL.g:15140:2: rule__XAdditiveExpression__Group_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0__0__Impl();
@@ -52498,23 +50540,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0__0__Impl"
-    // InternalTableDSL.g:15767:1: rule__XAdditiveExpression__Group_1_0__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) ;
+    // InternalTableDSL.g:15146:1: rule__XAdditiveExpression__Group_1_0__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XAdditiveExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15771:1: ( ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) )
-            // InternalTableDSL.g:15772:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:15150:1: ( ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) )
+            // InternalTableDSL.g:15151:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
             {
-            // InternalTableDSL.g:15772:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
-            // InternalTableDSL.g:15773:2: ( rule__XAdditiveExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:15151:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:15152:2: ( rule__XAdditiveExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalTableDSL.g:15774:2: ( rule__XAdditiveExpression__Group_1_0_0__0 )
-            // InternalTableDSL.g:15774:3: rule__XAdditiveExpression__Group_1_0_0__0
+            // InternalTableDSL.g:15153:2: ( rule__XAdditiveExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:15153:3: rule__XAdditiveExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0_0__0();
@@ -52549,16 +50591,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__0"
-    // InternalTableDSL.g:15783:1: rule__XAdditiveExpression__Group_1_0_0__0 : rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 ;
+    // InternalTableDSL.g:15162:1: rule__XAdditiveExpression__Group_1_0_0__0 : rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 ;
     public final void rule__XAdditiveExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15787:1: ( rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 )
-            // InternalTableDSL.g:15788:2: rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1
+            // InternalTableDSL.g:15166:1: ( rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 )
+            // InternalTableDSL.g:15167:2: rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_124);
+            pushFollow(FOLLOW_123);
             rule__XAdditiveExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -52587,23 +50629,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__0__Impl"
-    // InternalTableDSL.g:15795:1: rule__XAdditiveExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:15174:1: rule__XAdditiveExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XAdditiveExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15799:1: ( ( () ) )
-            // InternalTableDSL.g:15800:1: ( () )
+            // InternalTableDSL.g:15178:1: ( ( () ) )
+            // InternalTableDSL.g:15179:1: ( () )
             {
-            // InternalTableDSL.g:15800:1: ( () )
-            // InternalTableDSL.g:15801:2: ()
+            // InternalTableDSL.g:15179:1: ( () )
+            // InternalTableDSL.g:15180:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // InternalTableDSL.g:15802:2: ()
-            // InternalTableDSL.g:15802:3: 
+            // InternalTableDSL.g:15181:2: ()
+            // InternalTableDSL.g:15181:3: 
             {
             }
 
@@ -52628,14 +50670,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__1"
-    // InternalTableDSL.g:15810:1: rule__XAdditiveExpression__Group_1_0_0__1 : rule__XAdditiveExpression__Group_1_0_0__1__Impl ;
+    // InternalTableDSL.g:15189:1: rule__XAdditiveExpression__Group_1_0_0__1 : rule__XAdditiveExpression__Group_1_0_0__1__Impl ;
     public final void rule__XAdditiveExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15814:1: ( rule__XAdditiveExpression__Group_1_0_0__1__Impl )
-            // InternalTableDSL.g:15815:2: rule__XAdditiveExpression__Group_1_0_0__1__Impl
+            // InternalTableDSL.g:15193:1: ( rule__XAdditiveExpression__Group_1_0_0__1__Impl )
+            // InternalTableDSL.g:15194:2: rule__XAdditiveExpression__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0_0__1__Impl();
@@ -52661,23 +50703,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__1__Impl"
-    // InternalTableDSL.g:15821:1: rule__XAdditiveExpression__Group_1_0_0__1__Impl : ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalTableDSL.g:15200:1: rule__XAdditiveExpression__Group_1_0_0__1__Impl : ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XAdditiveExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15825:1: ( ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // InternalTableDSL.g:15826:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalTableDSL.g:15204:1: ( ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalTableDSL.g:15205:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // InternalTableDSL.g:15826:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
-            // InternalTableDSL.g:15827:2: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
+            // InternalTableDSL.g:15205:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalTableDSL.g:15206:2: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // InternalTableDSL.g:15828:2: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
-            // InternalTableDSL.g:15828:3: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1
+            // InternalTableDSL.g:15207:2: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
+            // InternalTableDSL.g:15207:3: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__FeatureAssignment_1_0_0_1();
@@ -52712,16 +50754,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__0"
-    // InternalTableDSL.g:15837:1: rule__XMultiplicativeExpression__Group__0 : rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 ;
+    // InternalTableDSL.g:15216:1: rule__XMultiplicativeExpression__Group__0 : rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 ;
     public final void rule__XMultiplicativeExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15841:1: ( rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 )
-            // InternalTableDSL.g:15842:2: rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1
+            // InternalTableDSL.g:15220:1: ( rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 )
+            // InternalTableDSL.g:15221:2: rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1
             {
-            pushFollow(FOLLOW_126);
+            pushFollow(FOLLOW_125);
             rule__XMultiplicativeExpression__Group__0__Impl();
 
             state._fsp--;
@@ -52750,17 +50792,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__0__Impl"
-    // InternalTableDSL.g:15849:1: rule__XMultiplicativeExpression__Group__0__Impl : ( ruleXUnaryOperation ) ;
+    // InternalTableDSL.g:15228:1: rule__XMultiplicativeExpression__Group__0__Impl : ( ruleXUnaryOperation ) ;
     public final void rule__XMultiplicativeExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15853:1: ( ( ruleXUnaryOperation ) )
-            // InternalTableDSL.g:15854:1: ( ruleXUnaryOperation )
+            // InternalTableDSL.g:15232:1: ( ( ruleXUnaryOperation ) )
+            // InternalTableDSL.g:15233:1: ( ruleXUnaryOperation )
             {
-            // InternalTableDSL.g:15854:1: ( ruleXUnaryOperation )
-            // InternalTableDSL.g:15855:2: ruleXUnaryOperation
+            // InternalTableDSL.g:15233:1: ( ruleXUnaryOperation )
+            // InternalTableDSL.g:15234:2: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getXUnaryOperationParserRuleCall_0()); 
@@ -52795,14 +50837,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__1"
-    // InternalTableDSL.g:15864:1: rule__XMultiplicativeExpression__Group__1 : rule__XMultiplicativeExpression__Group__1__Impl ;
+    // InternalTableDSL.g:15243:1: rule__XMultiplicativeExpression__Group__1 : rule__XMultiplicativeExpression__Group__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15868:1: ( rule__XMultiplicativeExpression__Group__1__Impl )
-            // InternalTableDSL.g:15869:2: rule__XMultiplicativeExpression__Group__1__Impl
+            // InternalTableDSL.g:15247:1: ( rule__XMultiplicativeExpression__Group__1__Impl )
+            // InternalTableDSL.g:15248:2: rule__XMultiplicativeExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group__1__Impl();
@@ -52828,32 +50870,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__1__Impl"
-    // InternalTableDSL.g:15875:1: rule__XMultiplicativeExpression__Group__1__Impl : ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) ;
+    // InternalTableDSL.g:15254:1: rule__XMultiplicativeExpression__Group__1__Impl : ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) ;
     public final void rule__XMultiplicativeExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15879:1: ( ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) )
-            // InternalTableDSL.g:15880:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
+            // InternalTableDSL.g:15258:1: ( ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) )
+            // InternalTableDSL.g:15259:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
             {
-            // InternalTableDSL.g:15880:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
-            // InternalTableDSL.g:15881:2: ( rule__XMultiplicativeExpression__Group_1__0 )*
+            // InternalTableDSL.g:15259:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
+            // InternalTableDSL.g:15260:2: ( rule__XMultiplicativeExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1()); 
             }
-            // InternalTableDSL.g:15882:2: ( rule__XMultiplicativeExpression__Group_1__0 )*
-            loop109:
+            // InternalTableDSL.g:15261:2: ( rule__XMultiplicativeExpression__Group_1__0 )*
+            loop107:
             do {
-                int alt109=2;
+                int alt107=2;
                 switch ( input.LA(1) ) {
                 case 39:
                     {
-                    int LA109_2 = input.LA(2);
+                    int LA107_2 = input.LA(2);
 
-                    if ( (synpred187_InternalTableDSL()) ) {
-                        alt109=1;
+                    if ( (synpred185_InternalTableDSL()) ) {
+                        alt107=1;
                     }
 
 
@@ -52861,10 +50903,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     break;
                 case 40:
                     {
-                    int LA109_3 = input.LA(2);
+                    int LA107_3 = input.LA(2);
 
-                    if ( (synpred187_InternalTableDSL()) ) {
-                        alt109=1;
+                    if ( (synpred185_InternalTableDSL()) ) {
+                        alt107=1;
                     }
 
 
@@ -52872,10 +50914,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     break;
                 case 41:
                     {
-                    int LA109_4 = input.LA(2);
+                    int LA107_4 = input.LA(2);
 
-                    if ( (synpred187_InternalTableDSL()) ) {
-                        alt109=1;
+                    if ( (synpred185_InternalTableDSL()) ) {
+                        alt107=1;
                     }
 
 
@@ -52883,10 +50925,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     break;
                 case 42:
                     {
-                    int LA109_5 = input.LA(2);
+                    int LA107_5 = input.LA(2);
 
-                    if ( (synpred187_InternalTableDSL()) ) {
-                        alt109=1;
+                    if ( (synpred185_InternalTableDSL()) ) {
+                        alt107=1;
                     }
 
 
@@ -52895,11 +50937,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
                 }
 
-                switch (alt109) {
+                switch (alt107) {
             	case 1 :
-            	    // InternalTableDSL.g:15882:3: rule__XMultiplicativeExpression__Group_1__0
+            	    // InternalTableDSL.g:15261:3: rule__XMultiplicativeExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_127);
+            	    pushFollow(FOLLOW_126);
             	    rule__XMultiplicativeExpression__Group_1__0();
 
             	    state._fsp--;
@@ -52909,7 +50951,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop109;
+            	    break loop107;
                 }
             } while (true);
 
@@ -52938,16 +50980,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__0"
-    // InternalTableDSL.g:15891:1: rule__XMultiplicativeExpression__Group_1__0 : rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 ;
+    // InternalTableDSL.g:15270:1: rule__XMultiplicativeExpression__Group_1__0 : rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 ;
     public final void rule__XMultiplicativeExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15895:1: ( rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 )
-            // InternalTableDSL.g:15896:2: rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1
+            // InternalTableDSL.g:15274:1: ( rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 )
+            // InternalTableDSL.g:15275:2: rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XMultiplicativeExpression__Group_1__0__Impl();
 
             state._fsp--;
@@ -52976,23 +51018,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__0__Impl"
-    // InternalTableDSL.g:15903:1: rule__XMultiplicativeExpression__Group_1__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) ;
+    // InternalTableDSL.g:15282:1: rule__XMultiplicativeExpression__Group_1__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15907:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) )
-            // InternalTableDSL.g:15908:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
+            // InternalTableDSL.g:15286:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) )
+            // InternalTableDSL.g:15287:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
             {
-            // InternalTableDSL.g:15908:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
-            // InternalTableDSL.g:15909:2: ( rule__XMultiplicativeExpression__Group_1_0__0 )
+            // InternalTableDSL.g:15287:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
+            // InternalTableDSL.g:15288:2: ( rule__XMultiplicativeExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1_0()); 
             }
-            // InternalTableDSL.g:15910:2: ( rule__XMultiplicativeExpression__Group_1_0__0 )
-            // InternalTableDSL.g:15910:3: rule__XMultiplicativeExpression__Group_1_0__0
+            // InternalTableDSL.g:15289:2: ( rule__XMultiplicativeExpression__Group_1_0__0 )
+            // InternalTableDSL.g:15289:3: rule__XMultiplicativeExpression__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0__0();
@@ -53027,14 +51069,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__1"
-    // InternalTableDSL.g:15918:1: rule__XMultiplicativeExpression__Group_1__1 : rule__XMultiplicativeExpression__Group_1__1__Impl ;
+    // InternalTableDSL.g:15297:1: rule__XMultiplicativeExpression__Group_1__1 : rule__XMultiplicativeExpression__Group_1__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15922:1: ( rule__XMultiplicativeExpression__Group_1__1__Impl )
-            // InternalTableDSL.g:15923:2: rule__XMultiplicativeExpression__Group_1__1__Impl
+            // InternalTableDSL.g:15301:1: ( rule__XMultiplicativeExpression__Group_1__1__Impl )
+            // InternalTableDSL.g:15302:2: rule__XMultiplicativeExpression__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1__1__Impl();
@@ -53060,23 +51102,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__1__Impl"
-    // InternalTableDSL.g:15929:1: rule__XMultiplicativeExpression__Group_1__1__Impl : ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalTableDSL.g:15308:1: rule__XMultiplicativeExpression__Group_1__1__Impl : ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15933:1: ( ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) )
-            // InternalTableDSL.g:15934:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
+            // InternalTableDSL.g:15312:1: ( ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalTableDSL.g:15313:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
             {
-            // InternalTableDSL.g:15934:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
-            // InternalTableDSL.g:15935:2: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
+            // InternalTableDSL.g:15313:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
+            // InternalTableDSL.g:15314:2: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // InternalTableDSL.g:15936:2: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
-            // InternalTableDSL.g:15936:3: rule__XMultiplicativeExpression__RightOperandAssignment_1_1
+            // InternalTableDSL.g:15315:2: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
+            // InternalTableDSL.g:15315:3: rule__XMultiplicativeExpression__RightOperandAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__RightOperandAssignment_1_1();
@@ -53111,14 +51153,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0__0"
-    // InternalTableDSL.g:15945:1: rule__XMultiplicativeExpression__Group_1_0__0 : rule__XMultiplicativeExpression__Group_1_0__0__Impl ;
+    // InternalTableDSL.g:15324:1: rule__XMultiplicativeExpression__Group_1_0__0 : rule__XMultiplicativeExpression__Group_1_0__0__Impl ;
     public final void rule__XMultiplicativeExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15949:1: ( rule__XMultiplicativeExpression__Group_1_0__0__Impl )
-            // InternalTableDSL.g:15950:2: rule__XMultiplicativeExpression__Group_1_0__0__Impl
+            // InternalTableDSL.g:15328:1: ( rule__XMultiplicativeExpression__Group_1_0__0__Impl )
+            // InternalTableDSL.g:15329:2: rule__XMultiplicativeExpression__Group_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0__0__Impl();
@@ -53144,23 +51186,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0__0__Impl"
-    // InternalTableDSL.g:15956:1: rule__XMultiplicativeExpression__Group_1_0__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) ;
+    // InternalTableDSL.g:15335:1: rule__XMultiplicativeExpression__Group_1_0__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15960:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) )
-            // InternalTableDSL.g:15961:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:15339:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) )
+            // InternalTableDSL.g:15340:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
             {
-            // InternalTableDSL.g:15961:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
-            // InternalTableDSL.g:15962:2: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:15340:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:15341:2: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalTableDSL.g:15963:2: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
-            // InternalTableDSL.g:15963:3: rule__XMultiplicativeExpression__Group_1_0_0__0
+            // InternalTableDSL.g:15342:2: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:15342:3: rule__XMultiplicativeExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0_0__0();
@@ -53195,16 +51237,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__0"
-    // InternalTableDSL.g:15972:1: rule__XMultiplicativeExpression__Group_1_0_0__0 : rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 ;
+    // InternalTableDSL.g:15351:1: rule__XMultiplicativeExpression__Group_1_0_0__0 : rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15976:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 )
-            // InternalTableDSL.g:15977:2: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1
+            // InternalTableDSL.g:15355:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 )
+            // InternalTableDSL.g:15356:2: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_126);
+            pushFollow(FOLLOW_125);
             rule__XMultiplicativeExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -53233,23 +51275,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__0__Impl"
-    // InternalTableDSL.g:15984:1: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:15363:1: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:15988:1: ( ( () ) )
-            // InternalTableDSL.g:15989:1: ( () )
+            // InternalTableDSL.g:15367:1: ( ( () ) )
+            // InternalTableDSL.g:15368:1: ( () )
             {
-            // InternalTableDSL.g:15989:1: ( () )
-            // InternalTableDSL.g:15990:2: ()
+            // InternalTableDSL.g:15368:1: ( () )
+            // InternalTableDSL.g:15369:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // InternalTableDSL.g:15991:2: ()
-            // InternalTableDSL.g:15991:3: 
+            // InternalTableDSL.g:15370:2: ()
+            // InternalTableDSL.g:15370:3: 
             {
             }
 
@@ -53274,14 +51316,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__1"
-    // InternalTableDSL.g:15999:1: rule__XMultiplicativeExpression__Group_1_0_0__1 : rule__XMultiplicativeExpression__Group_1_0_0__1__Impl ;
+    // InternalTableDSL.g:15378:1: rule__XMultiplicativeExpression__Group_1_0_0__1 : rule__XMultiplicativeExpression__Group_1_0_0__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16003:1: ( rule__XMultiplicativeExpression__Group_1_0_0__1__Impl )
-            // InternalTableDSL.g:16004:2: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl
+            // InternalTableDSL.g:15382:1: ( rule__XMultiplicativeExpression__Group_1_0_0__1__Impl )
+            // InternalTableDSL.g:15383:2: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0_0__1__Impl();
@@ -53307,23 +51349,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__1__Impl"
-    // InternalTableDSL.g:16010:1: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl : ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalTableDSL.g:15389:1: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl : ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16014:1: ( ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // InternalTableDSL.g:16015:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalTableDSL.g:15393:1: ( ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalTableDSL.g:15394:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // InternalTableDSL.g:16015:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
-            // InternalTableDSL.g:16016:2: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
+            // InternalTableDSL.g:15394:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalTableDSL.g:15395:2: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // InternalTableDSL.g:16017:2: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
-            // InternalTableDSL.g:16017:3: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1
+            // InternalTableDSL.g:15396:2: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
+            // InternalTableDSL.g:15396:3: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1();
@@ -53358,16 +51400,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__0"
-    // InternalTableDSL.g:16026:1: rule__XUnaryOperation__Group_0__0 : rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 ;
+    // InternalTableDSL.g:15405:1: rule__XUnaryOperation__Group_0__0 : rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 ;
     public final void rule__XUnaryOperation__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16030:1: ( rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 )
-            // InternalTableDSL.g:16031:2: rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1
+            // InternalTableDSL.g:15409:1: ( rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 )
+            // InternalTableDSL.g:15410:2: rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1
             {
-            pushFollow(FOLLOW_128);
+            pushFollow(FOLLOW_127);
             rule__XUnaryOperation__Group_0__0__Impl();
 
             state._fsp--;
@@ -53396,23 +51438,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__0__Impl"
-    // InternalTableDSL.g:16038:1: rule__XUnaryOperation__Group_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:15417:1: rule__XUnaryOperation__Group_0__0__Impl : ( () ) ;
     public final void rule__XUnaryOperation__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16042:1: ( ( () ) )
-            // InternalTableDSL.g:16043:1: ( () )
+            // InternalTableDSL.g:15421:1: ( ( () ) )
+            // InternalTableDSL.g:15422:1: ( () )
             {
-            // InternalTableDSL.g:16043:1: ( () )
-            // InternalTableDSL.g:16044:2: ()
+            // InternalTableDSL.g:15422:1: ( () )
+            // InternalTableDSL.g:15423:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getXUnaryOperationAction_0_0()); 
             }
-            // InternalTableDSL.g:16045:2: ()
-            // InternalTableDSL.g:16045:3: 
+            // InternalTableDSL.g:15424:2: ()
+            // InternalTableDSL.g:15424:3: 
             {
             }
 
@@ -53437,16 +51479,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__1"
-    // InternalTableDSL.g:16053:1: rule__XUnaryOperation__Group_0__1 : rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 ;
+    // InternalTableDSL.g:15432:1: rule__XUnaryOperation__Group_0__1 : rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 ;
     public final void rule__XUnaryOperation__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16057:1: ( rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 )
-            // InternalTableDSL.g:16058:2: rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2
+            // InternalTableDSL.g:15436:1: ( rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 )
+            // InternalTableDSL.g:15437:2: rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XUnaryOperation__Group_0__1__Impl();
 
             state._fsp--;
@@ -53475,23 +51517,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__1__Impl"
-    // InternalTableDSL.g:16065:1: rule__XUnaryOperation__Group_0__1__Impl : ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) ;
+    // InternalTableDSL.g:15444:1: rule__XUnaryOperation__Group_0__1__Impl : ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) ;
     public final void rule__XUnaryOperation__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16069:1: ( ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) )
-            // InternalTableDSL.g:16070:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
+            // InternalTableDSL.g:15448:1: ( ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) )
+            // InternalTableDSL.g:15449:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
             {
-            // InternalTableDSL.g:16070:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
-            // InternalTableDSL.g:16071:2: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
+            // InternalTableDSL.g:15449:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
+            // InternalTableDSL.g:15450:2: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureAssignment_0_1()); 
             }
-            // InternalTableDSL.g:16072:2: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
-            // InternalTableDSL.g:16072:3: rule__XUnaryOperation__FeatureAssignment_0_1
+            // InternalTableDSL.g:15451:2: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
+            // InternalTableDSL.g:15451:3: rule__XUnaryOperation__FeatureAssignment_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XUnaryOperation__FeatureAssignment_0_1();
@@ -53526,14 +51568,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__2"
-    // InternalTableDSL.g:16080:1: rule__XUnaryOperation__Group_0__2 : rule__XUnaryOperation__Group_0__2__Impl ;
+    // InternalTableDSL.g:15459:1: rule__XUnaryOperation__Group_0__2 : rule__XUnaryOperation__Group_0__2__Impl ;
     public final void rule__XUnaryOperation__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16084:1: ( rule__XUnaryOperation__Group_0__2__Impl )
-            // InternalTableDSL.g:16085:2: rule__XUnaryOperation__Group_0__2__Impl
+            // InternalTableDSL.g:15463:1: ( rule__XUnaryOperation__Group_0__2__Impl )
+            // InternalTableDSL.g:15464:2: rule__XUnaryOperation__Group_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XUnaryOperation__Group_0__2__Impl();
@@ -53559,23 +51601,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__2__Impl"
-    // InternalTableDSL.g:16091:1: rule__XUnaryOperation__Group_0__2__Impl : ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) ;
+    // InternalTableDSL.g:15470:1: rule__XUnaryOperation__Group_0__2__Impl : ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) ;
     public final void rule__XUnaryOperation__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16095:1: ( ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) )
-            // InternalTableDSL.g:16096:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
+            // InternalTableDSL.g:15474:1: ( ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) )
+            // InternalTableDSL.g:15475:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
             {
-            // InternalTableDSL.g:16096:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
-            // InternalTableDSL.g:16097:2: ( rule__XUnaryOperation__OperandAssignment_0_2 )
+            // InternalTableDSL.g:15475:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
+            // InternalTableDSL.g:15476:2: ( rule__XUnaryOperation__OperandAssignment_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getOperandAssignment_0_2()); 
             }
-            // InternalTableDSL.g:16098:2: ( rule__XUnaryOperation__OperandAssignment_0_2 )
-            // InternalTableDSL.g:16098:3: rule__XUnaryOperation__OperandAssignment_0_2
+            // InternalTableDSL.g:15477:2: ( rule__XUnaryOperation__OperandAssignment_0_2 )
+            // InternalTableDSL.g:15477:3: rule__XUnaryOperation__OperandAssignment_0_2
             {
             pushFollow(FOLLOW_2);
             rule__XUnaryOperation__OperandAssignment_0_2();
@@ -53610,16 +51652,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCastedExpression__Group__0"
-    // InternalTableDSL.g:16107:1: rule__XCastedExpression__Group__0 : rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 ;
+    // InternalTableDSL.g:15486:1: rule__XCastedExpression__Group__0 : rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 ;
     public final void rule__XCastedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16111:1: ( rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 )
-            // InternalTableDSL.g:16112:2: rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1
+            // InternalTableDSL.g:15490:1: ( rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 )
+            // InternalTableDSL.g:15491:2: rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1
             {
-            pushFollow(FOLLOW_129);
+            pushFollow(FOLLOW_128);
             rule__XCastedExpression__Group__0__Impl();
 
             state._fsp--;
@@ -53648,17 +51690,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCastedExpression__Group__0__Impl"
-    // InternalTableDSL.g:16119:1: rule__XCastedExpression__Group__0__Impl : ( ruleXPostfixOperation ) ;
+    // InternalTableDSL.g:15498:1: rule__XCastedExpression__Group__0__Impl : ( ruleXPostfixOperation ) ;
     public final void rule__XCastedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16123:1: ( ( ruleXPostfixOperation ) )
-            // InternalTableDSL.g:16124:1: ( ruleXPostfixOperation )
+            // InternalTableDSL.g:15502:1: ( ( ruleXPostfixOperation ) )
+            // InternalTableDSL.g:15503:1: ( ruleXPostfixOperation )
             {
-            // InternalTableDSL.g:16124:1: ( ruleXPostfixOperation )
-            // InternalTableDSL.g:16125:2: ruleXPostfixOperation
+            // InternalTableDSL.g:15503:1: ( ruleXPostfixOperation )
+            // InternalTableDSL.g:15504:2: ruleXPostfixOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getXPostfixOperationParserRuleCall_0()); 
@@ -53693,14 +51735,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCastedExpression__Group__1"
-    // InternalTableDSL.g:16134:1: rule__XCastedExpression__Group__1 : rule__XCastedExpression__Group__1__Impl ;
+    // InternalTableDSL.g:15513:1: rule__XCastedExpression__Group__1 : rule__XCastedExpression__Group__1__Impl ;
     public final void rule__XCastedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16138:1: ( rule__XCastedExpression__Group__1__Impl )
-            // InternalTableDSL.g:16139:2: rule__XCastedExpression__Group__1__Impl
+            // InternalTableDSL.g:15517:1: ( rule__XCastedExpression__Group__1__Impl )
+            // InternalTableDSL.g:15518:2: rule__XCastedExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group__1__Impl();
@@ -53726,43 +51768,43 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCastedExpression__Group__1__Impl"
-    // InternalTableDSL.g:16145:1: rule__XCastedExpression__Group__1__Impl : ( ( rule__XCastedExpression__Group_1__0 )* ) ;
+    // InternalTableDSL.g:15524:1: rule__XCastedExpression__Group__1__Impl : ( ( rule__XCastedExpression__Group_1__0 )* ) ;
     public final void rule__XCastedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16149:1: ( ( ( rule__XCastedExpression__Group_1__0 )* ) )
-            // InternalTableDSL.g:16150:1: ( ( rule__XCastedExpression__Group_1__0 )* )
+            // InternalTableDSL.g:15528:1: ( ( ( rule__XCastedExpression__Group_1__0 )* ) )
+            // InternalTableDSL.g:15529:1: ( ( rule__XCastedExpression__Group_1__0 )* )
             {
-            // InternalTableDSL.g:16150:1: ( ( rule__XCastedExpression__Group_1__0 )* )
-            // InternalTableDSL.g:16151:2: ( rule__XCastedExpression__Group_1__0 )*
+            // InternalTableDSL.g:15529:1: ( ( rule__XCastedExpression__Group_1__0 )* )
+            // InternalTableDSL.g:15530:2: ( rule__XCastedExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1()); 
             }
-            // InternalTableDSL.g:16152:2: ( rule__XCastedExpression__Group_1__0 )*
-            loop110:
+            // InternalTableDSL.g:15531:2: ( rule__XCastedExpression__Group_1__0 )*
+            loop108:
             do {
-                int alt110=2;
-                int LA110_0 = input.LA(1);
+                int alt108=2;
+                int LA108_0 = input.LA(1);
 
-                if ( (LA110_0==78) ) {
-                    int LA110_2 = input.LA(2);
+                if ( (LA108_0==78) ) {
+                    int LA108_2 = input.LA(2);
 
-                    if ( (synpred188_InternalTableDSL()) ) {
-                        alt110=1;
+                    if ( (synpred186_InternalTableDSL()) ) {
+                        alt108=1;
                     }
 
 
                 }
 
 
-                switch (alt110) {
+                switch (alt108) {
             	case 1 :
-            	    // InternalTableDSL.g:16152:3: rule__XCastedExpression__Group_1__0
+            	    // InternalTableDSL.g:15531:3: rule__XCastedExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_130);
+            	    pushFollow(FOLLOW_129);
             	    rule__XCastedExpression__Group_1__0();
 
             	    state._fsp--;
@@ -53772,7 +51814,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop110;
+            	    break loop108;
                 }
             } while (true);
 
@@ -53801,16 +51843,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__0"
-    // InternalTableDSL.g:16161:1: rule__XCastedExpression__Group_1__0 : rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 ;
+    // InternalTableDSL.g:15540:1: rule__XCastedExpression__Group_1__0 : rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 ;
     public final void rule__XCastedExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16165:1: ( rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 )
-            // InternalTableDSL.g:16166:2: rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1
+            // InternalTableDSL.g:15544:1: ( rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 )
+            // InternalTableDSL.g:15545:2: rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__XCastedExpression__Group_1__0__Impl();
 
             state._fsp--;
@@ -53839,23 +51881,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__0__Impl"
-    // InternalTableDSL.g:16173:1: rule__XCastedExpression__Group_1__0__Impl : ( ( rule__XCastedExpression__Group_1_0__0 ) ) ;
+    // InternalTableDSL.g:15552:1: rule__XCastedExpression__Group_1__0__Impl : ( ( rule__XCastedExpression__Group_1_0__0 ) ) ;
     public final void rule__XCastedExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16177:1: ( ( ( rule__XCastedExpression__Group_1_0__0 ) ) )
-            // InternalTableDSL.g:16178:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
+            // InternalTableDSL.g:15556:1: ( ( ( rule__XCastedExpression__Group_1_0__0 ) ) )
+            // InternalTableDSL.g:15557:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
             {
-            // InternalTableDSL.g:16178:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
-            // InternalTableDSL.g:16179:2: ( rule__XCastedExpression__Group_1_0__0 )
+            // InternalTableDSL.g:15557:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
+            // InternalTableDSL.g:15558:2: ( rule__XCastedExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1_0()); 
             }
-            // InternalTableDSL.g:16180:2: ( rule__XCastedExpression__Group_1_0__0 )
-            // InternalTableDSL.g:16180:3: rule__XCastedExpression__Group_1_0__0
+            // InternalTableDSL.g:15559:2: ( rule__XCastedExpression__Group_1_0__0 )
+            // InternalTableDSL.g:15559:3: rule__XCastedExpression__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0__0();
@@ -53890,14 +51932,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__1"
-    // InternalTableDSL.g:16188:1: rule__XCastedExpression__Group_1__1 : rule__XCastedExpression__Group_1__1__Impl ;
+    // InternalTableDSL.g:15567:1: rule__XCastedExpression__Group_1__1 : rule__XCastedExpression__Group_1__1__Impl ;
     public final void rule__XCastedExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16192:1: ( rule__XCastedExpression__Group_1__1__Impl )
-            // InternalTableDSL.g:16193:2: rule__XCastedExpression__Group_1__1__Impl
+            // InternalTableDSL.g:15571:1: ( rule__XCastedExpression__Group_1__1__Impl )
+            // InternalTableDSL.g:15572:2: rule__XCastedExpression__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1__1__Impl();
@@ -53923,23 +51965,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__1__Impl"
-    // InternalTableDSL.g:16199:1: rule__XCastedExpression__Group_1__1__Impl : ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) ;
+    // InternalTableDSL.g:15578:1: rule__XCastedExpression__Group_1__1__Impl : ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) ;
     public final void rule__XCastedExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16203:1: ( ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) )
-            // InternalTableDSL.g:16204:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
+            // InternalTableDSL.g:15582:1: ( ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) )
+            // InternalTableDSL.g:15583:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
             {
-            // InternalTableDSL.g:16204:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
-            // InternalTableDSL.g:16205:2: ( rule__XCastedExpression__TypeAssignment_1_1 )
+            // InternalTableDSL.g:15583:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
+            // InternalTableDSL.g:15584:2: ( rule__XCastedExpression__TypeAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getTypeAssignment_1_1()); 
             }
-            // InternalTableDSL.g:16206:2: ( rule__XCastedExpression__TypeAssignment_1_1 )
-            // InternalTableDSL.g:16206:3: rule__XCastedExpression__TypeAssignment_1_1
+            // InternalTableDSL.g:15585:2: ( rule__XCastedExpression__TypeAssignment_1_1 )
+            // InternalTableDSL.g:15585:3: rule__XCastedExpression__TypeAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XCastedExpression__TypeAssignment_1_1();
@@ -53974,14 +52016,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0__0"
-    // InternalTableDSL.g:16215:1: rule__XCastedExpression__Group_1_0__0 : rule__XCastedExpression__Group_1_0__0__Impl ;
+    // InternalTableDSL.g:15594:1: rule__XCastedExpression__Group_1_0__0 : rule__XCastedExpression__Group_1_0__0__Impl ;
     public final void rule__XCastedExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16219:1: ( rule__XCastedExpression__Group_1_0__0__Impl )
-            // InternalTableDSL.g:16220:2: rule__XCastedExpression__Group_1_0__0__Impl
+            // InternalTableDSL.g:15598:1: ( rule__XCastedExpression__Group_1_0__0__Impl )
+            // InternalTableDSL.g:15599:2: rule__XCastedExpression__Group_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0__0__Impl();
@@ -54007,23 +52049,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0__0__Impl"
-    // InternalTableDSL.g:16226:1: rule__XCastedExpression__Group_1_0__0__Impl : ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) ;
+    // InternalTableDSL.g:15605:1: rule__XCastedExpression__Group_1_0__0__Impl : ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XCastedExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16230:1: ( ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) )
-            // InternalTableDSL.g:16231:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:15609:1: ( ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) )
+            // InternalTableDSL.g:15610:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
             {
-            // InternalTableDSL.g:16231:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
-            // InternalTableDSL.g:16232:2: ( rule__XCastedExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:15610:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:15611:2: ( rule__XCastedExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalTableDSL.g:16233:2: ( rule__XCastedExpression__Group_1_0_0__0 )
-            // InternalTableDSL.g:16233:3: rule__XCastedExpression__Group_1_0_0__0
+            // InternalTableDSL.g:15612:2: ( rule__XCastedExpression__Group_1_0_0__0 )
+            // InternalTableDSL.g:15612:3: rule__XCastedExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0_0__0();
@@ -54058,16 +52100,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__0"
-    // InternalTableDSL.g:16242:1: rule__XCastedExpression__Group_1_0_0__0 : rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 ;
+    // InternalTableDSL.g:15621:1: rule__XCastedExpression__Group_1_0_0__0 : rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 ;
     public final void rule__XCastedExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16246:1: ( rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 )
-            // InternalTableDSL.g:16247:2: rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1
+            // InternalTableDSL.g:15625:1: ( rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 )
+            // InternalTableDSL.g:15626:2: rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_129);
+            pushFollow(FOLLOW_128);
             rule__XCastedExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -54096,23 +52138,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__0__Impl"
-    // InternalTableDSL.g:16254:1: rule__XCastedExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:15633:1: rule__XCastedExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XCastedExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16258:1: ( ( () ) )
-            // InternalTableDSL.g:16259:1: ( () )
+            // InternalTableDSL.g:15637:1: ( ( () ) )
+            // InternalTableDSL.g:15638:1: ( () )
             {
-            // InternalTableDSL.g:16259:1: ( () )
-            // InternalTableDSL.g:16260:2: ()
+            // InternalTableDSL.g:15638:1: ( () )
+            // InternalTableDSL.g:15639:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()); 
             }
-            // InternalTableDSL.g:16261:2: ()
-            // InternalTableDSL.g:16261:3: 
+            // InternalTableDSL.g:15640:2: ()
+            // InternalTableDSL.g:15640:3: 
             {
             }
 
@@ -54137,14 +52179,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__1"
-    // InternalTableDSL.g:16269:1: rule__XCastedExpression__Group_1_0_0__1 : rule__XCastedExpression__Group_1_0_0__1__Impl ;
+    // InternalTableDSL.g:15648:1: rule__XCastedExpression__Group_1_0_0__1 : rule__XCastedExpression__Group_1_0_0__1__Impl ;
     public final void rule__XCastedExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16273:1: ( rule__XCastedExpression__Group_1_0_0__1__Impl )
-            // InternalTableDSL.g:16274:2: rule__XCastedExpression__Group_1_0_0__1__Impl
+            // InternalTableDSL.g:15652:1: ( rule__XCastedExpression__Group_1_0_0__1__Impl )
+            // InternalTableDSL.g:15653:2: rule__XCastedExpression__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0_0__1__Impl();
@@ -54170,17 +52212,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__1__Impl"
-    // InternalTableDSL.g:16280:1: rule__XCastedExpression__Group_1_0_0__1__Impl : ( 'as' ) ;
+    // InternalTableDSL.g:15659:1: rule__XCastedExpression__Group_1_0_0__1__Impl : ( 'as' ) ;
     public final void rule__XCastedExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16284:1: ( ( 'as' ) )
-            // InternalTableDSL.g:16285:1: ( 'as' )
+            // InternalTableDSL.g:15663:1: ( ( 'as' ) )
+            // InternalTableDSL.g:15664:1: ( 'as' )
             {
-            // InternalTableDSL.g:16285:1: ( 'as' )
-            // InternalTableDSL.g:16286:2: 'as'
+            // InternalTableDSL.g:15664:1: ( 'as' )
+            // InternalTableDSL.g:15665:2: 'as'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1()); 
@@ -54211,16 +52253,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__0"
-    // InternalTableDSL.g:16296:1: rule__XPostfixOperation__Group__0 : rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 ;
+    // InternalTableDSL.g:15675:1: rule__XPostfixOperation__Group__0 : rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 ;
     public final void rule__XPostfixOperation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16300:1: ( rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 )
-            // InternalTableDSL.g:16301:2: rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1
+            // InternalTableDSL.g:15679:1: ( rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 )
+            // InternalTableDSL.g:15680:2: rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1
             {
-            pushFollow(FOLLOW_131);
+            pushFollow(FOLLOW_130);
             rule__XPostfixOperation__Group__0__Impl();
 
             state._fsp--;
@@ -54249,17 +52291,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__0__Impl"
-    // InternalTableDSL.g:16308:1: rule__XPostfixOperation__Group__0__Impl : ( ruleXMemberFeatureCall ) ;
+    // InternalTableDSL.g:15687:1: rule__XPostfixOperation__Group__0__Impl : ( ruleXMemberFeatureCall ) ;
     public final void rule__XPostfixOperation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16312:1: ( ( ruleXMemberFeatureCall ) )
-            // InternalTableDSL.g:16313:1: ( ruleXMemberFeatureCall )
+            // InternalTableDSL.g:15691:1: ( ( ruleXMemberFeatureCall ) )
+            // InternalTableDSL.g:15692:1: ( ruleXMemberFeatureCall )
             {
-            // InternalTableDSL.g:16313:1: ( ruleXMemberFeatureCall )
-            // InternalTableDSL.g:16314:2: ruleXMemberFeatureCall
+            // InternalTableDSL.g:15692:1: ( ruleXMemberFeatureCall )
+            // InternalTableDSL.g:15693:2: ruleXMemberFeatureCall
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getXMemberFeatureCallParserRuleCall_0()); 
@@ -54294,14 +52336,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__1"
-    // InternalTableDSL.g:16323:1: rule__XPostfixOperation__Group__1 : rule__XPostfixOperation__Group__1__Impl ;
+    // InternalTableDSL.g:15702:1: rule__XPostfixOperation__Group__1 : rule__XPostfixOperation__Group__1__Impl ;
     public final void rule__XPostfixOperation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16327:1: ( rule__XPostfixOperation__Group__1__Impl )
-            // InternalTableDSL.g:16328:2: rule__XPostfixOperation__Group__1__Impl
+            // InternalTableDSL.g:15706:1: ( rule__XPostfixOperation__Group__1__Impl )
+            // InternalTableDSL.g:15707:2: rule__XPostfixOperation__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group__1__Impl();
@@ -54327,42 +52369,42 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__1__Impl"
-    // InternalTableDSL.g:16334:1: rule__XPostfixOperation__Group__1__Impl : ( ( rule__XPostfixOperation__Group_1__0 )? ) ;
+    // InternalTableDSL.g:15713:1: rule__XPostfixOperation__Group__1__Impl : ( ( rule__XPostfixOperation__Group_1__0 )? ) ;
     public final void rule__XPostfixOperation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16338:1: ( ( ( rule__XPostfixOperation__Group_1__0 )? ) )
-            // InternalTableDSL.g:16339:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
+            // InternalTableDSL.g:15717:1: ( ( ( rule__XPostfixOperation__Group_1__0 )? ) )
+            // InternalTableDSL.g:15718:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
             {
-            // InternalTableDSL.g:16339:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
-            // InternalTableDSL.g:16340:2: ( rule__XPostfixOperation__Group_1__0 )?
+            // InternalTableDSL.g:15718:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
+            // InternalTableDSL.g:15719:2: ( rule__XPostfixOperation__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup_1()); 
             }
-            // InternalTableDSL.g:16341:2: ( rule__XPostfixOperation__Group_1__0 )?
-            int alt111=2;
-            int LA111_0 = input.LA(1);
+            // InternalTableDSL.g:15720:2: ( rule__XPostfixOperation__Group_1__0 )?
+            int alt109=2;
+            int LA109_0 = input.LA(1);
 
-            if ( (LA111_0==44) ) {
-                int LA111_1 = input.LA(2);
+            if ( (LA109_0==44) ) {
+                int LA109_1 = input.LA(2);
 
-                if ( (synpred189_InternalTableDSL()) ) {
-                    alt111=1;
+                if ( (synpred187_InternalTableDSL()) ) {
+                    alt109=1;
                 }
             }
-            else if ( (LA111_0==45) ) {
-                int LA111_2 = input.LA(2);
+            else if ( (LA109_0==45) ) {
+                int LA109_2 = input.LA(2);
 
-                if ( (synpred189_InternalTableDSL()) ) {
-                    alt111=1;
+                if ( (synpred187_InternalTableDSL()) ) {
+                    alt109=1;
                 }
             }
-            switch (alt111) {
+            switch (alt109) {
                 case 1 :
-                    // InternalTableDSL.g:16341:3: rule__XPostfixOperation__Group_1__0
+                    // InternalTableDSL.g:15720:3: rule__XPostfixOperation__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XPostfixOperation__Group_1__0();
@@ -54400,14 +52442,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1__0"
-    // InternalTableDSL.g:16350:1: rule__XPostfixOperation__Group_1__0 : rule__XPostfixOperation__Group_1__0__Impl ;
+    // InternalTableDSL.g:15729:1: rule__XPostfixOperation__Group_1__0 : rule__XPostfixOperation__Group_1__0__Impl ;
     public final void rule__XPostfixOperation__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16354:1: ( rule__XPostfixOperation__Group_1__0__Impl )
-            // InternalTableDSL.g:16355:2: rule__XPostfixOperation__Group_1__0__Impl
+            // InternalTableDSL.g:15733:1: ( rule__XPostfixOperation__Group_1__0__Impl )
+            // InternalTableDSL.g:15734:2: rule__XPostfixOperation__Group_1__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1__0__Impl();
@@ -54433,23 +52475,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1__0__Impl"
-    // InternalTableDSL.g:16361:1: rule__XPostfixOperation__Group_1__0__Impl : ( ( rule__XPostfixOperation__Group_1_0__0 ) ) ;
+    // InternalTableDSL.g:15740:1: rule__XPostfixOperation__Group_1__0__Impl : ( ( rule__XPostfixOperation__Group_1_0__0 ) ) ;
     public final void rule__XPostfixOperation__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16365:1: ( ( ( rule__XPostfixOperation__Group_1_0__0 ) ) )
-            // InternalTableDSL.g:16366:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
+            // InternalTableDSL.g:15744:1: ( ( ( rule__XPostfixOperation__Group_1_0__0 ) ) )
+            // InternalTableDSL.g:15745:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
             {
-            // InternalTableDSL.g:16366:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
-            // InternalTableDSL.g:16367:2: ( rule__XPostfixOperation__Group_1_0__0 )
+            // InternalTableDSL.g:15745:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
+            // InternalTableDSL.g:15746:2: ( rule__XPostfixOperation__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup_1_0()); 
             }
-            // InternalTableDSL.g:16368:2: ( rule__XPostfixOperation__Group_1_0__0 )
-            // InternalTableDSL.g:16368:3: rule__XPostfixOperation__Group_1_0__0
+            // InternalTableDSL.g:15747:2: ( rule__XPostfixOperation__Group_1_0__0 )
+            // InternalTableDSL.g:15747:3: rule__XPostfixOperation__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1_0__0();
@@ -54484,16 +52526,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__0"
-    // InternalTableDSL.g:16377:1: rule__XPostfixOperation__Group_1_0__0 : rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 ;
+    // InternalTableDSL.g:15756:1: rule__XPostfixOperation__Group_1_0__0 : rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 ;
     public final void rule__XPostfixOperation__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16381:1: ( rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 )
-            // InternalTableDSL.g:16382:2: rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1
+            // InternalTableDSL.g:15760:1: ( rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 )
+            // InternalTableDSL.g:15761:2: rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1
             {
-            pushFollow(FOLLOW_131);
+            pushFollow(FOLLOW_130);
             rule__XPostfixOperation__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -54522,23 +52564,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__0__Impl"
-    // InternalTableDSL.g:16389:1: rule__XPostfixOperation__Group_1_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:15768:1: rule__XPostfixOperation__Group_1_0__0__Impl : ( () ) ;
     public final void rule__XPostfixOperation__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16393:1: ( ( () ) )
-            // InternalTableDSL.g:16394:1: ( () )
+            // InternalTableDSL.g:15772:1: ( ( () ) )
+            // InternalTableDSL.g:15773:1: ( () )
             {
-            // InternalTableDSL.g:16394:1: ( () )
-            // InternalTableDSL.g:16395:2: ()
+            // InternalTableDSL.g:15773:1: ( () )
+            // InternalTableDSL.g:15774:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()); 
             }
-            // InternalTableDSL.g:16396:2: ()
-            // InternalTableDSL.g:16396:3: 
+            // InternalTableDSL.g:15775:2: ()
+            // InternalTableDSL.g:15775:3: 
             {
             }
 
@@ -54563,14 +52605,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__1"
-    // InternalTableDSL.g:16404:1: rule__XPostfixOperation__Group_1_0__1 : rule__XPostfixOperation__Group_1_0__1__Impl ;
+    // InternalTableDSL.g:15783:1: rule__XPostfixOperation__Group_1_0__1 : rule__XPostfixOperation__Group_1_0__1__Impl ;
     public final void rule__XPostfixOperation__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16408:1: ( rule__XPostfixOperation__Group_1_0__1__Impl )
-            // InternalTableDSL.g:16409:2: rule__XPostfixOperation__Group_1_0__1__Impl
+            // InternalTableDSL.g:15787:1: ( rule__XPostfixOperation__Group_1_0__1__Impl )
+            // InternalTableDSL.g:15788:2: rule__XPostfixOperation__Group_1_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1_0__1__Impl();
@@ -54596,23 +52638,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__1__Impl"
-    // InternalTableDSL.g:16415:1: rule__XPostfixOperation__Group_1_0__1__Impl : ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) ;
+    // InternalTableDSL.g:15794:1: rule__XPostfixOperation__Group_1_0__1__Impl : ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) ;
     public final void rule__XPostfixOperation__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16419:1: ( ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) )
-            // InternalTableDSL.g:16420:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
+            // InternalTableDSL.g:15798:1: ( ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) )
+            // InternalTableDSL.g:15799:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
             {
-            // InternalTableDSL.g:16420:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
-            // InternalTableDSL.g:16421:2: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
+            // InternalTableDSL.g:15799:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
+            // InternalTableDSL.g:15800:2: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureAssignment_1_0_1()); 
             }
-            // InternalTableDSL.g:16422:2: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
-            // InternalTableDSL.g:16422:3: rule__XPostfixOperation__FeatureAssignment_1_0_1
+            // InternalTableDSL.g:15801:2: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
+            // InternalTableDSL.g:15801:3: rule__XPostfixOperation__FeatureAssignment_1_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XPostfixOperation__FeatureAssignment_1_0_1();
@@ -54647,16 +52689,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__0"
-    // InternalTableDSL.g:16431:1: rule__XMemberFeatureCall__Group__0 : rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 ;
+    // InternalTableDSL.g:15810:1: rule__XMemberFeatureCall__Group__0 : rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 ;
     public final void rule__XMemberFeatureCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16435:1: ( rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 )
-            // InternalTableDSL.g:16436:2: rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1
+            // InternalTableDSL.g:15814:1: ( rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 )
+            // InternalTableDSL.g:15815:2: rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1
             {
-            pushFollow(FOLLOW_132);
+            pushFollow(FOLLOW_131);
             rule__XMemberFeatureCall__Group__0__Impl();
 
             state._fsp--;
@@ -54685,17 +52727,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__0__Impl"
-    // InternalTableDSL.g:16443:1: rule__XMemberFeatureCall__Group__0__Impl : ( ruleXPrimaryExpression ) ;
+    // InternalTableDSL.g:15822:1: rule__XMemberFeatureCall__Group__0__Impl : ( ruleXPrimaryExpression ) ;
     public final void rule__XMemberFeatureCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16447:1: ( ( ruleXPrimaryExpression ) )
-            // InternalTableDSL.g:16448:1: ( ruleXPrimaryExpression )
+            // InternalTableDSL.g:15826:1: ( ( ruleXPrimaryExpression ) )
+            // InternalTableDSL.g:15827:1: ( ruleXPrimaryExpression )
             {
-            // InternalTableDSL.g:16448:1: ( ruleXPrimaryExpression )
-            // InternalTableDSL.g:16449:2: ruleXPrimaryExpression
+            // InternalTableDSL.g:15827:1: ( ruleXPrimaryExpression )
+            // InternalTableDSL.g:15828:2: ruleXPrimaryExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXPrimaryExpressionParserRuleCall_0()); 
@@ -54730,14 +52772,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__1"
-    // InternalTableDSL.g:16458:1: rule__XMemberFeatureCall__Group__1 : rule__XMemberFeatureCall__Group__1__Impl ;
+    // InternalTableDSL.g:15837:1: rule__XMemberFeatureCall__Group__1 : rule__XMemberFeatureCall__Group__1__Impl ;
     public final void rule__XMemberFeatureCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16462:1: ( rule__XMemberFeatureCall__Group__1__Impl )
-            // InternalTableDSL.g:16463:2: rule__XMemberFeatureCall__Group__1__Impl
+            // InternalTableDSL.g:15841:1: ( rule__XMemberFeatureCall__Group__1__Impl )
+            // InternalTableDSL.g:15842:2: rule__XMemberFeatureCall__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group__1__Impl();
@@ -54763,54 +52805,54 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__1__Impl"
-    // InternalTableDSL.g:16469:1: rule__XMemberFeatureCall__Group__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) ;
+    // InternalTableDSL.g:15848:1: rule__XMemberFeatureCall__Group__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) ;
     public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16473:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) )
-            // InternalTableDSL.g:16474:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
+            // InternalTableDSL.g:15852:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) )
+            // InternalTableDSL.g:15853:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
             {
-            // InternalTableDSL.g:16474:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
-            // InternalTableDSL.g:16475:2: ( rule__XMemberFeatureCall__Alternatives_1 )*
+            // InternalTableDSL.g:15853:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
+            // InternalTableDSL.g:15854:2: ( rule__XMemberFeatureCall__Alternatives_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1()); 
             }
-            // InternalTableDSL.g:16476:2: ( rule__XMemberFeatureCall__Alternatives_1 )*
-            loop112:
+            // InternalTableDSL.g:15855:2: ( rule__XMemberFeatureCall__Alternatives_1 )*
+            loop110:
             do {
-                int alt112=2;
+                int alt110=2;
                 switch ( input.LA(1) ) {
                 case 46:
                     {
-                    int LA112_2 = input.LA(2);
+                    int LA110_2 = input.LA(2);
 
-                    if ( (synpred190_InternalTableDSL()) ) {
-                        alt112=1;
+                    if ( (synpred188_InternalTableDSL()) ) {
+                        alt110=1;
                     }
 
 
                     }
                     break;
-                case 180:
+                case 177:
                     {
-                    int LA112_3 = input.LA(2);
+                    int LA110_3 = input.LA(2);
 
-                    if ( (synpred190_InternalTableDSL()) ) {
-                        alt112=1;
+                    if ( (synpred188_InternalTableDSL()) ) {
+                        alt110=1;
                     }
 
 
                     }
                     break;
-                case 181:
+                case 178:
                     {
-                    int LA112_4 = input.LA(2);
+                    int LA110_4 = input.LA(2);
 
-                    if ( (synpred190_InternalTableDSL()) ) {
-                        alt112=1;
+                    if ( (synpred188_InternalTableDSL()) ) {
+                        alt110=1;
                     }
 
 
@@ -54819,11 +52861,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
                 }
 
-                switch (alt112) {
+                switch (alt110) {
             	case 1 :
-            	    // InternalTableDSL.g:16476:3: rule__XMemberFeatureCall__Alternatives_1
+            	    // InternalTableDSL.g:15855:3: rule__XMemberFeatureCall__Alternatives_1
             	    {
-            	    pushFollow(FOLLOW_133);
+            	    pushFollow(FOLLOW_132);
             	    rule__XMemberFeatureCall__Alternatives_1();
 
             	    state._fsp--;
@@ -54833,7 +52875,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop112;
+            	    break loop110;
                 }
             } while (true);
 
@@ -54862,16 +52904,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__0"
-    // InternalTableDSL.g:16485:1: rule__XMemberFeatureCall__Group_1_0__0 : rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 ;
+    // InternalTableDSL.g:15864:1: rule__XMemberFeatureCall__Group_1_0__0 : rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 ;
     public final void rule__XMemberFeatureCall__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16489:1: ( rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 )
-            // InternalTableDSL.g:16490:2: rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1
+            // InternalTableDSL.g:15868:1: ( rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 )
+            // InternalTableDSL.g:15869:2: rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XMemberFeatureCall__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -54900,23 +52942,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__0__Impl"
-    // InternalTableDSL.g:16497:1: rule__XMemberFeatureCall__Group_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) ;
+    // InternalTableDSL.g:15876:1: rule__XMemberFeatureCall__Group_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16501:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) )
-            // InternalTableDSL.g:16502:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:15880:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) )
+            // InternalTableDSL.g:15881:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
             {
-            // InternalTableDSL.g:16502:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
-            // InternalTableDSL.g:16503:2: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
+            // InternalTableDSL.g:15881:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
+            // InternalTableDSL.g:15882:2: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0_0()); 
             }
-            // InternalTableDSL.g:16504:2: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
-            // InternalTableDSL.g:16504:3: rule__XMemberFeatureCall__Group_1_0_0__0
+            // InternalTableDSL.g:15883:2: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
+            // InternalTableDSL.g:15883:3: rule__XMemberFeatureCall__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0__0();
@@ -54951,14 +52993,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__1"
-    // InternalTableDSL.g:16512:1: rule__XMemberFeatureCall__Group_1_0__1 : rule__XMemberFeatureCall__Group_1_0__1__Impl ;
+    // InternalTableDSL.g:15891:1: rule__XMemberFeatureCall__Group_1_0__1 : rule__XMemberFeatureCall__Group_1_0__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16516:1: ( rule__XMemberFeatureCall__Group_1_0__1__Impl )
-            // InternalTableDSL.g:16517:2: rule__XMemberFeatureCall__Group_1_0__1__Impl
+            // InternalTableDSL.g:15895:1: ( rule__XMemberFeatureCall__Group_1_0__1__Impl )
+            // InternalTableDSL.g:15896:2: rule__XMemberFeatureCall__Group_1_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0__1__Impl();
@@ -54984,23 +53026,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__1__Impl"
-    // InternalTableDSL.g:16523:1: rule__XMemberFeatureCall__Group_1_0__1__Impl : ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) ;
+    // InternalTableDSL.g:15902:1: rule__XMemberFeatureCall__Group_1_0__1__Impl : ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16527:1: ( ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) )
-            // InternalTableDSL.g:16528:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
+            // InternalTableDSL.g:15906:1: ( ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) )
+            // InternalTableDSL.g:15907:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
             {
-            // InternalTableDSL.g:16528:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
-            // InternalTableDSL.g:16529:2: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
+            // InternalTableDSL.g:15907:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
+            // InternalTableDSL.g:15908:2: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getValueAssignment_1_0_1()); 
             }
-            // InternalTableDSL.g:16530:2: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
-            // InternalTableDSL.g:16530:3: rule__XMemberFeatureCall__ValueAssignment_1_0_1
+            // InternalTableDSL.g:15909:2: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
+            // InternalTableDSL.g:15909:3: rule__XMemberFeatureCall__ValueAssignment_1_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__ValueAssignment_1_0_1();
@@ -55035,14 +53077,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0__0"
-    // InternalTableDSL.g:16539:1: rule__XMemberFeatureCall__Group_1_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0__0__Impl ;
+    // InternalTableDSL.g:15918:1: rule__XMemberFeatureCall__Group_1_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0__0__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16543:1: ( rule__XMemberFeatureCall__Group_1_0_0__0__Impl )
-            // InternalTableDSL.g:16544:2: rule__XMemberFeatureCall__Group_1_0_0__0__Impl
+            // InternalTableDSL.g:15922:1: ( rule__XMemberFeatureCall__Group_1_0_0__0__Impl )
+            // InternalTableDSL.g:15923:2: rule__XMemberFeatureCall__Group_1_0_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0__0__Impl();
@@ -55068,23 +53110,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0__0__Impl"
-    // InternalTableDSL.g:16550:1: rule__XMemberFeatureCall__Group_1_0_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) ;
+    // InternalTableDSL.g:15929:1: rule__XMemberFeatureCall__Group_1_0_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16554:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) )
-            // InternalTableDSL.g:16555:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
+            // InternalTableDSL.g:15933:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) )
+            // InternalTableDSL.g:15934:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
             {
-            // InternalTableDSL.g:16555:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
-            // InternalTableDSL.g:16556:2: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
+            // InternalTableDSL.g:15934:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
+            // InternalTableDSL.g:15935:2: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0_0_0()); 
             }
-            // InternalTableDSL.g:16557:2: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
-            // InternalTableDSL.g:16557:3: rule__XMemberFeatureCall__Group_1_0_0_0__0
+            // InternalTableDSL.g:15936:2: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
+            // InternalTableDSL.g:15936:3: rule__XMemberFeatureCall__Group_1_0_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__0();
@@ -55119,16 +53161,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__0"
-    // InternalTableDSL.g:16566:1: rule__XMemberFeatureCall__Group_1_0_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 ;
+    // InternalTableDSL.g:15945:1: rule__XMemberFeatureCall__Group_1_0_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16570:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 )
-            // InternalTableDSL.g:16571:2: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1
+            // InternalTableDSL.g:15949:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 )
+            // InternalTableDSL.g:15950:2: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1
             {
-            pushFollow(FOLLOW_134);
+            pushFollow(FOLLOW_133);
             rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl();
 
             state._fsp--;
@@ -55157,23 +53199,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl"
-    // InternalTableDSL.g:16578:1: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:15957:1: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl : ( () ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16582:1: ( ( () ) )
-            // InternalTableDSL.g:16583:1: ( () )
+            // InternalTableDSL.g:15961:1: ( ( () ) )
+            // InternalTableDSL.g:15962:1: ( () )
             {
-            // InternalTableDSL.g:16583:1: ( () )
-            // InternalTableDSL.g:16584:2: ()
+            // InternalTableDSL.g:15962:1: ( () )
+            // InternalTableDSL.g:15963:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()); 
             }
-            // InternalTableDSL.g:16585:2: ()
-            // InternalTableDSL.g:16585:3: 
+            // InternalTableDSL.g:15964:2: ()
+            // InternalTableDSL.g:15964:3: 
             {
             }
 
@@ -55198,16 +53240,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__1"
-    // InternalTableDSL.g:16593:1: rule__XMemberFeatureCall__Group_1_0_0_0__1 : rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 ;
+    // InternalTableDSL.g:15972:1: rule__XMemberFeatureCall__Group_1_0_0_0__1 : rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16597:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 )
-            // InternalTableDSL.g:16598:2: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2
+            // InternalTableDSL.g:15976:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 )
+            // InternalTableDSL.g:15977:2: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2
             {
-            pushFollow(FOLLOW_105);
+            pushFollow(FOLLOW_104);
             rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl();
 
             state._fsp--;
@@ -55236,23 +53278,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl"
-    // InternalTableDSL.g:16605:1: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) ;
+    // InternalTableDSL.g:15984:1: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16609:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) )
-            // InternalTableDSL.g:16610:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
+            // InternalTableDSL.g:15988:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) )
+            // InternalTableDSL.g:15989:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
             {
-            // InternalTableDSL.g:16610:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
-            // InternalTableDSL.g:16611:2: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
+            // InternalTableDSL.g:15989:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
+            // InternalTableDSL.g:15990:2: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_0_0_0_1()); 
             }
-            // InternalTableDSL.g:16612:2: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
-            // InternalTableDSL.g:16612:3: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1
+            // InternalTableDSL.g:15991:2: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
+            // InternalTableDSL.g:15991:3: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Alternatives_1_0_0_0_1();
@@ -55287,16 +53329,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__2"
-    // InternalTableDSL.g:16620:1: rule__XMemberFeatureCall__Group_1_0_0_0__2 : rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 ;
+    // InternalTableDSL.g:15999:1: rule__XMemberFeatureCall__Group_1_0_0_0__2 : rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16624:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 )
-            // InternalTableDSL.g:16625:2: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3
+            // InternalTableDSL.g:16003:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 )
+            // InternalTableDSL.g:16004:2: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3
             {
-            pushFollow(FOLLOW_101);
+            pushFollow(FOLLOW_100);
             rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl();
 
             state._fsp--;
@@ -55325,23 +53367,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl"
-    // InternalTableDSL.g:16632:1: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) ;
+    // InternalTableDSL.g:16011:1: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16636:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) )
-            // InternalTableDSL.g:16637:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
+            // InternalTableDSL.g:16015:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) )
+            // InternalTableDSL.g:16016:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
             {
-            // InternalTableDSL.g:16637:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
-            // InternalTableDSL.g:16638:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
+            // InternalTableDSL.g:16016:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
+            // InternalTableDSL.g:16017:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureAssignment_1_0_0_0_2()); 
             }
-            // InternalTableDSL.g:16639:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
-            // InternalTableDSL.g:16639:3: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2
+            // InternalTableDSL.g:16018:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
+            // InternalTableDSL.g:16018:3: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2();
@@ -55376,14 +53418,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__3"
-    // InternalTableDSL.g:16647:1: rule__XMemberFeatureCall__Group_1_0_0_0__3 : rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl ;
+    // InternalTableDSL.g:16026:1: rule__XMemberFeatureCall__Group_1_0_0_0__3 : rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16651:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl )
-            // InternalTableDSL.g:16652:2: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl
+            // InternalTableDSL.g:16030:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl )
+            // InternalTableDSL.g:16031:2: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl();
@@ -55409,17 +53451,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl"
-    // InternalTableDSL.g:16658:1: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl : ( ruleOpSingleAssign ) ;
+    // InternalTableDSL.g:16037:1: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl : ( ruleOpSingleAssign ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16662:1: ( ( ruleOpSingleAssign ) )
-            // InternalTableDSL.g:16663:1: ( ruleOpSingleAssign )
+            // InternalTableDSL.g:16041:1: ( ( ruleOpSingleAssign ) )
+            // InternalTableDSL.g:16042:1: ( ruleOpSingleAssign )
             {
-            // InternalTableDSL.g:16663:1: ( ruleOpSingleAssign )
-            // InternalTableDSL.g:16664:2: ruleOpSingleAssign
+            // InternalTableDSL.g:16042:1: ( ruleOpSingleAssign )
+            // InternalTableDSL.g:16043:2: ruleOpSingleAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getOpSingleAssignParserRuleCall_1_0_0_0_3()); 
@@ -55454,16 +53496,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__0"
-    // InternalTableDSL.g:16674:1: rule__XMemberFeatureCall__Group_1_1__0 : rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 ;
+    // InternalTableDSL.g:16053:1: rule__XMemberFeatureCall__Group_1_1__0 : rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16678:1: ( rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 )
-            // InternalTableDSL.g:16679:2: rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1
+            // InternalTableDSL.g:16057:1: ( rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 )
+            // InternalTableDSL.g:16058:2: rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1
             {
-            pushFollow(FOLLOW_135);
+            pushFollow(FOLLOW_134);
             rule__XMemberFeatureCall__Group_1_1__0__Impl();
 
             state._fsp--;
@@ -55492,23 +53534,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__0__Impl"
-    // InternalTableDSL.g:16686:1: rule__XMemberFeatureCall__Group_1_1__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) ;
+    // InternalTableDSL.g:16065:1: rule__XMemberFeatureCall__Group_1_1__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16690:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) )
-            // InternalTableDSL.g:16691:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
+            // InternalTableDSL.g:16069:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) )
+            // InternalTableDSL.g:16070:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
             {
-            // InternalTableDSL.g:16691:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
-            // InternalTableDSL.g:16692:2: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
+            // InternalTableDSL.g:16070:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
+            // InternalTableDSL.g:16071:2: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_0()); 
             }
-            // InternalTableDSL.g:16693:2: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
-            // InternalTableDSL.g:16693:3: rule__XMemberFeatureCall__Group_1_1_0__0
+            // InternalTableDSL.g:16072:2: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
+            // InternalTableDSL.g:16072:3: rule__XMemberFeatureCall__Group_1_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0__0();
@@ -55543,16 +53585,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__1"
-    // InternalTableDSL.g:16701:1: rule__XMemberFeatureCall__Group_1_1__1 : rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 ;
+    // InternalTableDSL.g:16080:1: rule__XMemberFeatureCall__Group_1_1__1 : rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 ;
     public final void rule__XMemberFeatureCall__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16705:1: ( rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 )
-            // InternalTableDSL.g:16706:2: rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2
+            // InternalTableDSL.g:16084:1: ( rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 )
+            // InternalTableDSL.g:16085:2: rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2
             {
-            pushFollow(FOLLOW_135);
+            pushFollow(FOLLOW_134);
             rule__XMemberFeatureCall__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -55581,31 +53623,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__1__Impl"
-    // InternalTableDSL.g:16713:1: rule__XMemberFeatureCall__Group_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) ;
+    // InternalTableDSL.g:16092:1: rule__XMemberFeatureCall__Group_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16717:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) )
-            // InternalTableDSL.g:16718:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
+            // InternalTableDSL.g:16096:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) )
+            // InternalTableDSL.g:16097:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
             {
-            // InternalTableDSL.g:16718:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
-            // InternalTableDSL.g:16719:2: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
+            // InternalTableDSL.g:16097:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
+            // InternalTableDSL.g:16098:2: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_1()); 
             }
-            // InternalTableDSL.g:16720:2: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
-            int alt113=2;
-            int LA113_0 = input.LA(1);
+            // InternalTableDSL.g:16099:2: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
+            int alt111=2;
+            int LA111_0 = input.LA(1);
 
-            if ( (LA113_0==32) ) {
-                alt113=1;
+            if ( (LA111_0==32) ) {
+                alt111=1;
             }
-            switch (alt113) {
+            switch (alt111) {
                 case 1 :
-                    // InternalTableDSL.g:16720:3: rule__XMemberFeatureCall__Group_1_1_1__0
+                    // InternalTableDSL.g:16099:3: rule__XMemberFeatureCall__Group_1_1_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1_1__0();
@@ -55643,16 +53685,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__2"
-    // InternalTableDSL.g:16728:1: rule__XMemberFeatureCall__Group_1_1__2 : rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 ;
+    // InternalTableDSL.g:16107:1: rule__XMemberFeatureCall__Group_1_1__2 : rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 ;
     public final void rule__XMemberFeatureCall__Group_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16732:1: ( rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 )
-            // InternalTableDSL.g:16733:2: rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3
+            // InternalTableDSL.g:16111:1: ( rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 )
+            // InternalTableDSL.g:16112:2: rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3
             {
-            pushFollow(FOLLOW_136);
+            pushFollow(FOLLOW_135);
             rule__XMemberFeatureCall__Group_1_1__2__Impl();
 
             state._fsp--;
@@ -55681,23 +53723,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__2__Impl"
-    // InternalTableDSL.g:16740:1: rule__XMemberFeatureCall__Group_1_1__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) ;
+    // InternalTableDSL.g:16119:1: rule__XMemberFeatureCall__Group_1_1__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16744:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) )
-            // InternalTableDSL.g:16745:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
+            // InternalTableDSL.g:16123:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) )
+            // InternalTableDSL.g:16124:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
             {
-            // InternalTableDSL.g:16745:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
-            // InternalTableDSL.g:16746:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
+            // InternalTableDSL.g:16124:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
+            // InternalTableDSL.g:16125:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureAssignment_1_1_2()); 
             }
-            // InternalTableDSL.g:16747:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
-            // InternalTableDSL.g:16747:3: rule__XMemberFeatureCall__FeatureAssignment_1_1_2
+            // InternalTableDSL.g:16126:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
+            // InternalTableDSL.g:16126:3: rule__XMemberFeatureCall__FeatureAssignment_1_1_2
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__FeatureAssignment_1_1_2();
@@ -55732,16 +53774,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__3"
-    // InternalTableDSL.g:16755:1: rule__XMemberFeatureCall__Group_1_1__3 : rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 ;
+    // InternalTableDSL.g:16134:1: rule__XMemberFeatureCall__Group_1_1__3 : rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 ;
     public final void rule__XMemberFeatureCall__Group_1_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16759:1: ( rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 )
-            // InternalTableDSL.g:16760:2: rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4
+            // InternalTableDSL.g:16138:1: ( rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 )
+            // InternalTableDSL.g:16139:2: rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4
             {
-            pushFollow(FOLLOW_136);
+            pushFollow(FOLLOW_135);
             rule__XMemberFeatureCall__Group_1_1__3__Impl();
 
             state._fsp--;
@@ -55770,27 +53812,27 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__3__Impl"
-    // InternalTableDSL.g:16767:1: rule__XMemberFeatureCall__Group_1_1__3__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) ;
+    // InternalTableDSL.g:16146:1: rule__XMemberFeatureCall__Group_1_1__3__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16771:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) )
-            // InternalTableDSL.g:16772:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
+            // InternalTableDSL.g:16150:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) )
+            // InternalTableDSL.g:16151:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
             {
-            // InternalTableDSL.g:16772:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
-            // InternalTableDSL.g:16773:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
+            // InternalTableDSL.g:16151:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
+            // InternalTableDSL.g:16152:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_3()); 
             }
-            // InternalTableDSL.g:16774:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
-            int alt114=2;
-            alt114 = dfa114.predict(input);
-            switch (alt114) {
+            // InternalTableDSL.g:16153:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
+            int alt112=2;
+            alt112 = dfa112.predict(input);
+            switch (alt112) {
                 case 1 :
-                    // InternalTableDSL.g:16774:3: rule__XMemberFeatureCall__Group_1_1_3__0
+                    // InternalTableDSL.g:16153:3: rule__XMemberFeatureCall__Group_1_1_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1_3__0();
@@ -55828,14 +53870,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__4"
-    // InternalTableDSL.g:16782:1: rule__XMemberFeatureCall__Group_1_1__4 : rule__XMemberFeatureCall__Group_1_1__4__Impl ;
+    // InternalTableDSL.g:16161:1: rule__XMemberFeatureCall__Group_1_1__4 : rule__XMemberFeatureCall__Group_1_1__4__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16786:1: ( rule__XMemberFeatureCall__Group_1_1__4__Impl )
-            // InternalTableDSL.g:16787:2: rule__XMemberFeatureCall__Group_1_1__4__Impl
+            // InternalTableDSL.g:16165:1: ( rule__XMemberFeatureCall__Group_1_1__4__Impl )
+            // InternalTableDSL.g:16166:2: rule__XMemberFeatureCall__Group_1_1__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__4__Impl();
@@ -55861,27 +53903,27 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__4__Impl"
-    // InternalTableDSL.g:16793:1: rule__XMemberFeatureCall__Group_1_1__4__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) ;
+    // InternalTableDSL.g:16172:1: rule__XMemberFeatureCall__Group_1_1__4__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16797:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) )
-            // InternalTableDSL.g:16798:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
+            // InternalTableDSL.g:16176:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) )
+            // InternalTableDSL.g:16177:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
             {
-            // InternalTableDSL.g:16798:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
-            // InternalTableDSL.g:16799:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
+            // InternalTableDSL.g:16177:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
+            // InternalTableDSL.g:16178:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_4()); 
             }
-            // InternalTableDSL.g:16800:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
-            int alt115=2;
-            alt115 = dfa115.predict(input);
-            switch (alt115) {
+            // InternalTableDSL.g:16179:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
+            int alt113=2;
+            alt113 = dfa113.predict(input);
+            switch (alt113) {
                 case 1 :
-                    // InternalTableDSL.g:16800:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
+                    // InternalTableDSL.g:16179:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
                     {
                     pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4();
@@ -55919,14 +53961,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0__0"
-    // InternalTableDSL.g:16809:1: rule__XMemberFeatureCall__Group_1_1_0__0 : rule__XMemberFeatureCall__Group_1_1_0__0__Impl ;
+    // InternalTableDSL.g:16188:1: rule__XMemberFeatureCall__Group_1_1_0__0 : rule__XMemberFeatureCall__Group_1_1_0__0__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16813:1: ( rule__XMemberFeatureCall__Group_1_1_0__0__Impl )
-            // InternalTableDSL.g:16814:2: rule__XMemberFeatureCall__Group_1_1_0__0__Impl
+            // InternalTableDSL.g:16192:1: ( rule__XMemberFeatureCall__Group_1_1_0__0__Impl )
+            // InternalTableDSL.g:16193:2: rule__XMemberFeatureCall__Group_1_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0__0__Impl();
@@ -55952,23 +53994,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0__0__Impl"
-    // InternalTableDSL.g:16820:1: rule__XMemberFeatureCall__Group_1_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) ;
+    // InternalTableDSL.g:16199:1: rule__XMemberFeatureCall__Group_1_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16824:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) )
-            // InternalTableDSL.g:16825:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
+            // InternalTableDSL.g:16203:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) )
+            // InternalTableDSL.g:16204:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
             {
-            // InternalTableDSL.g:16825:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
-            // InternalTableDSL.g:16826:2: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
+            // InternalTableDSL.g:16204:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
+            // InternalTableDSL.g:16205:2: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_0_0()); 
             }
-            // InternalTableDSL.g:16827:2: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
-            // InternalTableDSL.g:16827:3: rule__XMemberFeatureCall__Group_1_1_0_0__0
+            // InternalTableDSL.g:16206:2: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
+            // InternalTableDSL.g:16206:3: rule__XMemberFeatureCall__Group_1_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0_0__0();
@@ -56003,16 +54045,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__0"
-    // InternalTableDSL.g:16836:1: rule__XMemberFeatureCall__Group_1_1_0_0__0 : rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 ;
+    // InternalTableDSL.g:16215:1: rule__XMemberFeatureCall__Group_1_1_0_0__0 : rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16840:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 )
-            // InternalTableDSL.g:16841:2: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1
+            // InternalTableDSL.g:16219:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 )
+            // InternalTableDSL.g:16220:2: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_132);
+            pushFollow(FOLLOW_131);
             rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
@@ -56041,23 +54083,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl"
-    // InternalTableDSL.g:16848:1: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:16227:1: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl : ( () ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16852:1: ( ( () ) )
-            // InternalTableDSL.g:16853:1: ( () )
+            // InternalTableDSL.g:16231:1: ( ( () ) )
+            // InternalTableDSL.g:16232:1: ( () )
             {
-            // InternalTableDSL.g:16853:1: ( () )
-            // InternalTableDSL.g:16854:2: ()
+            // InternalTableDSL.g:16232:1: ( () )
+            // InternalTableDSL.g:16233:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()); 
             }
-            // InternalTableDSL.g:16855:2: ()
-            // InternalTableDSL.g:16855:3: 
+            // InternalTableDSL.g:16234:2: ()
+            // InternalTableDSL.g:16234:3: 
             {
             }
 
@@ -56082,14 +54124,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__1"
-    // InternalTableDSL.g:16863:1: rule__XMemberFeatureCall__Group_1_1_0_0__1 : rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl ;
+    // InternalTableDSL.g:16242:1: rule__XMemberFeatureCall__Group_1_1_0_0__1 : rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16867:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl )
-            // InternalTableDSL.g:16868:2: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl
+            // InternalTableDSL.g:16246:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl )
+            // InternalTableDSL.g:16247:2: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl();
@@ -56115,23 +54157,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl"
-    // InternalTableDSL.g:16874:1: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) ;
+    // InternalTableDSL.g:16253:1: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16878:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) )
-            // InternalTableDSL.g:16879:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
+            // InternalTableDSL.g:16257:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) )
+            // InternalTableDSL.g:16258:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
             {
-            // InternalTableDSL.g:16879:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
-            // InternalTableDSL.g:16880:2: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
+            // InternalTableDSL.g:16258:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
+            // InternalTableDSL.g:16259:2: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_1_0_0_1()); 
             }
-            // InternalTableDSL.g:16881:2: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
-            // InternalTableDSL.g:16881:3: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1
+            // InternalTableDSL.g:16260:2: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
+            // InternalTableDSL.g:16260:3: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Alternatives_1_1_0_0_1();
@@ -56166,16 +54208,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__0"
-    // InternalTableDSL.g:16890:1: rule__XMemberFeatureCall__Group_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 ;
+    // InternalTableDSL.g:16269:1: rule__XMemberFeatureCall__Group_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16894:1: ( rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 )
-            // InternalTableDSL.g:16895:2: rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1
+            // InternalTableDSL.g:16273:1: ( rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 )
+            // InternalTableDSL.g:16274:2: rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1
             {
-            pushFollow(FOLLOW_137);
+            pushFollow(FOLLOW_136);
             rule__XMemberFeatureCall__Group_1_1_1__0__Impl();
 
             state._fsp--;
@@ -56204,17 +54246,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__0__Impl"
-    // InternalTableDSL.g:16902:1: rule__XMemberFeatureCall__Group_1_1_1__0__Impl : ( '<' ) ;
+    // InternalTableDSL.g:16281:1: rule__XMemberFeatureCall__Group_1_1_1__0__Impl : ( '<' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16906:1: ( ( '<' ) )
-            // InternalTableDSL.g:16907:1: ( '<' )
+            // InternalTableDSL.g:16285:1: ( ( '<' ) )
+            // InternalTableDSL.g:16286:1: ( '<' )
             {
-            // InternalTableDSL.g:16907:1: ( '<' )
-            // InternalTableDSL.g:16908:2: '<'
+            // InternalTableDSL.g:16286:1: ( '<' )
+            // InternalTableDSL.g:16287:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0()); 
@@ -56245,16 +54287,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__1"
-    // InternalTableDSL.g:16917:1: rule__XMemberFeatureCall__Group_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 ;
+    // InternalTableDSL.g:16296:1: rule__XMemberFeatureCall__Group_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16921:1: ( rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 )
-            // InternalTableDSL.g:16922:2: rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2
+            // InternalTableDSL.g:16300:1: ( rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 )
+            // InternalTableDSL.g:16301:2: rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2
             {
-            pushFollow(FOLLOW_138);
+            pushFollow(FOLLOW_137);
             rule__XMemberFeatureCall__Group_1_1_1__1__Impl();
 
             state._fsp--;
@@ -56283,23 +54325,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__1__Impl"
-    // InternalTableDSL.g:16929:1: rule__XMemberFeatureCall__Group_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) ;
+    // InternalTableDSL.g:16308:1: rule__XMemberFeatureCall__Group_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16933:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) )
-            // InternalTableDSL.g:16934:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
+            // InternalTableDSL.g:16312:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) )
+            // InternalTableDSL.g:16313:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
             {
-            // InternalTableDSL.g:16934:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
-            // InternalTableDSL.g:16935:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
+            // InternalTableDSL.g:16313:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
+            // InternalTableDSL.g:16314:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsAssignment_1_1_1_1()); 
             }
-            // InternalTableDSL.g:16936:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
-            // InternalTableDSL.g:16936:3: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1
+            // InternalTableDSL.g:16315:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
+            // InternalTableDSL.g:16315:3: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1();
@@ -56334,16 +54376,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__2"
-    // InternalTableDSL.g:16944:1: rule__XMemberFeatureCall__Group_1_1_1__2 : rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 ;
+    // InternalTableDSL.g:16323:1: rule__XMemberFeatureCall__Group_1_1_1__2 : rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16948:1: ( rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 )
-            // InternalTableDSL.g:16949:2: rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3
+            // InternalTableDSL.g:16327:1: ( rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 )
+            // InternalTableDSL.g:16328:2: rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3
             {
-            pushFollow(FOLLOW_138);
+            pushFollow(FOLLOW_137);
             rule__XMemberFeatureCall__Group_1_1_1__2__Impl();
 
             state._fsp--;
@@ -56372,37 +54414,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__2__Impl"
-    // InternalTableDSL.g:16956:1: rule__XMemberFeatureCall__Group_1_1_1__2__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) ;
+    // InternalTableDSL.g:16335:1: rule__XMemberFeatureCall__Group_1_1_1__2__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16960:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) )
-            // InternalTableDSL.g:16961:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
+            // InternalTableDSL.g:16339:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) )
+            // InternalTableDSL.g:16340:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
             {
-            // InternalTableDSL.g:16961:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
-            // InternalTableDSL.g:16962:2: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
+            // InternalTableDSL.g:16340:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
+            // InternalTableDSL.g:16341:2: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_1_2()); 
             }
-            // InternalTableDSL.g:16963:2: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
-            loop116:
+            // InternalTableDSL.g:16342:2: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
+            loop114:
             do {
-                int alt116=2;
-                int LA116_0 = input.LA(1);
+                int alt114=2;
+                int LA114_0 = input.LA(1);
 
-                if ( (LA116_0==137) ) {
-                    alt116=1;
+                if ( (LA114_0==137) ) {
+                    alt114=1;
                 }
 
 
-                switch (alt116) {
+                switch (alt114) {
             	case 1 :
-            	    // InternalTableDSL.g:16963:3: rule__XMemberFeatureCall__Group_1_1_1_2__0
+            	    // InternalTableDSL.g:16342:3: rule__XMemberFeatureCall__Group_1_1_1_2__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XMemberFeatureCall__Group_1_1_1_2__0();
 
             	    state._fsp--;
@@ -56412,7 +54454,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop116;
+            	    break loop114;
                 }
             } while (true);
 
@@ -56441,14 +54483,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__3"
-    // InternalTableDSL.g:16971:1: rule__XMemberFeatureCall__Group_1_1_1__3 : rule__XMemberFeatureCall__Group_1_1_1__3__Impl ;
+    // InternalTableDSL.g:16350:1: rule__XMemberFeatureCall__Group_1_1_1__3 : rule__XMemberFeatureCall__Group_1_1_1__3__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16975:1: ( rule__XMemberFeatureCall__Group_1_1_1__3__Impl )
-            // InternalTableDSL.g:16976:2: rule__XMemberFeatureCall__Group_1_1_1__3__Impl
+            // InternalTableDSL.g:16354:1: ( rule__XMemberFeatureCall__Group_1_1_1__3__Impl )
+            // InternalTableDSL.g:16355:2: rule__XMemberFeatureCall__Group_1_1_1__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1__3__Impl();
@@ -56474,17 +54516,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__3__Impl"
-    // InternalTableDSL.g:16982:1: rule__XMemberFeatureCall__Group_1_1_1__3__Impl : ( '>' ) ;
+    // InternalTableDSL.g:16361:1: rule__XMemberFeatureCall__Group_1_1_1__3__Impl : ( '>' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:16986:1: ( ( '>' ) )
-            // InternalTableDSL.g:16987:1: ( '>' )
+            // InternalTableDSL.g:16365:1: ( ( '>' ) )
+            // InternalTableDSL.g:16366:1: ( '>' )
             {
-            // InternalTableDSL.g:16987:1: ( '>' )
-            // InternalTableDSL.g:16988:2: '>'
+            // InternalTableDSL.g:16366:1: ( '>' )
+            // InternalTableDSL.g:16367:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3()); 
@@ -56515,16 +54557,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__0"
-    // InternalTableDSL.g:16998:1: rule__XMemberFeatureCall__Group_1_1_1_2__0 : rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 ;
+    // InternalTableDSL.g:16377:1: rule__XMemberFeatureCall__Group_1_1_1_2__0 : rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17002:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 )
-            // InternalTableDSL.g:17003:2: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1
+            // InternalTableDSL.g:16381:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 )
+            // InternalTableDSL.g:16382:2: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1
             {
-            pushFollow(FOLLOW_137);
+            pushFollow(FOLLOW_136);
             rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl();
 
             state._fsp--;
@@ -56553,17 +54595,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl"
-    // InternalTableDSL.g:17010:1: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:16389:1: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl : ( ',' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17014:1: ( ( ',' ) )
-            // InternalTableDSL.g:17015:1: ( ',' )
+            // InternalTableDSL.g:16393:1: ( ( ',' ) )
+            // InternalTableDSL.g:16394:1: ( ',' )
             {
-            // InternalTableDSL.g:17015:1: ( ',' )
-            // InternalTableDSL.g:17016:2: ','
+            // InternalTableDSL.g:16394:1: ( ',' )
+            // InternalTableDSL.g:16395:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0()); 
@@ -56594,14 +54636,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__1"
-    // InternalTableDSL.g:17025:1: rule__XMemberFeatureCall__Group_1_1_1_2__1 : rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl ;
+    // InternalTableDSL.g:16404:1: rule__XMemberFeatureCall__Group_1_1_1_2__1 : rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17029:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl )
-            // InternalTableDSL.g:17030:2: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl
+            // InternalTableDSL.g:16408:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl )
+            // InternalTableDSL.g:16409:2: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl();
@@ -56627,23 +54669,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl"
-    // InternalTableDSL.g:17036:1: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) ;
+    // InternalTableDSL.g:16415:1: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17040:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) )
-            // InternalTableDSL.g:17041:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
+            // InternalTableDSL.g:16419:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) )
+            // InternalTableDSL.g:16420:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
             {
-            // InternalTableDSL.g:17041:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
-            // InternalTableDSL.g:17042:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
+            // InternalTableDSL.g:16420:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
+            // InternalTableDSL.g:16421:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsAssignment_1_1_1_2_1()); 
             }
-            // InternalTableDSL.g:17043:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
-            // InternalTableDSL.g:17043:3: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1
+            // InternalTableDSL.g:16422:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
+            // InternalTableDSL.g:16422:3: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1();
@@ -56678,16 +54720,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__0"
-    // InternalTableDSL.g:17052:1: rule__XMemberFeatureCall__Group_1_1_3__0 : rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 ;
+    // InternalTableDSL.g:16431:1: rule__XMemberFeatureCall__Group_1_1_3__0 : rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17056:1: ( rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 )
-            // InternalTableDSL.g:17057:2: rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1
+            // InternalTableDSL.g:16435:1: ( rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 )
+            // InternalTableDSL.g:16436:2: rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1
             {
-            pushFollow(FOLLOW_139);
+            pushFollow(FOLLOW_138);
             rule__XMemberFeatureCall__Group_1_1_3__0__Impl();
 
             state._fsp--;
@@ -56716,23 +54758,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__0__Impl"
-    // InternalTableDSL.g:17064:1: rule__XMemberFeatureCall__Group_1_1_3__0__Impl : ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) ;
+    // InternalTableDSL.g:16443:1: rule__XMemberFeatureCall__Group_1_1_3__0__Impl : ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17068:1: ( ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) )
-            // InternalTableDSL.g:17069:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
+            // InternalTableDSL.g:16447:1: ( ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) )
+            // InternalTableDSL.g:16448:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
             {
-            // InternalTableDSL.g:17069:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
-            // InternalTableDSL.g:17070:2: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
+            // InternalTableDSL.g:16448:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
+            // InternalTableDSL.g:16449:2: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallAssignment_1_1_3_0()); 
             }
-            // InternalTableDSL.g:17071:2: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
-            // InternalTableDSL.g:17071:3: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0
+            // InternalTableDSL.g:16450:2: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
+            // InternalTableDSL.g:16450:3: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0();
@@ -56767,16 +54809,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__1"
-    // InternalTableDSL.g:17079:1: rule__XMemberFeatureCall__Group_1_1_3__1 : rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 ;
+    // InternalTableDSL.g:16458:1: rule__XMemberFeatureCall__Group_1_1_3__1 : rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17083:1: ( rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 )
-            // InternalTableDSL.g:17084:2: rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2
+            // InternalTableDSL.g:16462:1: ( rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 )
+            // InternalTableDSL.g:16463:2: rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2
             {
-            pushFollow(FOLLOW_139);
+            pushFollow(FOLLOW_138);
             rule__XMemberFeatureCall__Group_1_1_3__1__Impl();
 
             state._fsp--;
@@ -56805,31 +54847,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__1__Impl"
-    // InternalTableDSL.g:17091:1: rule__XMemberFeatureCall__Group_1_1_3__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) ;
+    // InternalTableDSL.g:16470:1: rule__XMemberFeatureCall__Group_1_1_3__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17095:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) )
-            // InternalTableDSL.g:17096:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
+            // InternalTableDSL.g:16474:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) )
+            // InternalTableDSL.g:16475:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
             {
-            // InternalTableDSL.g:17096:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
-            // InternalTableDSL.g:17097:2: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
+            // InternalTableDSL.g:16475:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
+            // InternalTableDSL.g:16476:2: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_1_3_1()); 
             }
-            // InternalTableDSL.g:17098:2: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
-            int alt117=2;
-            int LA117_0 = input.LA(1);
+            // InternalTableDSL.g:16477:2: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
+            int alt115=2;
+            int LA115_0 = input.LA(1);
 
-            if ( ((LA117_0>=RULE_STRING && LA117_0<=RULE_DECIMAL)||(LA117_0>=19 && LA117_0<=20)||LA117_0==32||LA117_0==36||LA117_0==43||(LA117_0>=48 && LA117_0<=53)||LA117_0==75||LA117_0==135||(LA117_0>=139 && LA117_0<=140)||LA117_0==142||LA117_0==144||(LA117_0>=147 && LA117_0<=155)||LA117_0==157||LA117_0==182||LA117_0==184) ) {
-                alt117=1;
+            if ( ((LA115_0>=RULE_STRING && LA115_0<=RULE_DECIMAL)||(LA115_0>=19 && LA115_0<=20)||LA115_0==32||LA115_0==36||LA115_0==43||(LA115_0>=48 && LA115_0<=53)||LA115_0==75||LA115_0==135||(LA115_0>=139 && LA115_0<=140)||LA115_0==142||LA115_0==144||(LA115_0>=147 && LA115_0<=155)||LA115_0==157||LA115_0==179||LA115_0==181) ) {
+                alt115=1;
             }
-            switch (alt117) {
+            switch (alt115) {
                 case 1 :
-                    // InternalTableDSL.g:17098:3: rule__XMemberFeatureCall__Alternatives_1_1_3_1
+                    // InternalTableDSL.g:16477:3: rule__XMemberFeatureCall__Alternatives_1_1_3_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Alternatives_1_1_3_1();
@@ -56867,14 +54909,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__2"
-    // InternalTableDSL.g:17106:1: rule__XMemberFeatureCall__Group_1_1_3__2 : rule__XMemberFeatureCall__Group_1_1_3__2__Impl ;
+    // InternalTableDSL.g:16485:1: rule__XMemberFeatureCall__Group_1_1_3__2 : rule__XMemberFeatureCall__Group_1_1_3__2__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17110:1: ( rule__XMemberFeatureCall__Group_1_1_3__2__Impl )
-            // InternalTableDSL.g:17111:2: rule__XMemberFeatureCall__Group_1_1_3__2__Impl
+            // InternalTableDSL.g:16489:1: ( rule__XMemberFeatureCall__Group_1_1_3__2__Impl )
+            // InternalTableDSL.g:16490:2: rule__XMemberFeatureCall__Group_1_1_3__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3__2__Impl();
@@ -56900,17 +54942,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__2__Impl"
-    // InternalTableDSL.g:17117:1: rule__XMemberFeatureCall__Group_1_1_3__2__Impl : ( ')' ) ;
+    // InternalTableDSL.g:16496:1: rule__XMemberFeatureCall__Group_1_1_3__2__Impl : ( ')' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17121:1: ( ( ')' ) )
-            // InternalTableDSL.g:17122:1: ( ')' )
+            // InternalTableDSL.g:16500:1: ( ( ')' ) )
+            // InternalTableDSL.g:16501:1: ( ')' )
             {
-            // InternalTableDSL.g:17122:1: ( ')' )
-            // InternalTableDSL.g:17123:2: ')'
+            // InternalTableDSL.g:16501:1: ( ')' )
+            // InternalTableDSL.g:16502:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2()); 
@@ -56941,16 +54983,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__0"
-    // InternalTableDSL.g:17133:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 ;
+    // InternalTableDSL.g:16512:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17137:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 )
-            // InternalTableDSL.g:17138:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1
+            // InternalTableDSL.g:16516:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 )
+            // InternalTableDSL.g:16517:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_97);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl();
 
             state._fsp--;
@@ -56979,23 +55021,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl"
-    // InternalTableDSL.g:17145:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) ;
+    // InternalTableDSL.g:16524:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17149:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) )
-            // InternalTableDSL.g:17150:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
+            // InternalTableDSL.g:16528:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) )
+            // InternalTableDSL.g:16529:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
             {
-            // InternalTableDSL.g:17150:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
-            // InternalTableDSL.g:17151:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
+            // InternalTableDSL.g:16529:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
+            // InternalTableDSL.g:16530:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_1_0()); 
             }
-            // InternalTableDSL.g:17152:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
-            // InternalTableDSL.g:17152:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0
+            // InternalTableDSL.g:16531:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
+            // InternalTableDSL.g:16531:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0();
@@ -57030,14 +55072,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__1"
-    // InternalTableDSL.g:17160:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl ;
+    // InternalTableDSL.g:16539:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17164:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl )
-            // InternalTableDSL.g:17165:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl
+            // InternalTableDSL.g:16543:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl )
+            // InternalTableDSL.g:16544:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl();
@@ -57063,37 +55105,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl"
-    // InternalTableDSL.g:17171:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) ;
+    // InternalTableDSL.g:16550:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17175:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) )
-            // InternalTableDSL.g:17176:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
+            // InternalTableDSL.g:16554:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) )
+            // InternalTableDSL.g:16555:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
             {
-            // InternalTableDSL.g:17176:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
-            // InternalTableDSL.g:17177:2: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
+            // InternalTableDSL.g:16555:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
+            // InternalTableDSL.g:16556:2: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_3_1_1_1()); 
             }
-            // InternalTableDSL.g:17178:2: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
-            loop118:
+            // InternalTableDSL.g:16557:2: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
+            loop116:
             do {
-                int alt118=2;
-                int LA118_0 = input.LA(1);
+                int alt116=2;
+                int LA116_0 = input.LA(1);
 
-                if ( (LA118_0==137) ) {
-                    alt118=1;
+                if ( (LA116_0==137) ) {
+                    alt116=1;
                 }
 
 
-                switch (alt118) {
+                switch (alt116) {
             	case 1 :
-            	    // InternalTableDSL.g:17178:3: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0
+            	    // InternalTableDSL.g:16557:3: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0();
 
             	    state._fsp--;
@@ -57103,7 +55145,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop118;
+            	    break loop116;
                 }
             } while (true);
 
@@ -57132,16 +55174,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0"
-    // InternalTableDSL.g:17187:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 ;
+    // InternalTableDSL.g:16566:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17191:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 )
-            // InternalTableDSL.g:17192:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1
+            // InternalTableDSL.g:16570:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 )
+            // InternalTableDSL.g:16571:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl();
 
             state._fsp--;
@@ -57170,17 +55212,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl"
-    // InternalTableDSL.g:17199:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:16578:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17203:1: ( ( ',' ) )
-            // InternalTableDSL.g:17204:1: ( ',' )
+            // InternalTableDSL.g:16582:1: ( ( ',' ) )
+            // InternalTableDSL.g:16583:1: ( ',' )
             {
-            // InternalTableDSL.g:17204:1: ( ',' )
-            // InternalTableDSL.g:17205:2: ','
+            // InternalTableDSL.g:16583:1: ( ',' )
+            // InternalTableDSL.g:16584:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0()); 
@@ -57211,14 +55253,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1"
-    // InternalTableDSL.g:17214:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl ;
+    // InternalTableDSL.g:16593:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17218:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl )
-            // InternalTableDSL.g:17219:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl
+            // InternalTableDSL.g:16597:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl )
+            // InternalTableDSL.g:16598:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl();
@@ -57244,23 +55286,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl"
-    // InternalTableDSL.g:17225:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) ;
+    // InternalTableDSL.g:16604:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17229:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) )
-            // InternalTableDSL.g:17230:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
+            // InternalTableDSL.g:16608:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) )
+            // InternalTableDSL.g:16609:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
             {
-            // InternalTableDSL.g:17230:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
-            // InternalTableDSL.g:17231:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
+            // InternalTableDSL.g:16609:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
+            // InternalTableDSL.g:16610:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_1_1_1()); 
             }
-            // InternalTableDSL.g:17232:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
-            // InternalTableDSL.g:17232:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1
+            // InternalTableDSL.g:16611:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
+            // InternalTableDSL.g:16611:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1();
@@ -57295,16 +55337,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group__0"
-    // InternalTableDSL.g:17241:1: rule__XSetLiteral__Group__0 : rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 ;
+    // InternalTableDSL.g:16620:1: rule__XSetLiteral__Group__0 : rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 ;
     public final void rule__XSetLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17245:1: ( rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 )
-            // InternalTableDSL.g:17246:2: rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1
+            // InternalTableDSL.g:16624:1: ( rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 )
+            // InternalTableDSL.g:16625:2: rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1
             {
-            pushFollow(FOLLOW_103);
+            pushFollow(FOLLOW_102);
             rule__XSetLiteral__Group__0__Impl();
 
             state._fsp--;
@@ -57333,23 +55375,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group__0__Impl"
-    // InternalTableDSL.g:17253:1: rule__XSetLiteral__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:16632:1: rule__XSetLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XSetLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17257:1: ( ( () ) )
-            // InternalTableDSL.g:17258:1: ( () )
+            // InternalTableDSL.g:16636:1: ( ( () ) )
+            // InternalTableDSL.g:16637:1: ( () )
             {
-            // InternalTableDSL.g:17258:1: ( () )
-            // InternalTableDSL.g:17259:2: ()
+            // InternalTableDSL.g:16637:1: ( () )
+            // InternalTableDSL.g:16638:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getXSetLiteralAction_0()); 
             }
-            // InternalTableDSL.g:17260:2: ()
-            // InternalTableDSL.g:17260:3: 
+            // InternalTableDSL.g:16639:2: ()
+            // InternalTableDSL.g:16639:3: 
             {
             }
 
@@ -57374,14 +55416,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group__1"
-    // InternalTableDSL.g:17268:1: rule__XSetLiteral__Group__1 : rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 ;
+    // InternalTableDSL.g:16647:1: rule__XSetLiteral__Group__1 : rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 ;
     public final void rule__XSetLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17272:1: ( rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 )
-            // InternalTableDSL.g:17273:2: rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2
+            // InternalTableDSL.g:16651:1: ( rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 )
+            // InternalTableDSL.g:16652:2: rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2
             {
             pushFollow(FOLLOW_8);
             rule__XSetLiteral__Group__1__Impl();
@@ -57412,17 +55454,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group__1__Impl"
-    // InternalTableDSL.g:17280:1: rule__XSetLiteral__Group__1__Impl : ( '#' ) ;
+    // InternalTableDSL.g:16659:1: rule__XSetLiteral__Group__1__Impl : ( '#' ) ;
     public final void rule__XSetLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17284:1: ( ( '#' ) )
-            // InternalTableDSL.g:17285:1: ( '#' )
+            // InternalTableDSL.g:16663:1: ( ( '#' ) )
+            // InternalTableDSL.g:16664:1: ( '#' )
             {
-            // InternalTableDSL.g:17285:1: ( '#' )
-            // InternalTableDSL.g:17286:2: '#'
+            // InternalTableDSL.g:16664:1: ( '#' )
+            // InternalTableDSL.g:16665:2: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1()); 
@@ -57453,16 +55495,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group__2"
-    // InternalTableDSL.g:17295:1: rule__XSetLiteral__Group__2 : rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 ;
+    // InternalTableDSL.g:16674:1: rule__XSetLiteral__Group__2 : rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 ;
     public final void rule__XSetLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17299:1: ( rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 )
-            // InternalTableDSL.g:17300:2: rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3
+            // InternalTableDSL.g:16678:1: ( rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 )
+            // InternalTableDSL.g:16679:2: rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3
             {
-            pushFollow(FOLLOW_140);
+            pushFollow(FOLLOW_139);
             rule__XSetLiteral__Group__2__Impl();
 
             state._fsp--;
@@ -57491,17 +55533,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group__2__Impl"
-    // InternalTableDSL.g:17307:1: rule__XSetLiteral__Group__2__Impl : ( '{' ) ;
+    // InternalTableDSL.g:16686:1: rule__XSetLiteral__Group__2__Impl : ( '{' ) ;
     public final void rule__XSetLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17311:1: ( ( '{' ) )
-            // InternalTableDSL.g:17312:1: ( '{' )
+            // InternalTableDSL.g:16690:1: ( ( '{' ) )
+            // InternalTableDSL.g:16691:1: ( '{' )
             {
-            // InternalTableDSL.g:17312:1: ( '{' )
-            // InternalTableDSL.g:17313:2: '{'
+            // InternalTableDSL.g:16691:1: ( '{' )
+            // InternalTableDSL.g:16692:2: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2()); 
@@ -57532,16 +55574,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group__3"
-    // InternalTableDSL.g:17322:1: rule__XSetLiteral__Group__3 : rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 ;
+    // InternalTableDSL.g:16701:1: rule__XSetLiteral__Group__3 : rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 ;
     public final void rule__XSetLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17326:1: ( rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 )
-            // InternalTableDSL.g:17327:2: rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4
+            // InternalTableDSL.g:16705:1: ( rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 )
+            // InternalTableDSL.g:16706:2: rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4
             {
-            pushFollow(FOLLOW_140);
+            pushFollow(FOLLOW_139);
             rule__XSetLiteral__Group__3__Impl();
 
             state._fsp--;
@@ -57570,31 +55612,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group__3__Impl"
-    // InternalTableDSL.g:17334:1: rule__XSetLiteral__Group__3__Impl : ( ( rule__XSetLiteral__Group_3__0 )? ) ;
+    // InternalTableDSL.g:16713:1: rule__XSetLiteral__Group__3__Impl : ( ( rule__XSetLiteral__Group_3__0 )? ) ;
     public final void rule__XSetLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17338:1: ( ( ( rule__XSetLiteral__Group_3__0 )? ) )
-            // InternalTableDSL.g:17339:1: ( ( rule__XSetLiteral__Group_3__0 )? )
+            // InternalTableDSL.g:16717:1: ( ( ( rule__XSetLiteral__Group_3__0 )? ) )
+            // InternalTableDSL.g:16718:1: ( ( rule__XSetLiteral__Group_3__0 )? )
             {
-            // InternalTableDSL.g:17339:1: ( ( rule__XSetLiteral__Group_3__0 )? )
-            // InternalTableDSL.g:17340:2: ( rule__XSetLiteral__Group_3__0 )?
+            // InternalTableDSL.g:16718:1: ( ( rule__XSetLiteral__Group_3__0 )? )
+            // InternalTableDSL.g:16719:2: ( rule__XSetLiteral__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup_3()); 
             }
-            // InternalTableDSL.g:17341:2: ( rule__XSetLiteral__Group_3__0 )?
-            int alt119=2;
-            int LA119_0 = input.LA(1);
+            // InternalTableDSL.g:16720:2: ( rule__XSetLiteral__Group_3__0 )?
+            int alt117=2;
+            int LA117_0 = input.LA(1);
 
-            if ( ((LA119_0>=RULE_STRING && LA119_0<=RULE_DECIMAL)||(LA119_0>=19 && LA119_0<=20)||LA119_0==32||LA119_0==43||(LA119_0>=48 && LA119_0<=53)||LA119_0==75||LA119_0==135||(LA119_0>=139 && LA119_0<=140)||LA119_0==142||LA119_0==144||(LA119_0>=147 && LA119_0<=155)||LA119_0==157||LA119_0==184) ) {
-                alt119=1;
+            if ( ((LA117_0>=RULE_STRING && LA117_0<=RULE_DECIMAL)||(LA117_0>=19 && LA117_0<=20)||LA117_0==32||LA117_0==43||(LA117_0>=48 && LA117_0<=53)||LA117_0==75||LA117_0==135||(LA117_0>=139 && LA117_0<=140)||LA117_0==142||LA117_0==144||(LA117_0>=147 && LA117_0<=155)||LA117_0==157||LA117_0==181) ) {
+                alt117=1;
             }
-            switch (alt119) {
+            switch (alt117) {
                 case 1 :
-                    // InternalTableDSL.g:17341:3: rule__XSetLiteral__Group_3__0
+                    // InternalTableDSL.g:16720:3: rule__XSetLiteral__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XSetLiteral__Group_3__0();
@@ -57632,14 +55674,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group__4"
-    // InternalTableDSL.g:17349:1: rule__XSetLiteral__Group__4 : rule__XSetLiteral__Group__4__Impl ;
+    // InternalTableDSL.g:16728:1: rule__XSetLiteral__Group__4 : rule__XSetLiteral__Group__4__Impl ;
     public final void rule__XSetLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17353:1: ( rule__XSetLiteral__Group__4__Impl )
-            // InternalTableDSL.g:17354:2: rule__XSetLiteral__Group__4__Impl
+            // InternalTableDSL.g:16732:1: ( rule__XSetLiteral__Group__4__Impl )
+            // InternalTableDSL.g:16733:2: rule__XSetLiteral__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__4__Impl();
@@ -57665,17 +55707,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group__4__Impl"
-    // InternalTableDSL.g:17360:1: rule__XSetLiteral__Group__4__Impl : ( '}' ) ;
+    // InternalTableDSL.g:16739:1: rule__XSetLiteral__Group__4__Impl : ( '}' ) ;
     public final void rule__XSetLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17364:1: ( ( '}' ) )
-            // InternalTableDSL.g:17365:1: ( '}' )
+            // InternalTableDSL.g:16743:1: ( ( '}' ) )
+            // InternalTableDSL.g:16744:1: ( '}' )
             {
-            // InternalTableDSL.g:17365:1: ( '}' )
-            // InternalTableDSL.g:17366:2: '}'
+            // InternalTableDSL.g:16744:1: ( '}' )
+            // InternalTableDSL.g:16745:2: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4()); 
@@ -57706,16 +55748,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__0"
-    // InternalTableDSL.g:17376:1: rule__XSetLiteral__Group_3__0 : rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 ;
+    // InternalTableDSL.g:16755:1: rule__XSetLiteral__Group_3__0 : rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 ;
     public final void rule__XSetLiteral__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17380:1: ( rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 )
-            // InternalTableDSL.g:17381:2: rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1
+            // InternalTableDSL.g:16759:1: ( rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 )
+            // InternalTableDSL.g:16760:2: rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_97);
             rule__XSetLiteral__Group_3__0__Impl();
 
             state._fsp--;
@@ -57744,23 +55786,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__0__Impl"
-    // InternalTableDSL.g:17388:1: rule__XSetLiteral__Group_3__0__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) ;
+    // InternalTableDSL.g:16767:1: rule__XSetLiteral__Group_3__0__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) ;
     public final void rule__XSetLiteral__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17392:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) )
-            // InternalTableDSL.g:17393:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
+            // InternalTableDSL.g:16771:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) )
+            // InternalTableDSL.g:16772:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
             {
-            // InternalTableDSL.g:17393:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
-            // InternalTableDSL.g:17394:2: ( rule__XSetLiteral__ElementsAssignment_3_0 )
+            // InternalTableDSL.g:16772:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
+            // InternalTableDSL.g:16773:2: ( rule__XSetLiteral__ElementsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsAssignment_3_0()); 
             }
-            // InternalTableDSL.g:17395:2: ( rule__XSetLiteral__ElementsAssignment_3_0 )
-            // InternalTableDSL.g:17395:3: rule__XSetLiteral__ElementsAssignment_3_0
+            // InternalTableDSL.g:16774:2: ( rule__XSetLiteral__ElementsAssignment_3_0 )
+            // InternalTableDSL.g:16774:3: rule__XSetLiteral__ElementsAssignment_3_0
             {
             pushFollow(FOLLOW_2);
             rule__XSetLiteral__ElementsAssignment_3_0();
@@ -57795,14 +55837,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__1"
-    // InternalTableDSL.g:17403:1: rule__XSetLiteral__Group_3__1 : rule__XSetLiteral__Group_3__1__Impl ;
+    // InternalTableDSL.g:16782:1: rule__XSetLiteral__Group_3__1 : rule__XSetLiteral__Group_3__1__Impl ;
     public final void rule__XSetLiteral__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17407:1: ( rule__XSetLiteral__Group_3__1__Impl )
-            // InternalTableDSL.g:17408:2: rule__XSetLiteral__Group_3__1__Impl
+            // InternalTableDSL.g:16786:1: ( rule__XSetLiteral__Group_3__1__Impl )
+            // InternalTableDSL.g:16787:2: rule__XSetLiteral__Group_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3__1__Impl();
@@ -57828,37 +55870,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__1__Impl"
-    // InternalTableDSL.g:17414:1: rule__XSetLiteral__Group_3__1__Impl : ( ( rule__XSetLiteral__Group_3_1__0 )* ) ;
+    // InternalTableDSL.g:16793:1: rule__XSetLiteral__Group_3__1__Impl : ( ( rule__XSetLiteral__Group_3_1__0 )* ) ;
     public final void rule__XSetLiteral__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17418:1: ( ( ( rule__XSetLiteral__Group_3_1__0 )* ) )
-            // InternalTableDSL.g:17419:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
+            // InternalTableDSL.g:16797:1: ( ( ( rule__XSetLiteral__Group_3_1__0 )* ) )
+            // InternalTableDSL.g:16798:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
             {
-            // InternalTableDSL.g:17419:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
-            // InternalTableDSL.g:17420:2: ( rule__XSetLiteral__Group_3_1__0 )*
+            // InternalTableDSL.g:16798:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
+            // InternalTableDSL.g:16799:2: ( rule__XSetLiteral__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup_3_1()); 
             }
-            // InternalTableDSL.g:17421:2: ( rule__XSetLiteral__Group_3_1__0 )*
-            loop120:
+            // InternalTableDSL.g:16800:2: ( rule__XSetLiteral__Group_3_1__0 )*
+            loop118:
             do {
-                int alt120=2;
-                int LA120_0 = input.LA(1);
+                int alt118=2;
+                int LA118_0 = input.LA(1);
 
-                if ( (LA120_0==137) ) {
-                    alt120=1;
+                if ( (LA118_0==137) ) {
+                    alt118=1;
                 }
 
 
-                switch (alt120) {
+                switch (alt118) {
             	case 1 :
-            	    // InternalTableDSL.g:17421:3: rule__XSetLiteral__Group_3_1__0
+            	    // InternalTableDSL.g:16800:3: rule__XSetLiteral__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XSetLiteral__Group_3_1__0();
 
             	    state._fsp--;
@@ -57868,7 +55910,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop120;
+            	    break loop118;
                 }
             } while (true);
 
@@ -57897,16 +55939,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__0"
-    // InternalTableDSL.g:17430:1: rule__XSetLiteral__Group_3_1__0 : rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 ;
+    // InternalTableDSL.g:16809:1: rule__XSetLiteral__Group_3_1__0 : rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 ;
     public final void rule__XSetLiteral__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17434:1: ( rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 )
-            // InternalTableDSL.g:17435:2: rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1
+            // InternalTableDSL.g:16813:1: ( rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 )
+            // InternalTableDSL.g:16814:2: rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XSetLiteral__Group_3_1__0__Impl();
 
             state._fsp--;
@@ -57935,17 +55977,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__0__Impl"
-    // InternalTableDSL.g:17442:1: rule__XSetLiteral__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:16821:1: rule__XSetLiteral__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XSetLiteral__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17446:1: ( ( ',' ) )
-            // InternalTableDSL.g:17447:1: ( ',' )
+            // InternalTableDSL.g:16825:1: ( ( ',' ) )
+            // InternalTableDSL.g:16826:1: ( ',' )
             {
-            // InternalTableDSL.g:17447:1: ( ',' )
-            // InternalTableDSL.g:17448:2: ','
+            // InternalTableDSL.g:16826:1: ( ',' )
+            // InternalTableDSL.g:16827:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0()); 
@@ -57976,14 +56018,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__1"
-    // InternalTableDSL.g:17457:1: rule__XSetLiteral__Group_3_1__1 : rule__XSetLiteral__Group_3_1__1__Impl ;
+    // InternalTableDSL.g:16836:1: rule__XSetLiteral__Group_3_1__1 : rule__XSetLiteral__Group_3_1__1__Impl ;
     public final void rule__XSetLiteral__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17461:1: ( rule__XSetLiteral__Group_3_1__1__Impl )
-            // InternalTableDSL.g:17462:2: rule__XSetLiteral__Group_3_1__1__Impl
+            // InternalTableDSL.g:16840:1: ( rule__XSetLiteral__Group_3_1__1__Impl )
+            // InternalTableDSL.g:16841:2: rule__XSetLiteral__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3_1__1__Impl();
@@ -58009,23 +56051,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__1__Impl"
-    // InternalTableDSL.g:17468:1: rule__XSetLiteral__Group_3_1__1__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) ;
+    // InternalTableDSL.g:16847:1: rule__XSetLiteral__Group_3_1__1__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) ;
     public final void rule__XSetLiteral__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17472:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) )
-            // InternalTableDSL.g:17473:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalTableDSL.g:16851:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) )
+            // InternalTableDSL.g:16852:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
             {
-            // InternalTableDSL.g:17473:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
-            // InternalTableDSL.g:17474:2: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
+            // InternalTableDSL.g:16852:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalTableDSL.g:16853:2: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsAssignment_3_1_1()); 
             }
-            // InternalTableDSL.g:17475:2: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
-            // InternalTableDSL.g:17475:3: rule__XSetLiteral__ElementsAssignment_3_1_1
+            // InternalTableDSL.g:16854:2: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
+            // InternalTableDSL.g:16854:3: rule__XSetLiteral__ElementsAssignment_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XSetLiteral__ElementsAssignment_3_1_1();
@@ -58060,16 +56102,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group__0"
-    // InternalTableDSL.g:17484:1: rule__XListLiteral__Group__0 : rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 ;
+    // InternalTableDSL.g:16863:1: rule__XListLiteral__Group__0 : rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 ;
     public final void rule__XListLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17488:1: ( rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 )
-            // InternalTableDSL.g:17489:2: rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1
+            // InternalTableDSL.g:16867:1: ( rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 )
+            // InternalTableDSL.g:16868:2: rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1
             {
-            pushFollow(FOLLOW_103);
+            pushFollow(FOLLOW_102);
             rule__XListLiteral__Group__0__Impl();
 
             state._fsp--;
@@ -58098,23 +56140,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group__0__Impl"
-    // InternalTableDSL.g:17496:1: rule__XListLiteral__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:16875:1: rule__XListLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XListLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17500:1: ( ( () ) )
-            // InternalTableDSL.g:17501:1: ( () )
+            // InternalTableDSL.g:16879:1: ( ( () ) )
+            // InternalTableDSL.g:16880:1: ( () )
             {
-            // InternalTableDSL.g:17501:1: ( () )
-            // InternalTableDSL.g:17502:2: ()
+            // InternalTableDSL.g:16880:1: ( () )
+            // InternalTableDSL.g:16881:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getXListLiteralAction_0()); 
             }
-            // InternalTableDSL.g:17503:2: ()
-            // InternalTableDSL.g:17503:3: 
+            // InternalTableDSL.g:16882:2: ()
+            // InternalTableDSL.g:16882:3: 
             {
             }
 
@@ -58139,16 +56181,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group__1"
-    // InternalTableDSL.g:17511:1: rule__XListLiteral__Group__1 : rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 ;
+    // InternalTableDSL.g:16890:1: rule__XListLiteral__Group__1 : rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 ;
     public final void rule__XListLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17515:1: ( rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 )
-            // InternalTableDSL.g:17516:2: rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2
+            // InternalTableDSL.g:16894:1: ( rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 )
+            // InternalTableDSL.g:16895:2: rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2
             {
-            pushFollow(FOLLOW_104);
+            pushFollow(FOLLOW_103);
             rule__XListLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -58177,17 +56219,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group__1__Impl"
-    // InternalTableDSL.g:17523:1: rule__XListLiteral__Group__1__Impl : ( '#' ) ;
+    // InternalTableDSL.g:16902:1: rule__XListLiteral__Group__1__Impl : ( '#' ) ;
     public final void rule__XListLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17527:1: ( ( '#' ) )
-            // InternalTableDSL.g:17528:1: ( '#' )
+            // InternalTableDSL.g:16906:1: ( ( '#' ) )
+            // InternalTableDSL.g:16907:1: ( '#' )
             {
-            // InternalTableDSL.g:17528:1: ( '#' )
-            // InternalTableDSL.g:17529:2: '#'
+            // InternalTableDSL.g:16907:1: ( '#' )
+            // InternalTableDSL.g:16908:2: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1()); 
@@ -58218,16 +56260,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group__2"
-    // InternalTableDSL.g:17538:1: rule__XListLiteral__Group__2 : rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 ;
+    // InternalTableDSL.g:16917:1: rule__XListLiteral__Group__2 : rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 ;
     public final void rule__XListLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17542:1: ( rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 )
-            // InternalTableDSL.g:17543:2: rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3
+            // InternalTableDSL.g:16921:1: ( rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 )
+            // InternalTableDSL.g:16922:2: rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3
             {
-            pushFollow(FOLLOW_102);
+            pushFollow(FOLLOW_101);
             rule__XListLiteral__Group__2__Impl();
 
             state._fsp--;
@@ -58256,17 +56298,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group__2__Impl"
-    // InternalTableDSL.g:17550:1: rule__XListLiteral__Group__2__Impl : ( '[' ) ;
+    // InternalTableDSL.g:16929:1: rule__XListLiteral__Group__2__Impl : ( '[' ) ;
     public final void rule__XListLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17554:1: ( ( '[' ) )
-            // InternalTableDSL.g:17555:1: ( '[' )
+            // InternalTableDSL.g:16933:1: ( ( '[' ) )
+            // InternalTableDSL.g:16934:1: ( '[' )
             {
-            // InternalTableDSL.g:17555:1: ( '[' )
-            // InternalTableDSL.g:17556:2: '['
+            // InternalTableDSL.g:16934:1: ( '[' )
+            // InternalTableDSL.g:16935:2: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2()); 
@@ -58297,16 +56339,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group__3"
-    // InternalTableDSL.g:17565:1: rule__XListLiteral__Group__3 : rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 ;
+    // InternalTableDSL.g:16944:1: rule__XListLiteral__Group__3 : rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 ;
     public final void rule__XListLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17569:1: ( rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 )
-            // InternalTableDSL.g:17570:2: rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4
+            // InternalTableDSL.g:16948:1: ( rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 )
+            // InternalTableDSL.g:16949:2: rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4
             {
-            pushFollow(FOLLOW_102);
+            pushFollow(FOLLOW_101);
             rule__XListLiteral__Group__3__Impl();
 
             state._fsp--;
@@ -58335,31 +56377,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group__3__Impl"
-    // InternalTableDSL.g:17577:1: rule__XListLiteral__Group__3__Impl : ( ( rule__XListLiteral__Group_3__0 )? ) ;
+    // InternalTableDSL.g:16956:1: rule__XListLiteral__Group__3__Impl : ( ( rule__XListLiteral__Group_3__0 )? ) ;
     public final void rule__XListLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17581:1: ( ( ( rule__XListLiteral__Group_3__0 )? ) )
-            // InternalTableDSL.g:17582:1: ( ( rule__XListLiteral__Group_3__0 )? )
+            // InternalTableDSL.g:16960:1: ( ( ( rule__XListLiteral__Group_3__0 )? ) )
+            // InternalTableDSL.g:16961:1: ( ( rule__XListLiteral__Group_3__0 )? )
             {
-            // InternalTableDSL.g:17582:1: ( ( rule__XListLiteral__Group_3__0 )? )
-            // InternalTableDSL.g:17583:2: ( rule__XListLiteral__Group_3__0 )?
+            // InternalTableDSL.g:16961:1: ( ( rule__XListLiteral__Group_3__0 )? )
+            // InternalTableDSL.g:16962:2: ( rule__XListLiteral__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup_3()); 
             }
-            // InternalTableDSL.g:17584:2: ( rule__XListLiteral__Group_3__0 )?
-            int alt121=2;
-            int LA121_0 = input.LA(1);
+            // InternalTableDSL.g:16963:2: ( rule__XListLiteral__Group_3__0 )?
+            int alt119=2;
+            int LA119_0 = input.LA(1);
 
-            if ( ((LA121_0>=RULE_STRING && LA121_0<=RULE_DECIMAL)||(LA121_0>=19 && LA121_0<=20)||LA121_0==32||LA121_0==43||(LA121_0>=48 && LA121_0<=53)||LA121_0==75||LA121_0==135||(LA121_0>=139 && LA121_0<=140)||LA121_0==142||LA121_0==144||(LA121_0>=147 && LA121_0<=155)||LA121_0==157||LA121_0==184) ) {
-                alt121=1;
+            if ( ((LA119_0>=RULE_STRING && LA119_0<=RULE_DECIMAL)||(LA119_0>=19 && LA119_0<=20)||LA119_0==32||LA119_0==43||(LA119_0>=48 && LA119_0<=53)||LA119_0==75||LA119_0==135||(LA119_0>=139 && LA119_0<=140)||LA119_0==142||LA119_0==144||(LA119_0>=147 && LA119_0<=155)||LA119_0==157||LA119_0==181) ) {
+                alt119=1;
             }
-            switch (alt121) {
+            switch (alt119) {
                 case 1 :
-                    // InternalTableDSL.g:17584:3: rule__XListLiteral__Group_3__0
+                    // InternalTableDSL.g:16963:3: rule__XListLiteral__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XListLiteral__Group_3__0();
@@ -58397,14 +56439,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group__4"
-    // InternalTableDSL.g:17592:1: rule__XListLiteral__Group__4 : rule__XListLiteral__Group__4__Impl ;
+    // InternalTableDSL.g:16971:1: rule__XListLiteral__Group__4 : rule__XListLiteral__Group__4__Impl ;
     public final void rule__XListLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17596:1: ( rule__XListLiteral__Group__4__Impl )
-            // InternalTableDSL.g:17597:2: rule__XListLiteral__Group__4__Impl
+            // InternalTableDSL.g:16975:1: ( rule__XListLiteral__Group__4__Impl )
+            // InternalTableDSL.g:16976:2: rule__XListLiteral__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__4__Impl();
@@ -58430,17 +56472,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group__4__Impl"
-    // InternalTableDSL.g:17603:1: rule__XListLiteral__Group__4__Impl : ( ']' ) ;
+    // InternalTableDSL.g:16982:1: rule__XListLiteral__Group__4__Impl : ( ']' ) ;
     public final void rule__XListLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17607:1: ( ( ']' ) )
-            // InternalTableDSL.g:17608:1: ( ']' )
+            // InternalTableDSL.g:16986:1: ( ( ']' ) )
+            // InternalTableDSL.g:16987:1: ( ']' )
             {
-            // InternalTableDSL.g:17608:1: ( ']' )
-            // InternalTableDSL.g:17609:2: ']'
+            // InternalTableDSL.g:16987:1: ( ']' )
+            // InternalTableDSL.g:16988:2: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4()); 
@@ -58471,16 +56513,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__0"
-    // InternalTableDSL.g:17619:1: rule__XListLiteral__Group_3__0 : rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 ;
+    // InternalTableDSL.g:16998:1: rule__XListLiteral__Group_3__0 : rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 ;
     public final void rule__XListLiteral__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17623:1: ( rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 )
-            // InternalTableDSL.g:17624:2: rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1
+            // InternalTableDSL.g:17002:1: ( rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 )
+            // InternalTableDSL.g:17003:2: rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_97);
             rule__XListLiteral__Group_3__0__Impl();
 
             state._fsp--;
@@ -58509,23 +56551,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__0__Impl"
-    // InternalTableDSL.g:17631:1: rule__XListLiteral__Group_3__0__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) ;
+    // InternalTableDSL.g:17010:1: rule__XListLiteral__Group_3__0__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) ;
     public final void rule__XListLiteral__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17635:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) )
-            // InternalTableDSL.g:17636:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
+            // InternalTableDSL.g:17014:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) )
+            // InternalTableDSL.g:17015:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
             {
-            // InternalTableDSL.g:17636:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
-            // InternalTableDSL.g:17637:2: ( rule__XListLiteral__ElementsAssignment_3_0 )
+            // InternalTableDSL.g:17015:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
+            // InternalTableDSL.g:17016:2: ( rule__XListLiteral__ElementsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsAssignment_3_0()); 
             }
-            // InternalTableDSL.g:17638:2: ( rule__XListLiteral__ElementsAssignment_3_0 )
-            // InternalTableDSL.g:17638:3: rule__XListLiteral__ElementsAssignment_3_0
+            // InternalTableDSL.g:17017:2: ( rule__XListLiteral__ElementsAssignment_3_0 )
+            // InternalTableDSL.g:17017:3: rule__XListLiteral__ElementsAssignment_3_0
             {
             pushFollow(FOLLOW_2);
             rule__XListLiteral__ElementsAssignment_3_0();
@@ -58560,14 +56602,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__1"
-    // InternalTableDSL.g:17646:1: rule__XListLiteral__Group_3__1 : rule__XListLiteral__Group_3__1__Impl ;
+    // InternalTableDSL.g:17025:1: rule__XListLiteral__Group_3__1 : rule__XListLiteral__Group_3__1__Impl ;
     public final void rule__XListLiteral__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17650:1: ( rule__XListLiteral__Group_3__1__Impl )
-            // InternalTableDSL.g:17651:2: rule__XListLiteral__Group_3__1__Impl
+            // InternalTableDSL.g:17029:1: ( rule__XListLiteral__Group_3__1__Impl )
+            // InternalTableDSL.g:17030:2: rule__XListLiteral__Group_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3__1__Impl();
@@ -58593,37 +56635,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__1__Impl"
-    // InternalTableDSL.g:17657:1: rule__XListLiteral__Group_3__1__Impl : ( ( rule__XListLiteral__Group_3_1__0 )* ) ;
+    // InternalTableDSL.g:17036:1: rule__XListLiteral__Group_3__1__Impl : ( ( rule__XListLiteral__Group_3_1__0 )* ) ;
     public final void rule__XListLiteral__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17661:1: ( ( ( rule__XListLiteral__Group_3_1__0 )* ) )
-            // InternalTableDSL.g:17662:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
+            // InternalTableDSL.g:17040:1: ( ( ( rule__XListLiteral__Group_3_1__0 )* ) )
+            // InternalTableDSL.g:17041:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
             {
-            // InternalTableDSL.g:17662:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
-            // InternalTableDSL.g:17663:2: ( rule__XListLiteral__Group_3_1__0 )*
+            // InternalTableDSL.g:17041:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
+            // InternalTableDSL.g:17042:2: ( rule__XListLiteral__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup_3_1()); 
             }
-            // InternalTableDSL.g:17664:2: ( rule__XListLiteral__Group_3_1__0 )*
-            loop122:
+            // InternalTableDSL.g:17043:2: ( rule__XListLiteral__Group_3_1__0 )*
+            loop120:
             do {
-                int alt122=2;
-                int LA122_0 = input.LA(1);
+                int alt120=2;
+                int LA120_0 = input.LA(1);
 
-                if ( (LA122_0==137) ) {
-                    alt122=1;
+                if ( (LA120_0==137) ) {
+                    alt120=1;
                 }
 
 
-                switch (alt122) {
+                switch (alt120) {
             	case 1 :
-            	    // InternalTableDSL.g:17664:3: rule__XListLiteral__Group_3_1__0
+            	    // InternalTableDSL.g:17043:3: rule__XListLiteral__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XListLiteral__Group_3_1__0();
 
             	    state._fsp--;
@@ -58633,7 +56675,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop122;
+            	    break loop120;
                 }
             } while (true);
 
@@ -58662,16 +56704,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__0"
-    // InternalTableDSL.g:17673:1: rule__XListLiteral__Group_3_1__0 : rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 ;
+    // InternalTableDSL.g:17052:1: rule__XListLiteral__Group_3_1__0 : rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 ;
     public final void rule__XListLiteral__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17677:1: ( rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 )
-            // InternalTableDSL.g:17678:2: rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1
+            // InternalTableDSL.g:17056:1: ( rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 )
+            // InternalTableDSL.g:17057:2: rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XListLiteral__Group_3_1__0__Impl();
 
             state._fsp--;
@@ -58700,17 +56742,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__0__Impl"
-    // InternalTableDSL.g:17685:1: rule__XListLiteral__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:17064:1: rule__XListLiteral__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XListLiteral__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17689:1: ( ( ',' ) )
-            // InternalTableDSL.g:17690:1: ( ',' )
+            // InternalTableDSL.g:17068:1: ( ( ',' ) )
+            // InternalTableDSL.g:17069:1: ( ',' )
             {
-            // InternalTableDSL.g:17690:1: ( ',' )
-            // InternalTableDSL.g:17691:2: ','
+            // InternalTableDSL.g:17069:1: ( ',' )
+            // InternalTableDSL.g:17070:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0()); 
@@ -58741,14 +56783,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__1"
-    // InternalTableDSL.g:17700:1: rule__XListLiteral__Group_3_1__1 : rule__XListLiteral__Group_3_1__1__Impl ;
+    // InternalTableDSL.g:17079:1: rule__XListLiteral__Group_3_1__1 : rule__XListLiteral__Group_3_1__1__Impl ;
     public final void rule__XListLiteral__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17704:1: ( rule__XListLiteral__Group_3_1__1__Impl )
-            // InternalTableDSL.g:17705:2: rule__XListLiteral__Group_3_1__1__Impl
+            // InternalTableDSL.g:17083:1: ( rule__XListLiteral__Group_3_1__1__Impl )
+            // InternalTableDSL.g:17084:2: rule__XListLiteral__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3_1__1__Impl();
@@ -58774,23 +56816,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__1__Impl"
-    // InternalTableDSL.g:17711:1: rule__XListLiteral__Group_3_1__1__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) ;
+    // InternalTableDSL.g:17090:1: rule__XListLiteral__Group_3_1__1__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) ;
     public final void rule__XListLiteral__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17715:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) )
-            // InternalTableDSL.g:17716:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalTableDSL.g:17094:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) )
+            // InternalTableDSL.g:17095:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
             {
-            // InternalTableDSL.g:17716:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
-            // InternalTableDSL.g:17717:2: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
+            // InternalTableDSL.g:17095:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalTableDSL.g:17096:2: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsAssignment_3_1_1()); 
             }
-            // InternalTableDSL.g:17718:2: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
-            // InternalTableDSL.g:17718:3: rule__XListLiteral__ElementsAssignment_3_1_1
+            // InternalTableDSL.g:17097:2: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
+            // InternalTableDSL.g:17097:3: rule__XListLiteral__ElementsAssignment_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XListLiteral__ElementsAssignment_3_1_1();
@@ -58825,16 +56867,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group__0"
-    // InternalTableDSL.g:17727:1: rule__XClosure__Group__0 : rule__XClosure__Group__0__Impl rule__XClosure__Group__1 ;
+    // InternalTableDSL.g:17106:1: rule__XClosure__Group__0 : rule__XClosure__Group__0__Impl rule__XClosure__Group__1 ;
     public final void rule__XClosure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17731:1: ( rule__XClosure__Group__0__Impl rule__XClosure__Group__1 )
-            // InternalTableDSL.g:17732:2: rule__XClosure__Group__0__Impl rule__XClosure__Group__1
+            // InternalTableDSL.g:17110:1: ( rule__XClosure__Group__0__Impl rule__XClosure__Group__1 )
+            // InternalTableDSL.g:17111:2: rule__XClosure__Group__0__Impl rule__XClosure__Group__1
             {
-            pushFollow(FOLLOW_141);
+            pushFollow(FOLLOW_140);
             rule__XClosure__Group__0__Impl();
 
             state._fsp--;
@@ -58863,23 +56905,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group__0__Impl"
-    // InternalTableDSL.g:17739:1: rule__XClosure__Group__0__Impl : ( ( rule__XClosure__Group_0__0 ) ) ;
+    // InternalTableDSL.g:17118:1: rule__XClosure__Group__0__Impl : ( ( rule__XClosure__Group_0__0 ) ) ;
     public final void rule__XClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17743:1: ( ( ( rule__XClosure__Group_0__0 ) ) )
-            // InternalTableDSL.g:17744:1: ( ( rule__XClosure__Group_0__0 ) )
+            // InternalTableDSL.g:17122:1: ( ( ( rule__XClosure__Group_0__0 ) ) )
+            // InternalTableDSL.g:17123:1: ( ( rule__XClosure__Group_0__0 ) )
             {
-            // InternalTableDSL.g:17744:1: ( ( rule__XClosure__Group_0__0 ) )
-            // InternalTableDSL.g:17745:2: ( rule__XClosure__Group_0__0 )
+            // InternalTableDSL.g:17123:1: ( ( rule__XClosure__Group_0__0 ) )
+            // InternalTableDSL.g:17124:2: ( rule__XClosure__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_0()); 
             }
-            // InternalTableDSL.g:17746:2: ( rule__XClosure__Group_0__0 )
-            // InternalTableDSL.g:17746:3: rule__XClosure__Group_0__0
+            // InternalTableDSL.g:17125:2: ( rule__XClosure__Group_0__0 )
+            // InternalTableDSL.g:17125:3: rule__XClosure__Group_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_0__0();
@@ -58914,16 +56956,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group__1"
-    // InternalTableDSL.g:17754:1: rule__XClosure__Group__1 : rule__XClosure__Group__1__Impl rule__XClosure__Group__2 ;
+    // InternalTableDSL.g:17133:1: rule__XClosure__Group__1 : rule__XClosure__Group__1__Impl rule__XClosure__Group__2 ;
     public final void rule__XClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17758:1: ( rule__XClosure__Group__1__Impl rule__XClosure__Group__2 )
-            // InternalTableDSL.g:17759:2: rule__XClosure__Group__1__Impl rule__XClosure__Group__2
+            // InternalTableDSL.g:17137:1: ( rule__XClosure__Group__1__Impl rule__XClosure__Group__2 )
+            // InternalTableDSL.g:17138:2: rule__XClosure__Group__1__Impl rule__XClosure__Group__2
             {
-            pushFollow(FOLLOW_141);
+            pushFollow(FOLLOW_140);
             rule__XClosure__Group__1__Impl();
 
             state._fsp--;
@@ -58952,27 +56994,27 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group__1__Impl"
-    // InternalTableDSL.g:17766:1: rule__XClosure__Group__1__Impl : ( ( rule__XClosure__Group_1__0 )? ) ;
+    // InternalTableDSL.g:17145:1: rule__XClosure__Group__1__Impl : ( ( rule__XClosure__Group_1__0 )? ) ;
     public final void rule__XClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17770:1: ( ( ( rule__XClosure__Group_1__0 )? ) )
-            // InternalTableDSL.g:17771:1: ( ( rule__XClosure__Group_1__0 )? )
+            // InternalTableDSL.g:17149:1: ( ( ( rule__XClosure__Group_1__0 )? ) )
+            // InternalTableDSL.g:17150:1: ( ( rule__XClosure__Group_1__0 )? )
             {
-            // InternalTableDSL.g:17771:1: ( ( rule__XClosure__Group_1__0 )? )
-            // InternalTableDSL.g:17772:2: ( rule__XClosure__Group_1__0 )?
+            // InternalTableDSL.g:17150:1: ( ( rule__XClosure__Group_1__0 )? )
+            // InternalTableDSL.g:17151:2: ( rule__XClosure__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1()); 
             }
-            // InternalTableDSL.g:17773:2: ( rule__XClosure__Group_1__0 )?
-            int alt123=2;
-            alt123 = dfa123.predict(input);
-            switch (alt123) {
+            // InternalTableDSL.g:17152:2: ( rule__XClosure__Group_1__0 )?
+            int alt121=2;
+            alt121 = dfa121.predict(input);
+            switch (alt121) {
                 case 1 :
-                    // InternalTableDSL.g:17773:3: rule__XClosure__Group_1__0
+                    // InternalTableDSL.g:17152:3: rule__XClosure__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XClosure__Group_1__0();
@@ -59010,16 +57052,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group__2"
-    // InternalTableDSL.g:17781:1: rule__XClosure__Group__2 : rule__XClosure__Group__2__Impl rule__XClosure__Group__3 ;
+    // InternalTableDSL.g:17160:1: rule__XClosure__Group__2 : rule__XClosure__Group__2__Impl rule__XClosure__Group__3 ;
     public final void rule__XClosure__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17785:1: ( rule__XClosure__Group__2__Impl rule__XClosure__Group__3 )
-            // InternalTableDSL.g:17786:2: rule__XClosure__Group__2__Impl rule__XClosure__Group__3
+            // InternalTableDSL.g:17164:1: ( rule__XClosure__Group__2__Impl rule__XClosure__Group__3 )
+            // InternalTableDSL.g:17165:2: rule__XClosure__Group__2__Impl rule__XClosure__Group__3
             {
-            pushFollow(FOLLOW_142);
+            pushFollow(FOLLOW_141);
             rule__XClosure__Group__2__Impl();
 
             state._fsp--;
@@ -59048,23 +57090,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group__2__Impl"
-    // InternalTableDSL.g:17793:1: rule__XClosure__Group__2__Impl : ( ( rule__XClosure__ExpressionAssignment_2 ) ) ;
+    // InternalTableDSL.g:17172:1: rule__XClosure__Group__2__Impl : ( ( rule__XClosure__ExpressionAssignment_2 ) ) ;
     public final void rule__XClosure__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17797:1: ( ( ( rule__XClosure__ExpressionAssignment_2 ) ) )
-            // InternalTableDSL.g:17798:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
+            // InternalTableDSL.g:17176:1: ( ( ( rule__XClosure__ExpressionAssignment_2 ) ) )
+            // InternalTableDSL.g:17177:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
             {
-            // InternalTableDSL.g:17798:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
-            // InternalTableDSL.g:17799:2: ( rule__XClosure__ExpressionAssignment_2 )
+            // InternalTableDSL.g:17177:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
+            // InternalTableDSL.g:17178:2: ( rule__XClosure__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExpressionAssignment_2()); 
             }
-            // InternalTableDSL.g:17800:2: ( rule__XClosure__ExpressionAssignment_2 )
-            // InternalTableDSL.g:17800:3: rule__XClosure__ExpressionAssignment_2
+            // InternalTableDSL.g:17179:2: ( rule__XClosure__ExpressionAssignment_2 )
+            // InternalTableDSL.g:17179:3: rule__XClosure__ExpressionAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__ExpressionAssignment_2();
@@ -59099,14 +57141,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group__3"
-    // InternalTableDSL.g:17808:1: rule__XClosure__Group__3 : rule__XClosure__Group__3__Impl ;
+    // InternalTableDSL.g:17187:1: rule__XClosure__Group__3 : rule__XClosure__Group__3__Impl ;
     public final void rule__XClosure__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17812:1: ( rule__XClosure__Group__3__Impl )
-            // InternalTableDSL.g:17813:2: rule__XClosure__Group__3__Impl
+            // InternalTableDSL.g:17191:1: ( rule__XClosure__Group__3__Impl )
+            // InternalTableDSL.g:17192:2: rule__XClosure__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group__3__Impl();
@@ -59132,17 +57174,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group__3__Impl"
-    // InternalTableDSL.g:17819:1: rule__XClosure__Group__3__Impl : ( ']' ) ;
+    // InternalTableDSL.g:17198:1: rule__XClosure__Group__3__Impl : ( ']' ) ;
     public final void rule__XClosure__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17823:1: ( ( ']' ) )
-            // InternalTableDSL.g:17824:1: ( ']' )
+            // InternalTableDSL.g:17202:1: ( ( ']' ) )
+            // InternalTableDSL.g:17203:1: ( ']' )
             {
-            // InternalTableDSL.g:17824:1: ( ']' )
-            // InternalTableDSL.g:17825:2: ']'
+            // InternalTableDSL.g:17203:1: ( ']' )
+            // InternalTableDSL.g:17204:2: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3()); 
@@ -59173,14 +57215,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_0__0"
-    // InternalTableDSL.g:17835:1: rule__XClosure__Group_0__0 : rule__XClosure__Group_0__0__Impl ;
+    // InternalTableDSL.g:17214:1: rule__XClosure__Group_0__0 : rule__XClosure__Group_0__0__Impl ;
     public final void rule__XClosure__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17839:1: ( rule__XClosure__Group_0__0__Impl )
-            // InternalTableDSL.g:17840:2: rule__XClosure__Group_0__0__Impl
+            // InternalTableDSL.g:17218:1: ( rule__XClosure__Group_0__0__Impl )
+            // InternalTableDSL.g:17219:2: rule__XClosure__Group_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_0__0__Impl();
@@ -59206,23 +57248,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_0__0__Impl"
-    // InternalTableDSL.g:17846:1: rule__XClosure__Group_0__0__Impl : ( ( rule__XClosure__Group_0_0__0 ) ) ;
+    // InternalTableDSL.g:17225:1: rule__XClosure__Group_0__0__Impl : ( ( rule__XClosure__Group_0_0__0 ) ) ;
     public final void rule__XClosure__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17850:1: ( ( ( rule__XClosure__Group_0_0__0 ) ) )
-            // InternalTableDSL.g:17851:1: ( ( rule__XClosure__Group_0_0__0 ) )
+            // InternalTableDSL.g:17229:1: ( ( ( rule__XClosure__Group_0_0__0 ) ) )
+            // InternalTableDSL.g:17230:1: ( ( rule__XClosure__Group_0_0__0 ) )
             {
-            // InternalTableDSL.g:17851:1: ( ( rule__XClosure__Group_0_0__0 ) )
-            // InternalTableDSL.g:17852:2: ( rule__XClosure__Group_0_0__0 )
+            // InternalTableDSL.g:17230:1: ( ( rule__XClosure__Group_0_0__0 ) )
+            // InternalTableDSL.g:17231:2: ( rule__XClosure__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_0_0()); 
             }
-            // InternalTableDSL.g:17853:2: ( rule__XClosure__Group_0_0__0 )
-            // InternalTableDSL.g:17853:3: rule__XClosure__Group_0_0__0
+            // InternalTableDSL.g:17232:2: ( rule__XClosure__Group_0_0__0 )
+            // InternalTableDSL.g:17232:3: rule__XClosure__Group_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_0_0__0();
@@ -59257,16 +57299,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__0"
-    // InternalTableDSL.g:17862:1: rule__XClosure__Group_0_0__0 : rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 ;
+    // InternalTableDSL.g:17241:1: rule__XClosure__Group_0_0__0 : rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 ;
     public final void rule__XClosure__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17866:1: ( rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 )
-            // InternalTableDSL.g:17867:2: rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1
+            // InternalTableDSL.g:17245:1: ( rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 )
+            // InternalTableDSL.g:17246:2: rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1
             {
-            pushFollow(FOLLOW_104);
+            pushFollow(FOLLOW_103);
             rule__XClosure__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -59295,23 +57337,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__0__Impl"
-    // InternalTableDSL.g:17874:1: rule__XClosure__Group_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:17253:1: rule__XClosure__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XClosure__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17878:1: ( ( () ) )
-            // InternalTableDSL.g:17879:1: ( () )
+            // InternalTableDSL.g:17257:1: ( ( () ) )
+            // InternalTableDSL.g:17258:1: ( () )
             {
-            // InternalTableDSL.g:17879:1: ( () )
-            // InternalTableDSL.g:17880:2: ()
+            // InternalTableDSL.g:17258:1: ( () )
+            // InternalTableDSL.g:17259:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getXClosureAction_0_0_0()); 
             }
-            // InternalTableDSL.g:17881:2: ()
-            // InternalTableDSL.g:17881:3: 
+            // InternalTableDSL.g:17260:2: ()
+            // InternalTableDSL.g:17260:3: 
             {
             }
 
@@ -59336,14 +57378,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__1"
-    // InternalTableDSL.g:17889:1: rule__XClosure__Group_0_0__1 : rule__XClosure__Group_0_0__1__Impl ;
+    // InternalTableDSL.g:17268:1: rule__XClosure__Group_0_0__1 : rule__XClosure__Group_0_0__1__Impl ;
     public final void rule__XClosure__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17893:1: ( rule__XClosure__Group_0_0__1__Impl )
-            // InternalTableDSL.g:17894:2: rule__XClosure__Group_0_0__1__Impl
+            // InternalTableDSL.g:17272:1: ( rule__XClosure__Group_0_0__1__Impl )
+            // InternalTableDSL.g:17273:2: rule__XClosure__Group_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_0_0__1__Impl();
@@ -59369,17 +57411,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__1__Impl"
-    // InternalTableDSL.g:17900:1: rule__XClosure__Group_0_0__1__Impl : ( '[' ) ;
+    // InternalTableDSL.g:17279:1: rule__XClosure__Group_0_0__1__Impl : ( '[' ) ;
     public final void rule__XClosure__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17904:1: ( ( '[' ) )
-            // InternalTableDSL.g:17905:1: ( '[' )
+            // InternalTableDSL.g:17283:1: ( ( '[' ) )
+            // InternalTableDSL.g:17284:1: ( '[' )
             {
-            // InternalTableDSL.g:17905:1: ( '[' )
-            // InternalTableDSL.g:17906:2: '['
+            // InternalTableDSL.g:17284:1: ( '[' )
+            // InternalTableDSL.g:17285:2: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1()); 
@@ -59410,14 +57452,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_1__0"
-    // InternalTableDSL.g:17916:1: rule__XClosure__Group_1__0 : rule__XClosure__Group_1__0__Impl ;
+    // InternalTableDSL.g:17295:1: rule__XClosure__Group_1__0 : rule__XClosure__Group_1__0__Impl ;
     public final void rule__XClosure__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17920:1: ( rule__XClosure__Group_1__0__Impl )
-            // InternalTableDSL.g:17921:2: rule__XClosure__Group_1__0__Impl
+            // InternalTableDSL.g:17299:1: ( rule__XClosure__Group_1__0__Impl )
+            // InternalTableDSL.g:17300:2: rule__XClosure__Group_1__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_1__0__Impl();
@@ -59443,23 +57485,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_1__0__Impl"
-    // InternalTableDSL.g:17927:1: rule__XClosure__Group_1__0__Impl : ( ( rule__XClosure__Group_1_0__0 ) ) ;
+    // InternalTableDSL.g:17306:1: rule__XClosure__Group_1__0__Impl : ( ( rule__XClosure__Group_1_0__0 ) ) ;
     public final void rule__XClosure__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17931:1: ( ( ( rule__XClosure__Group_1_0__0 ) ) )
-            // InternalTableDSL.g:17932:1: ( ( rule__XClosure__Group_1_0__0 ) )
+            // InternalTableDSL.g:17310:1: ( ( ( rule__XClosure__Group_1_0__0 ) ) )
+            // InternalTableDSL.g:17311:1: ( ( rule__XClosure__Group_1_0__0 ) )
             {
-            // InternalTableDSL.g:17932:1: ( ( rule__XClosure__Group_1_0__0 ) )
-            // InternalTableDSL.g:17933:2: ( rule__XClosure__Group_1_0__0 )
+            // InternalTableDSL.g:17311:1: ( ( rule__XClosure__Group_1_0__0 ) )
+            // InternalTableDSL.g:17312:2: ( rule__XClosure__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0()); 
             }
-            // InternalTableDSL.g:17934:2: ( rule__XClosure__Group_1_0__0 )
-            // InternalTableDSL.g:17934:3: rule__XClosure__Group_1_0__0
+            // InternalTableDSL.g:17313:2: ( rule__XClosure__Group_1_0__0 )
+            // InternalTableDSL.g:17313:3: rule__XClosure__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0__0();
@@ -59494,16 +57536,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__0"
-    // InternalTableDSL.g:17943:1: rule__XClosure__Group_1_0__0 : rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 ;
+    // InternalTableDSL.g:17322:1: rule__XClosure__Group_1_0__0 : rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 ;
     public final void rule__XClosure__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17947:1: ( rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 )
-            // InternalTableDSL.g:17948:2: rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1
+            // InternalTableDSL.g:17326:1: ( rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 )
+            // InternalTableDSL.g:17327:2: rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1
             {
-            pushFollow(FOLLOW_143);
+            pushFollow(FOLLOW_142);
             rule__XClosure__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -59532,31 +57574,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__0__Impl"
-    // InternalTableDSL.g:17955:1: rule__XClosure__Group_1_0__0__Impl : ( ( rule__XClosure__Group_1_0_0__0 )? ) ;
+    // InternalTableDSL.g:17334:1: rule__XClosure__Group_1_0__0__Impl : ( ( rule__XClosure__Group_1_0_0__0 )? ) ;
     public final void rule__XClosure__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17959:1: ( ( ( rule__XClosure__Group_1_0_0__0 )? ) )
-            // InternalTableDSL.g:17960:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
+            // InternalTableDSL.g:17338:1: ( ( ( rule__XClosure__Group_1_0_0__0 )? ) )
+            // InternalTableDSL.g:17339:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
             {
-            // InternalTableDSL.g:17960:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
-            // InternalTableDSL.g:17961:2: ( rule__XClosure__Group_1_0_0__0 )?
+            // InternalTableDSL.g:17339:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
+            // InternalTableDSL.g:17340:2: ( rule__XClosure__Group_1_0_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0_0()); 
             }
-            // InternalTableDSL.g:17962:2: ( rule__XClosure__Group_1_0_0__0 )?
-            int alt124=2;
-            int LA124_0 = input.LA(1);
+            // InternalTableDSL.g:17341:2: ( rule__XClosure__Group_1_0_0__0 )?
+            int alt122=2;
+            int LA122_0 = input.LA(1);
 
-            if ( (LA124_0==RULE_ID||LA124_0==36||LA124_0==135) ) {
-                alt124=1;
+            if ( (LA122_0==RULE_ID||LA122_0==36||LA122_0==135) ) {
+                alt122=1;
             }
-            switch (alt124) {
+            switch (alt122) {
                 case 1 :
-                    // InternalTableDSL.g:17962:3: rule__XClosure__Group_1_0_0__0
+                    // InternalTableDSL.g:17341:3: rule__XClosure__Group_1_0_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XClosure__Group_1_0_0__0();
@@ -59594,14 +57636,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__1"
-    // InternalTableDSL.g:17970:1: rule__XClosure__Group_1_0__1 : rule__XClosure__Group_1_0__1__Impl ;
+    // InternalTableDSL.g:17349:1: rule__XClosure__Group_1_0__1 : rule__XClosure__Group_1_0__1__Impl ;
     public final void rule__XClosure__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17974:1: ( rule__XClosure__Group_1_0__1__Impl )
-            // InternalTableDSL.g:17975:2: rule__XClosure__Group_1_0__1__Impl
+            // InternalTableDSL.g:17353:1: ( rule__XClosure__Group_1_0__1__Impl )
+            // InternalTableDSL.g:17354:2: rule__XClosure__Group_1_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0__1__Impl();
@@ -59627,23 +57669,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__1__Impl"
-    // InternalTableDSL.g:17981:1: rule__XClosure__Group_1_0__1__Impl : ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) ;
+    // InternalTableDSL.g:17360:1: rule__XClosure__Group_1_0__1__Impl : ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) ;
     public final void rule__XClosure__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:17985:1: ( ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) )
-            // InternalTableDSL.g:17986:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
+            // InternalTableDSL.g:17364:1: ( ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) )
+            // InternalTableDSL.g:17365:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
             {
-            // InternalTableDSL.g:17986:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
-            // InternalTableDSL.g:17987:2: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
+            // InternalTableDSL.g:17365:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
+            // InternalTableDSL.g:17366:2: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxAssignment_1_0_1()); 
             }
-            // InternalTableDSL.g:17988:2: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
-            // InternalTableDSL.g:17988:3: rule__XClosure__ExplicitSyntaxAssignment_1_0_1
+            // InternalTableDSL.g:17367:2: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
+            // InternalTableDSL.g:17367:3: rule__XClosure__ExplicitSyntaxAssignment_1_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__ExplicitSyntaxAssignment_1_0_1();
@@ -59678,16 +57720,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__0"
-    // InternalTableDSL.g:17997:1: rule__XClosure__Group_1_0_0__0 : rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 ;
+    // InternalTableDSL.g:17376:1: rule__XClosure__Group_1_0_0__0 : rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 ;
     public final void rule__XClosure__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18001:1: ( rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 )
-            // InternalTableDSL.g:18002:2: rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1
+            // InternalTableDSL.g:17380:1: ( rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 )
+            // InternalTableDSL.g:17381:2: rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_97);
             rule__XClosure__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -59716,23 +57758,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__0__Impl"
-    // InternalTableDSL.g:18009:1: rule__XClosure__Group_1_0_0__0__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) ;
+    // InternalTableDSL.g:17388:1: rule__XClosure__Group_1_0_0__0__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) ;
     public final void rule__XClosure__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18013:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) )
-            // InternalTableDSL.g:18014:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
+            // InternalTableDSL.g:17392:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) )
+            // InternalTableDSL.g:17393:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
             {
-            // InternalTableDSL.g:18014:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
-            // InternalTableDSL.g:18015:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
+            // InternalTableDSL.g:17393:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
+            // InternalTableDSL.g:17394:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersAssignment_1_0_0_0()); 
             }
-            // InternalTableDSL.g:18016:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
-            // InternalTableDSL.g:18016:3: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0
+            // InternalTableDSL.g:17395:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
+            // InternalTableDSL.g:17395:3: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0();
@@ -59767,14 +57809,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__1"
-    // InternalTableDSL.g:18024:1: rule__XClosure__Group_1_0_0__1 : rule__XClosure__Group_1_0_0__1__Impl ;
+    // InternalTableDSL.g:17403:1: rule__XClosure__Group_1_0_0__1 : rule__XClosure__Group_1_0_0__1__Impl ;
     public final void rule__XClosure__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18028:1: ( rule__XClosure__Group_1_0_0__1__Impl )
-            // InternalTableDSL.g:18029:2: rule__XClosure__Group_1_0_0__1__Impl
+            // InternalTableDSL.g:17407:1: ( rule__XClosure__Group_1_0_0__1__Impl )
+            // InternalTableDSL.g:17408:2: rule__XClosure__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0__1__Impl();
@@ -59800,37 +57842,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__1__Impl"
-    // InternalTableDSL.g:18035:1: rule__XClosure__Group_1_0_0__1__Impl : ( ( rule__XClosure__Group_1_0_0_1__0 )* ) ;
+    // InternalTableDSL.g:17414:1: rule__XClosure__Group_1_0_0__1__Impl : ( ( rule__XClosure__Group_1_0_0_1__0 )* ) ;
     public final void rule__XClosure__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18039:1: ( ( ( rule__XClosure__Group_1_0_0_1__0 )* ) )
-            // InternalTableDSL.g:18040:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
+            // InternalTableDSL.g:17418:1: ( ( ( rule__XClosure__Group_1_0_0_1__0 )* ) )
+            // InternalTableDSL.g:17419:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
             {
-            // InternalTableDSL.g:18040:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
-            // InternalTableDSL.g:18041:2: ( rule__XClosure__Group_1_0_0_1__0 )*
+            // InternalTableDSL.g:17419:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
+            // InternalTableDSL.g:17420:2: ( rule__XClosure__Group_1_0_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0_0_1()); 
             }
-            // InternalTableDSL.g:18042:2: ( rule__XClosure__Group_1_0_0_1__0 )*
-            loop125:
+            // InternalTableDSL.g:17421:2: ( rule__XClosure__Group_1_0_0_1__0 )*
+            loop123:
             do {
-                int alt125=2;
-                int LA125_0 = input.LA(1);
+                int alt123=2;
+                int LA123_0 = input.LA(1);
 
-                if ( (LA125_0==137) ) {
-                    alt125=1;
+                if ( (LA123_0==137) ) {
+                    alt123=1;
                 }
 
 
-                switch (alt125) {
+                switch (alt123) {
             	case 1 :
-            	    // InternalTableDSL.g:18042:3: rule__XClosure__Group_1_0_0_1__0
+            	    // InternalTableDSL.g:17421:3: rule__XClosure__Group_1_0_0_1__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XClosure__Group_1_0_0_1__0();
 
             	    state._fsp--;
@@ -59840,7 +57882,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop125;
+            	    break loop123;
                 }
             } while (true);
 
@@ -59869,16 +57911,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__0"
-    // InternalTableDSL.g:18051:1: rule__XClosure__Group_1_0_0_1__0 : rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 ;
+    // InternalTableDSL.g:17430:1: rule__XClosure__Group_1_0_0_1__0 : rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 ;
     public final void rule__XClosure__Group_1_0_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18055:1: ( rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 )
-            // InternalTableDSL.g:18056:2: rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1
+            // InternalTableDSL.g:17434:1: ( rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 )
+            // InternalTableDSL.g:17435:2: rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__XClosure__Group_1_0_0_1__0__Impl();
 
             state._fsp--;
@@ -59907,17 +57949,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__0__Impl"
-    // InternalTableDSL.g:18063:1: rule__XClosure__Group_1_0_0_1__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:17442:1: rule__XClosure__Group_1_0_0_1__0__Impl : ( ',' ) ;
     public final void rule__XClosure__Group_1_0_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18067:1: ( ( ',' ) )
-            // InternalTableDSL.g:18068:1: ( ',' )
+            // InternalTableDSL.g:17446:1: ( ( ',' ) )
+            // InternalTableDSL.g:17447:1: ( ',' )
             {
-            // InternalTableDSL.g:18068:1: ( ',' )
-            // InternalTableDSL.g:18069:2: ','
+            // InternalTableDSL.g:17447:1: ( ',' )
+            // InternalTableDSL.g:17448:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0()); 
@@ -59948,14 +57990,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__1"
-    // InternalTableDSL.g:18078:1: rule__XClosure__Group_1_0_0_1__1 : rule__XClosure__Group_1_0_0_1__1__Impl ;
+    // InternalTableDSL.g:17457:1: rule__XClosure__Group_1_0_0_1__1 : rule__XClosure__Group_1_0_0_1__1__Impl ;
     public final void rule__XClosure__Group_1_0_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18082:1: ( rule__XClosure__Group_1_0_0_1__1__Impl )
-            // InternalTableDSL.g:18083:2: rule__XClosure__Group_1_0_0_1__1__Impl
+            // InternalTableDSL.g:17461:1: ( rule__XClosure__Group_1_0_0_1__1__Impl )
+            // InternalTableDSL.g:17462:2: rule__XClosure__Group_1_0_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0_1__1__Impl();
@@ -59981,23 +58023,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__1__Impl"
-    // InternalTableDSL.g:18089:1: rule__XClosure__Group_1_0_0_1__1__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) ;
+    // InternalTableDSL.g:17468:1: rule__XClosure__Group_1_0_0_1__1__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) ;
     public final void rule__XClosure__Group_1_0_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18093:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) )
-            // InternalTableDSL.g:18094:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
+            // InternalTableDSL.g:17472:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) )
+            // InternalTableDSL.g:17473:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
             {
-            // InternalTableDSL.g:18094:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
-            // InternalTableDSL.g:18095:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
+            // InternalTableDSL.g:17473:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
+            // InternalTableDSL.g:17474:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersAssignment_1_0_0_1_1()); 
             }
-            // InternalTableDSL.g:18096:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
-            // InternalTableDSL.g:18096:3: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1
+            // InternalTableDSL.g:17475:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
+            // InternalTableDSL.g:17475:3: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1();
@@ -60032,16 +58074,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__0"
-    // InternalTableDSL.g:18105:1: rule__XExpressionInClosure__Group__0 : rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 ;
+    // InternalTableDSL.g:17484:1: rule__XExpressionInClosure__Group__0 : rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 ;
     public final void rule__XExpressionInClosure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18109:1: ( rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 )
-            // InternalTableDSL.g:18110:2: rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1
+            // InternalTableDSL.g:17488:1: ( rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 )
+            // InternalTableDSL.g:17489:2: rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1
             {
-            pushFollow(FOLLOW_141);
+            pushFollow(FOLLOW_140);
             rule__XExpressionInClosure__Group__0__Impl();
 
             state._fsp--;
@@ -60070,23 +58112,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__0__Impl"
-    // InternalTableDSL.g:18117:1: rule__XExpressionInClosure__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:17496:1: rule__XExpressionInClosure__Group__0__Impl : ( () ) ;
     public final void rule__XExpressionInClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18121:1: ( ( () ) )
-            // InternalTableDSL.g:18122:1: ( () )
+            // InternalTableDSL.g:17500:1: ( ( () ) )
+            // InternalTableDSL.g:17501:1: ( () )
             {
-            // InternalTableDSL.g:18122:1: ( () )
-            // InternalTableDSL.g:18123:2: ()
+            // InternalTableDSL.g:17501:1: ( () )
+            // InternalTableDSL.g:17502:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getXBlockExpressionAction_0()); 
             }
-            // InternalTableDSL.g:18124:2: ()
-            // InternalTableDSL.g:18124:3: 
+            // InternalTableDSL.g:17503:2: ()
+            // InternalTableDSL.g:17503:3: 
             {
             }
 
@@ -60111,14 +58153,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__1"
-    // InternalTableDSL.g:18132:1: rule__XExpressionInClosure__Group__1 : rule__XExpressionInClosure__Group__1__Impl ;
+    // InternalTableDSL.g:17511:1: rule__XExpressionInClosure__Group__1 : rule__XExpressionInClosure__Group__1__Impl ;
     public final void rule__XExpressionInClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18136:1: ( rule__XExpressionInClosure__Group__1__Impl )
-            // InternalTableDSL.g:18137:2: rule__XExpressionInClosure__Group__1__Impl
+            // InternalTableDSL.g:17515:1: ( rule__XExpressionInClosure__Group__1__Impl )
+            // InternalTableDSL.g:17516:2: rule__XExpressionInClosure__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group__1__Impl();
@@ -60144,37 +58186,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__1__Impl"
-    // InternalTableDSL.g:18143:1: rule__XExpressionInClosure__Group__1__Impl : ( ( rule__XExpressionInClosure__Group_1__0 )* ) ;
+    // InternalTableDSL.g:17522:1: rule__XExpressionInClosure__Group__1__Impl : ( ( rule__XExpressionInClosure__Group_1__0 )* ) ;
     public final void rule__XExpressionInClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18147:1: ( ( ( rule__XExpressionInClosure__Group_1__0 )* ) )
-            // InternalTableDSL.g:18148:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
+            // InternalTableDSL.g:17526:1: ( ( ( rule__XExpressionInClosure__Group_1__0 )* ) )
+            // InternalTableDSL.g:17527:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
             {
-            // InternalTableDSL.g:18148:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
-            // InternalTableDSL.g:18149:2: ( rule__XExpressionInClosure__Group_1__0 )*
+            // InternalTableDSL.g:17527:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
+            // InternalTableDSL.g:17528:2: ( rule__XExpressionInClosure__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getGroup_1()); 
             }
-            // InternalTableDSL.g:18150:2: ( rule__XExpressionInClosure__Group_1__0 )*
-            loop126:
+            // InternalTableDSL.g:17529:2: ( rule__XExpressionInClosure__Group_1__0 )*
+            loop124:
             do {
-                int alt126=2;
-                int LA126_0 = input.LA(1);
+                int alt124=2;
+                int LA124_0 = input.LA(1);
 
-                if ( ((LA126_0>=RULE_STRING && LA126_0<=RULE_DECIMAL)||(LA126_0>=19 && LA126_0<=20)||LA126_0==32||LA126_0==43||(LA126_0>=47 && LA126_0<=53)||LA126_0==75||LA126_0==135||(LA126_0>=139 && LA126_0<=140)||LA126_0==142||LA126_0==144||(LA126_0>=147 && LA126_0<=155)||LA126_0==157||(LA126_0>=183 && LA126_0<=184)) ) {
-                    alt126=1;
+                if ( ((LA124_0>=RULE_STRING && LA124_0<=RULE_DECIMAL)||(LA124_0>=19 && LA124_0<=20)||LA124_0==32||LA124_0==43||(LA124_0>=47 && LA124_0<=53)||LA124_0==75||LA124_0==135||(LA124_0>=139 && LA124_0<=140)||LA124_0==142||LA124_0==144||(LA124_0>=147 && LA124_0<=155)||LA124_0==157||(LA124_0>=180 && LA124_0<=181)) ) {
+                    alt124=1;
                 }
 
 
-                switch (alt126) {
+                switch (alt124) {
             	case 1 :
-            	    // InternalTableDSL.g:18150:3: rule__XExpressionInClosure__Group_1__0
+            	    // InternalTableDSL.g:17529:3: rule__XExpressionInClosure__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_144);
+            	    pushFollow(FOLLOW_143);
             	    rule__XExpressionInClosure__Group_1__0();
 
             	    state._fsp--;
@@ -60184,7 +58226,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop126;
+            	    break loop124;
                 }
             } while (true);
 
@@ -60213,16 +58255,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__0"
-    // InternalTableDSL.g:18159:1: rule__XExpressionInClosure__Group_1__0 : rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 ;
+    // InternalTableDSL.g:17538:1: rule__XExpressionInClosure__Group_1__0 : rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 ;
     public final void rule__XExpressionInClosure__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18163:1: ( rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 )
-            // InternalTableDSL.g:18164:2: rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1
+            // InternalTableDSL.g:17542:1: ( rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 )
+            // InternalTableDSL.g:17543:2: rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1
             {
-            pushFollow(FOLLOW_92);
+            pushFollow(FOLLOW_91);
             rule__XExpressionInClosure__Group_1__0__Impl();
 
             state._fsp--;
@@ -60251,23 +58293,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__0__Impl"
-    // InternalTableDSL.g:18171:1: rule__XExpressionInClosure__Group_1__0__Impl : ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) ;
+    // InternalTableDSL.g:17550:1: rule__XExpressionInClosure__Group_1__0__Impl : ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) ;
     public final void rule__XExpressionInClosure__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18175:1: ( ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) )
-            // InternalTableDSL.g:18176:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
+            // InternalTableDSL.g:17554:1: ( ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) )
+            // InternalTableDSL.g:17555:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
             {
-            // InternalTableDSL.g:18176:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
-            // InternalTableDSL.g:18177:2: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
+            // InternalTableDSL.g:17555:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
+            // InternalTableDSL.g:17556:2: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getExpressionsAssignment_1_0()); 
             }
-            // InternalTableDSL.g:18178:2: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
-            // InternalTableDSL.g:18178:3: rule__XExpressionInClosure__ExpressionsAssignment_1_0
+            // InternalTableDSL.g:17557:2: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
+            // InternalTableDSL.g:17557:3: rule__XExpressionInClosure__ExpressionsAssignment_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__ExpressionsAssignment_1_0();
@@ -60302,14 +58344,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__1"
-    // InternalTableDSL.g:18186:1: rule__XExpressionInClosure__Group_1__1 : rule__XExpressionInClosure__Group_1__1__Impl ;
+    // InternalTableDSL.g:17565:1: rule__XExpressionInClosure__Group_1__1 : rule__XExpressionInClosure__Group_1__1__Impl ;
     public final void rule__XExpressionInClosure__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18190:1: ( rule__XExpressionInClosure__Group_1__1__Impl )
-            // InternalTableDSL.g:18191:2: rule__XExpressionInClosure__Group_1__1__Impl
+            // InternalTableDSL.g:17569:1: ( rule__XExpressionInClosure__Group_1__1__Impl )
+            // InternalTableDSL.g:17570:2: rule__XExpressionInClosure__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group_1__1__Impl();
@@ -60335,31 +58377,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__1__Impl"
-    // InternalTableDSL.g:18197:1: rule__XExpressionInClosure__Group_1__1__Impl : ( ( ';' )? ) ;
+    // InternalTableDSL.g:17576:1: rule__XExpressionInClosure__Group_1__1__Impl : ( ( ';' )? ) ;
     public final void rule__XExpressionInClosure__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18201:1: ( ( ( ';' )? ) )
-            // InternalTableDSL.g:18202:1: ( ( ';' )? )
+            // InternalTableDSL.g:17580:1: ( ( ( ';' )? ) )
+            // InternalTableDSL.g:17581:1: ( ( ';' )? )
             {
-            // InternalTableDSL.g:18202:1: ( ( ';' )? )
-            // InternalTableDSL.g:18203:2: ( ';' )?
+            // InternalTableDSL.g:17581:1: ( ( ';' )? )
+            // InternalTableDSL.g:17582:2: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getSemicolonKeyword_1_1()); 
             }
-            // InternalTableDSL.g:18204:2: ( ';' )?
-            int alt127=2;
-            int LA127_0 = input.LA(1);
+            // InternalTableDSL.g:17583:2: ( ';' )?
+            int alt125=2;
+            int LA125_0 = input.LA(1);
 
-            if ( (LA127_0==133) ) {
-                alt127=1;
+            if ( (LA125_0==133) ) {
+                alt125=1;
             }
-            switch (alt127) {
+            switch (alt125) {
                 case 1 :
-                    // InternalTableDSL.g:18204:3: ';'
+                    // InternalTableDSL.g:17583:3: ';'
                     {
                     match(input,133,FOLLOW_2); if (state.failed) return ;
 
@@ -60393,16 +58435,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group__0"
-    // InternalTableDSL.g:18213:1: rule__XShortClosure__Group__0 : rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 ;
+    // InternalTableDSL.g:17592:1: rule__XShortClosure__Group__0 : rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 ;
     public final void rule__XShortClosure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18217:1: ( rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 )
-            // InternalTableDSL.g:18218:2: rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1
+            // InternalTableDSL.g:17596:1: ( rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 )
+            // InternalTableDSL.g:17597:2: rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XShortClosure__Group__0__Impl();
 
             state._fsp--;
@@ -60431,23 +58473,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group__0__Impl"
-    // InternalTableDSL.g:18225:1: rule__XShortClosure__Group__0__Impl : ( ( rule__XShortClosure__Group_0__0 ) ) ;
+    // InternalTableDSL.g:17604:1: rule__XShortClosure__Group__0__Impl : ( ( rule__XShortClosure__Group_0__0 ) ) ;
     public final void rule__XShortClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18229:1: ( ( ( rule__XShortClosure__Group_0__0 ) ) )
-            // InternalTableDSL.g:18230:1: ( ( rule__XShortClosure__Group_0__0 ) )
+            // InternalTableDSL.g:17608:1: ( ( ( rule__XShortClosure__Group_0__0 ) ) )
+            // InternalTableDSL.g:17609:1: ( ( rule__XShortClosure__Group_0__0 ) )
             {
-            // InternalTableDSL.g:18230:1: ( ( rule__XShortClosure__Group_0__0 ) )
-            // InternalTableDSL.g:18231:2: ( rule__XShortClosure__Group_0__0 )
+            // InternalTableDSL.g:17609:1: ( ( rule__XShortClosure__Group_0__0 ) )
+            // InternalTableDSL.g:17610:2: ( rule__XShortClosure__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0()); 
             }
-            // InternalTableDSL.g:18232:2: ( rule__XShortClosure__Group_0__0 )
-            // InternalTableDSL.g:18232:3: rule__XShortClosure__Group_0__0
+            // InternalTableDSL.g:17611:2: ( rule__XShortClosure__Group_0__0 )
+            // InternalTableDSL.g:17611:3: rule__XShortClosure__Group_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0__0();
@@ -60482,14 +58524,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group__1"
-    // InternalTableDSL.g:18240:1: rule__XShortClosure__Group__1 : rule__XShortClosure__Group__1__Impl ;
+    // InternalTableDSL.g:17619:1: rule__XShortClosure__Group__1 : rule__XShortClosure__Group__1__Impl ;
     public final void rule__XShortClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18244:1: ( rule__XShortClosure__Group__1__Impl )
-            // InternalTableDSL.g:18245:2: rule__XShortClosure__Group__1__Impl
+            // InternalTableDSL.g:17623:1: ( rule__XShortClosure__Group__1__Impl )
+            // InternalTableDSL.g:17624:2: rule__XShortClosure__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__Group__1__Impl();
@@ -60515,23 +58557,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group__1__Impl"
-    // InternalTableDSL.g:18251:1: rule__XShortClosure__Group__1__Impl : ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) ;
+    // InternalTableDSL.g:17630:1: rule__XShortClosure__Group__1__Impl : ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) ;
     public final void rule__XShortClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18255:1: ( ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) )
-            // InternalTableDSL.g:18256:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
+            // InternalTableDSL.g:17634:1: ( ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) )
+            // InternalTableDSL.g:17635:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
             {
-            // InternalTableDSL.g:18256:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
-            // InternalTableDSL.g:18257:2: ( rule__XShortClosure__ExpressionAssignment_1 )
+            // InternalTableDSL.g:17635:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
+            // InternalTableDSL.g:17636:2: ( rule__XShortClosure__ExpressionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExpressionAssignment_1()); 
             }
-            // InternalTableDSL.g:18258:2: ( rule__XShortClosure__ExpressionAssignment_1 )
-            // InternalTableDSL.g:18258:3: rule__XShortClosure__ExpressionAssignment_1
+            // InternalTableDSL.g:17637:2: ( rule__XShortClosure__ExpressionAssignment_1 )
+            // InternalTableDSL.g:17637:3: rule__XShortClosure__ExpressionAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__ExpressionAssignment_1();
@@ -60566,14 +58608,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0__0"
-    // InternalTableDSL.g:18267:1: rule__XShortClosure__Group_0__0 : rule__XShortClosure__Group_0__0__Impl ;
+    // InternalTableDSL.g:17646:1: rule__XShortClosure__Group_0__0 : rule__XShortClosure__Group_0__0__Impl ;
     public final void rule__XShortClosure__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18271:1: ( rule__XShortClosure__Group_0__0__Impl )
-            // InternalTableDSL.g:18272:2: rule__XShortClosure__Group_0__0__Impl
+            // InternalTableDSL.g:17650:1: ( rule__XShortClosure__Group_0__0__Impl )
+            // InternalTableDSL.g:17651:2: rule__XShortClosure__Group_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0__0__Impl();
@@ -60599,23 +58641,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0__0__Impl"
-    // InternalTableDSL.g:18278:1: rule__XShortClosure__Group_0__0__Impl : ( ( rule__XShortClosure__Group_0_0__0 ) ) ;
+    // InternalTableDSL.g:17657:1: rule__XShortClosure__Group_0__0__Impl : ( ( rule__XShortClosure__Group_0_0__0 ) ) ;
     public final void rule__XShortClosure__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18282:1: ( ( ( rule__XShortClosure__Group_0_0__0 ) ) )
-            // InternalTableDSL.g:18283:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
+            // InternalTableDSL.g:17661:1: ( ( ( rule__XShortClosure__Group_0_0__0 ) ) )
+            // InternalTableDSL.g:17662:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
             {
-            // InternalTableDSL.g:18283:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
-            // InternalTableDSL.g:18284:2: ( rule__XShortClosure__Group_0_0__0 )
+            // InternalTableDSL.g:17662:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
+            // InternalTableDSL.g:17663:2: ( rule__XShortClosure__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0()); 
             }
-            // InternalTableDSL.g:18285:2: ( rule__XShortClosure__Group_0_0__0 )
-            // InternalTableDSL.g:18285:3: rule__XShortClosure__Group_0_0__0
+            // InternalTableDSL.g:17664:2: ( rule__XShortClosure__Group_0_0__0 )
+            // InternalTableDSL.g:17664:3: rule__XShortClosure__Group_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__0();
@@ -60650,16 +58692,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__0"
-    // InternalTableDSL.g:18294:1: rule__XShortClosure__Group_0_0__0 : rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 ;
+    // InternalTableDSL.g:17673:1: rule__XShortClosure__Group_0_0__0 : rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 ;
     public final void rule__XShortClosure__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18298:1: ( rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 )
-            // InternalTableDSL.g:18299:2: rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1
+            // InternalTableDSL.g:17677:1: ( rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 )
+            // InternalTableDSL.g:17678:2: rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1
             {
-            pushFollow(FOLLOW_143);
+            pushFollow(FOLLOW_142);
             rule__XShortClosure__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -60688,23 +58730,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__0__Impl"
-    // InternalTableDSL.g:18306:1: rule__XShortClosure__Group_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:17685:1: rule__XShortClosure__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XShortClosure__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18310:1: ( ( () ) )
-            // InternalTableDSL.g:18311:1: ( () )
+            // InternalTableDSL.g:17689:1: ( ( () ) )
+            // InternalTableDSL.g:17690:1: ( () )
             {
-            // InternalTableDSL.g:18311:1: ( () )
-            // InternalTableDSL.g:18312:2: ()
+            // InternalTableDSL.g:17690:1: ( () )
+            // InternalTableDSL.g:17691:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getXClosureAction_0_0_0()); 
             }
-            // InternalTableDSL.g:18313:2: ()
-            // InternalTableDSL.g:18313:3: 
+            // InternalTableDSL.g:17692:2: ()
+            // InternalTableDSL.g:17692:3: 
             {
             }
 
@@ -60729,16 +58771,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__1"
-    // InternalTableDSL.g:18321:1: rule__XShortClosure__Group_0_0__1 : rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 ;
+    // InternalTableDSL.g:17700:1: rule__XShortClosure__Group_0_0__1 : rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 ;
     public final void rule__XShortClosure__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18325:1: ( rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 )
-            // InternalTableDSL.g:18326:2: rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2
+            // InternalTableDSL.g:17704:1: ( rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 )
+            // InternalTableDSL.g:17705:2: rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2
             {
-            pushFollow(FOLLOW_143);
+            pushFollow(FOLLOW_142);
             rule__XShortClosure__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -60767,31 +58809,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__1__Impl"
-    // InternalTableDSL.g:18333:1: rule__XShortClosure__Group_0_0__1__Impl : ( ( rule__XShortClosure__Group_0_0_1__0 )? ) ;
+    // InternalTableDSL.g:17712:1: rule__XShortClosure__Group_0_0__1__Impl : ( ( rule__XShortClosure__Group_0_0_1__0 )? ) ;
     public final void rule__XShortClosure__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18337:1: ( ( ( rule__XShortClosure__Group_0_0_1__0 )? ) )
-            // InternalTableDSL.g:18338:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
+            // InternalTableDSL.g:17716:1: ( ( ( rule__XShortClosure__Group_0_0_1__0 )? ) )
+            // InternalTableDSL.g:17717:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
             {
-            // InternalTableDSL.g:18338:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
-            // InternalTableDSL.g:18339:2: ( rule__XShortClosure__Group_0_0_1__0 )?
+            // InternalTableDSL.g:17717:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
+            // InternalTableDSL.g:17718:2: ( rule__XShortClosure__Group_0_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0_1()); 
             }
-            // InternalTableDSL.g:18340:2: ( rule__XShortClosure__Group_0_0_1__0 )?
-            int alt128=2;
-            int LA128_0 = input.LA(1);
+            // InternalTableDSL.g:17719:2: ( rule__XShortClosure__Group_0_0_1__0 )?
+            int alt126=2;
+            int LA126_0 = input.LA(1);
 
-            if ( (LA128_0==RULE_ID||LA128_0==36||LA128_0==135) ) {
-                alt128=1;
+            if ( (LA126_0==RULE_ID||LA126_0==36||LA126_0==135) ) {
+                alt126=1;
             }
-            switch (alt128) {
+            switch (alt126) {
                 case 1 :
-                    // InternalTableDSL.g:18340:3: rule__XShortClosure__Group_0_0_1__0
+                    // InternalTableDSL.g:17719:3: rule__XShortClosure__Group_0_0_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XShortClosure__Group_0_0_1__0();
@@ -60829,14 +58871,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__2"
-    // InternalTableDSL.g:18348:1: rule__XShortClosure__Group_0_0__2 : rule__XShortClosure__Group_0_0__2__Impl ;
+    // InternalTableDSL.g:17727:1: rule__XShortClosure__Group_0_0__2 : rule__XShortClosure__Group_0_0__2__Impl ;
     public final void rule__XShortClosure__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18352:1: ( rule__XShortClosure__Group_0_0__2__Impl )
-            // InternalTableDSL.g:18353:2: rule__XShortClosure__Group_0_0__2__Impl
+            // InternalTableDSL.g:17731:1: ( rule__XShortClosure__Group_0_0__2__Impl )
+            // InternalTableDSL.g:17732:2: rule__XShortClosure__Group_0_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__2__Impl();
@@ -60862,23 +58904,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__2__Impl"
-    // InternalTableDSL.g:18359:1: rule__XShortClosure__Group_0_0__2__Impl : ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) ;
+    // InternalTableDSL.g:17738:1: rule__XShortClosure__Group_0_0__2__Impl : ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) ;
     public final void rule__XShortClosure__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18363:1: ( ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) )
-            // InternalTableDSL.g:18364:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
+            // InternalTableDSL.g:17742:1: ( ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) )
+            // InternalTableDSL.g:17743:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
             {
-            // InternalTableDSL.g:18364:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
-            // InternalTableDSL.g:18365:2: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
+            // InternalTableDSL.g:17743:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
+            // InternalTableDSL.g:17744:2: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxAssignment_0_0_2()); 
             }
-            // InternalTableDSL.g:18366:2: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
-            // InternalTableDSL.g:18366:3: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2
+            // InternalTableDSL.g:17745:2: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
+            // InternalTableDSL.g:17745:3: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2();
@@ -60913,16 +58955,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__0"
-    // InternalTableDSL.g:18375:1: rule__XShortClosure__Group_0_0_1__0 : rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 ;
+    // InternalTableDSL.g:17754:1: rule__XShortClosure__Group_0_0_1__0 : rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 ;
     public final void rule__XShortClosure__Group_0_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18379:1: ( rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 )
-            // InternalTableDSL.g:18380:2: rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1
+            // InternalTableDSL.g:17758:1: ( rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 )
+            // InternalTableDSL.g:17759:2: rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_97);
             rule__XShortClosure__Group_0_0_1__0__Impl();
 
             state._fsp--;
@@ -60951,23 +58993,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__0__Impl"
-    // InternalTableDSL.g:18387:1: rule__XShortClosure__Group_0_0_1__0__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) ;
+    // InternalTableDSL.g:17766:1: rule__XShortClosure__Group_0_0_1__0__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) ;
     public final void rule__XShortClosure__Group_0_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18391:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) )
-            // InternalTableDSL.g:18392:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
+            // InternalTableDSL.g:17770:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) )
+            // InternalTableDSL.g:17771:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
             {
-            // InternalTableDSL.g:18392:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
-            // InternalTableDSL.g:18393:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
+            // InternalTableDSL.g:17771:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
+            // InternalTableDSL.g:17772:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersAssignment_0_0_1_0()); 
             }
-            // InternalTableDSL.g:18394:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
-            // InternalTableDSL.g:18394:3: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0
+            // InternalTableDSL.g:17773:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
+            // InternalTableDSL.g:17773:3: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0();
@@ -61002,14 +59044,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__1"
-    // InternalTableDSL.g:18402:1: rule__XShortClosure__Group_0_0_1__1 : rule__XShortClosure__Group_0_0_1__1__Impl ;
+    // InternalTableDSL.g:17781:1: rule__XShortClosure__Group_0_0_1__1 : rule__XShortClosure__Group_0_0_1__1__Impl ;
     public final void rule__XShortClosure__Group_0_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18406:1: ( rule__XShortClosure__Group_0_0_1__1__Impl )
-            // InternalTableDSL.g:18407:2: rule__XShortClosure__Group_0_0_1__1__Impl
+            // InternalTableDSL.g:17785:1: ( rule__XShortClosure__Group_0_0_1__1__Impl )
+            // InternalTableDSL.g:17786:2: rule__XShortClosure__Group_0_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1__1__Impl();
@@ -61035,37 +59077,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__1__Impl"
-    // InternalTableDSL.g:18413:1: rule__XShortClosure__Group_0_0_1__1__Impl : ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) ;
+    // InternalTableDSL.g:17792:1: rule__XShortClosure__Group_0_0_1__1__Impl : ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) ;
     public final void rule__XShortClosure__Group_0_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18417:1: ( ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) )
-            // InternalTableDSL.g:18418:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
+            // InternalTableDSL.g:17796:1: ( ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) )
+            // InternalTableDSL.g:17797:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
             {
-            // InternalTableDSL.g:18418:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
-            // InternalTableDSL.g:18419:2: ( rule__XShortClosure__Group_0_0_1_1__0 )*
+            // InternalTableDSL.g:17797:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
+            // InternalTableDSL.g:17798:2: ( rule__XShortClosure__Group_0_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0_1_1()); 
             }
-            // InternalTableDSL.g:18420:2: ( rule__XShortClosure__Group_0_0_1_1__0 )*
-            loop129:
+            // InternalTableDSL.g:17799:2: ( rule__XShortClosure__Group_0_0_1_1__0 )*
+            loop127:
             do {
-                int alt129=2;
-                int LA129_0 = input.LA(1);
+                int alt127=2;
+                int LA127_0 = input.LA(1);
 
-                if ( (LA129_0==137) ) {
-                    alt129=1;
+                if ( (LA127_0==137) ) {
+                    alt127=1;
                 }
 
 
-                switch (alt129) {
+                switch (alt127) {
             	case 1 :
-            	    // InternalTableDSL.g:18420:3: rule__XShortClosure__Group_0_0_1_1__0
+            	    // InternalTableDSL.g:17799:3: rule__XShortClosure__Group_0_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XShortClosure__Group_0_0_1_1__0();
 
             	    state._fsp--;
@@ -61075,7 +59117,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop129;
+            	    break loop127;
                 }
             } while (true);
 
@@ -61104,16 +59146,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__0"
-    // InternalTableDSL.g:18429:1: rule__XShortClosure__Group_0_0_1_1__0 : rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 ;
+    // InternalTableDSL.g:17808:1: rule__XShortClosure__Group_0_0_1_1__0 : rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 ;
     public final void rule__XShortClosure__Group_0_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18433:1: ( rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 )
-            // InternalTableDSL.g:18434:2: rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1
+            // InternalTableDSL.g:17812:1: ( rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 )
+            // InternalTableDSL.g:17813:2: rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__XShortClosure__Group_0_0_1_1__0__Impl();
 
             state._fsp--;
@@ -61142,17 +59184,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__0__Impl"
-    // InternalTableDSL.g:18441:1: rule__XShortClosure__Group_0_0_1_1__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:17820:1: rule__XShortClosure__Group_0_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XShortClosure__Group_0_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18445:1: ( ( ',' ) )
-            // InternalTableDSL.g:18446:1: ( ',' )
+            // InternalTableDSL.g:17824:1: ( ( ',' ) )
+            // InternalTableDSL.g:17825:1: ( ',' )
             {
-            // InternalTableDSL.g:18446:1: ( ',' )
-            // InternalTableDSL.g:18447:2: ','
+            // InternalTableDSL.g:17825:1: ( ',' )
+            // InternalTableDSL.g:17826:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0()); 
@@ -61183,14 +59225,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__1"
-    // InternalTableDSL.g:18456:1: rule__XShortClosure__Group_0_0_1_1__1 : rule__XShortClosure__Group_0_0_1_1__1__Impl ;
+    // InternalTableDSL.g:17835:1: rule__XShortClosure__Group_0_0_1_1__1 : rule__XShortClosure__Group_0_0_1_1__1__Impl ;
     public final void rule__XShortClosure__Group_0_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18460:1: ( rule__XShortClosure__Group_0_0_1_1__1__Impl )
-            // InternalTableDSL.g:18461:2: rule__XShortClosure__Group_0_0_1_1__1__Impl
+            // InternalTableDSL.g:17839:1: ( rule__XShortClosure__Group_0_0_1_1__1__Impl )
+            // InternalTableDSL.g:17840:2: rule__XShortClosure__Group_0_0_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1_1__1__Impl();
@@ -61216,23 +59258,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__1__Impl"
-    // InternalTableDSL.g:18467:1: rule__XShortClosure__Group_0_0_1_1__1__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) ;
+    // InternalTableDSL.g:17846:1: rule__XShortClosure__Group_0_0_1_1__1__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) ;
     public final void rule__XShortClosure__Group_0_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18471:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) )
-            // InternalTableDSL.g:18472:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
+            // InternalTableDSL.g:17850:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) )
+            // InternalTableDSL.g:17851:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
             {
-            // InternalTableDSL.g:18472:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
-            // InternalTableDSL.g:18473:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
+            // InternalTableDSL.g:17851:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
+            // InternalTableDSL.g:17852:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersAssignment_0_0_1_1_1()); 
             }
-            // InternalTableDSL.g:18474:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
-            // InternalTableDSL.g:18474:3: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1
+            // InternalTableDSL.g:17853:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
+            // InternalTableDSL.g:17853:3: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1();
@@ -61267,16 +59309,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__0"
-    // InternalTableDSL.g:18483:1: rule__XParenthesizedExpression__Group__0 : rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 ;
+    // InternalTableDSL.g:17862:1: rule__XParenthesizedExpression__Group__0 : rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 ;
     public final void rule__XParenthesizedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18487:1: ( rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 )
-            // InternalTableDSL.g:18488:2: rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1
+            // InternalTableDSL.g:17866:1: ( rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 )
+            // InternalTableDSL.g:17867:2: rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XParenthesizedExpression__Group__0__Impl();
 
             state._fsp--;
@@ -61305,17 +59347,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__0__Impl"
-    // InternalTableDSL.g:18495:1: rule__XParenthesizedExpression__Group__0__Impl : ( '(' ) ;
+    // InternalTableDSL.g:17874:1: rule__XParenthesizedExpression__Group__0__Impl : ( '(' ) ;
     public final void rule__XParenthesizedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18499:1: ( ( '(' ) )
-            // InternalTableDSL.g:18500:1: ( '(' )
+            // InternalTableDSL.g:17878:1: ( ( '(' ) )
+            // InternalTableDSL.g:17879:1: ( '(' )
             {
-            // InternalTableDSL.g:18500:1: ( '(' )
-            // InternalTableDSL.g:18501:2: '('
+            // InternalTableDSL.g:17879:1: ( '(' )
+            // InternalTableDSL.g:17880:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
@@ -61346,16 +59388,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__1"
-    // InternalTableDSL.g:18510:1: rule__XParenthesizedExpression__Group__1 : rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 ;
+    // InternalTableDSL.g:17889:1: rule__XParenthesizedExpression__Group__1 : rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 ;
     public final void rule__XParenthesizedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18514:1: ( rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 )
-            // InternalTableDSL.g:18515:2: rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2
+            // InternalTableDSL.g:17893:1: ( rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 )
+            // InternalTableDSL.g:17894:2: rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2
             {
-            pushFollow(FOLLOW_145);
+            pushFollow(FOLLOW_144);
             rule__XParenthesizedExpression__Group__1__Impl();
 
             state._fsp--;
@@ -61384,17 +59426,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__1__Impl"
-    // InternalTableDSL.g:18522:1: rule__XParenthesizedExpression__Group__1__Impl : ( ruleXExpression ) ;
+    // InternalTableDSL.g:17901:1: rule__XParenthesizedExpression__Group__1__Impl : ( ruleXExpression ) ;
     public final void rule__XParenthesizedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18526:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:18527:1: ( ruleXExpression )
+            // InternalTableDSL.g:17905:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:17906:1: ( ruleXExpression )
             {
-            // InternalTableDSL.g:18527:1: ( ruleXExpression )
-            // InternalTableDSL.g:18528:2: ruleXExpression
+            // InternalTableDSL.g:17906:1: ( ruleXExpression )
+            // InternalTableDSL.g:17907:2: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getXExpressionParserRuleCall_1()); 
@@ -61429,14 +59471,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__2"
-    // InternalTableDSL.g:18537:1: rule__XParenthesizedExpression__Group__2 : rule__XParenthesizedExpression__Group__2__Impl ;
+    // InternalTableDSL.g:17916:1: rule__XParenthesizedExpression__Group__2 : rule__XParenthesizedExpression__Group__2__Impl ;
     public final void rule__XParenthesizedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18541:1: ( rule__XParenthesizedExpression__Group__2__Impl )
-            // InternalTableDSL.g:18542:2: rule__XParenthesizedExpression__Group__2__Impl
+            // InternalTableDSL.g:17920:1: ( rule__XParenthesizedExpression__Group__2__Impl )
+            // InternalTableDSL.g:17921:2: rule__XParenthesizedExpression__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XParenthesizedExpression__Group__2__Impl();
@@ -61462,17 +59504,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__2__Impl"
-    // InternalTableDSL.g:18548:1: rule__XParenthesizedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalTableDSL.g:17927:1: rule__XParenthesizedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XParenthesizedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18552:1: ( ( ')' ) )
-            // InternalTableDSL.g:18553:1: ( ')' )
+            // InternalTableDSL.g:17931:1: ( ( ')' ) )
+            // InternalTableDSL.g:17932:1: ( ')' )
             {
-            // InternalTableDSL.g:18553:1: ( ')' )
-            // InternalTableDSL.g:18554:2: ')'
+            // InternalTableDSL.g:17932:1: ( ')' )
+            // InternalTableDSL.g:17933:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
@@ -61503,16 +59545,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group__0"
-    // InternalTableDSL.g:18564:1: rule__XIfExpression__Group__0 : rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 ;
+    // InternalTableDSL.g:17943:1: rule__XIfExpression__Group__0 : rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 ;
     public final void rule__XIfExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18568:1: ( rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 )
-            // InternalTableDSL.g:18569:2: rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1
+            // InternalTableDSL.g:17947:1: ( rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 )
+            // InternalTableDSL.g:17948:2: rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1
             {
-            pushFollow(FOLLOW_146);
+            pushFollow(FOLLOW_145);
             rule__XIfExpression__Group__0__Impl();
 
             state._fsp--;
@@ -61541,23 +59583,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group__0__Impl"
-    // InternalTableDSL.g:18576:1: rule__XIfExpression__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:17955:1: rule__XIfExpression__Group__0__Impl : ( () ) ;
     public final void rule__XIfExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18580:1: ( ( () ) )
-            // InternalTableDSL.g:18581:1: ( () )
+            // InternalTableDSL.g:17959:1: ( ( () ) )
+            // InternalTableDSL.g:17960:1: ( () )
             {
-            // InternalTableDSL.g:18581:1: ( () )
-            // InternalTableDSL.g:18582:2: ()
+            // InternalTableDSL.g:17960:1: ( () )
+            // InternalTableDSL.g:17961:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getXIfExpressionAction_0()); 
             }
-            // InternalTableDSL.g:18583:2: ()
-            // InternalTableDSL.g:18583:3: 
+            // InternalTableDSL.g:17962:2: ()
+            // InternalTableDSL.g:17962:3: 
             {
             }
 
@@ -61582,16 +59624,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group__1"
-    // InternalTableDSL.g:18591:1: rule__XIfExpression__Group__1 : rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 ;
+    // InternalTableDSL.g:17970:1: rule__XIfExpression__Group__1 : rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 ;
     public final void rule__XIfExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18595:1: ( rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 )
-            // InternalTableDSL.g:18596:2: rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2
+            // InternalTableDSL.g:17974:1: ( rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 )
+            // InternalTableDSL.g:17975:2: rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2
             {
-            pushFollow(FOLLOW_96);
+            pushFollow(FOLLOW_95);
             rule__XIfExpression__Group__1__Impl();
 
             state._fsp--;
@@ -61620,17 +59662,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group__1__Impl"
-    // InternalTableDSL.g:18603:1: rule__XIfExpression__Group__1__Impl : ( 'if' ) ;
+    // InternalTableDSL.g:17982:1: rule__XIfExpression__Group__1__Impl : ( 'if' ) ;
     public final void rule__XIfExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18607:1: ( ( 'if' ) )
-            // InternalTableDSL.g:18608:1: ( 'if' )
+            // InternalTableDSL.g:17986:1: ( ( 'if' ) )
+            // InternalTableDSL.g:17987:1: ( 'if' )
             {
-            // InternalTableDSL.g:18608:1: ( 'if' )
-            // InternalTableDSL.g:18609:2: 'if'
+            // InternalTableDSL.g:17987:1: ( 'if' )
+            // InternalTableDSL.g:17988:2: 'if'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfKeyword_1()); 
@@ -61661,16 +59703,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group__2"
-    // InternalTableDSL.g:18618:1: rule__XIfExpression__Group__2 : rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 ;
+    // InternalTableDSL.g:17997:1: rule__XIfExpression__Group__2 : rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 ;
     public final void rule__XIfExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18622:1: ( rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 )
-            // InternalTableDSL.g:18623:2: rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3
+            // InternalTableDSL.g:18001:1: ( rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 )
+            // InternalTableDSL.g:18002:2: rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XIfExpression__Group__2__Impl();
 
             state._fsp--;
@@ -61699,17 +59741,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group__2__Impl"
-    // InternalTableDSL.g:18630:1: rule__XIfExpression__Group__2__Impl : ( '(' ) ;
+    // InternalTableDSL.g:18009:1: rule__XIfExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XIfExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18634:1: ( ( '(' ) )
-            // InternalTableDSL.g:18635:1: ( '(' )
+            // InternalTableDSL.g:18013:1: ( ( '(' ) )
+            // InternalTableDSL.g:18014:1: ( '(' )
             {
-            // InternalTableDSL.g:18635:1: ( '(' )
-            // InternalTableDSL.g:18636:2: '('
+            // InternalTableDSL.g:18014:1: ( '(' )
+            // InternalTableDSL.g:18015:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2()); 
@@ -61740,16 +59782,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group__3"
-    // InternalTableDSL.g:18645:1: rule__XIfExpression__Group__3 : rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 ;
+    // InternalTableDSL.g:18024:1: rule__XIfExpression__Group__3 : rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 ;
     public final void rule__XIfExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18649:1: ( rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 )
-            // InternalTableDSL.g:18650:2: rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4
+            // InternalTableDSL.g:18028:1: ( rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 )
+            // InternalTableDSL.g:18029:2: rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4
             {
-            pushFollow(FOLLOW_145);
+            pushFollow(FOLLOW_144);
             rule__XIfExpression__Group__3__Impl();
 
             state._fsp--;
@@ -61778,23 +59820,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group__3__Impl"
-    // InternalTableDSL.g:18657:1: rule__XIfExpression__Group__3__Impl : ( ( rule__XIfExpression__IfAssignment_3 ) ) ;
+    // InternalTableDSL.g:18036:1: rule__XIfExpression__Group__3__Impl : ( ( rule__XIfExpression__IfAssignment_3 ) ) ;
     public final void rule__XIfExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18661:1: ( ( ( rule__XIfExpression__IfAssignment_3 ) ) )
-            // InternalTableDSL.g:18662:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
+            // InternalTableDSL.g:18040:1: ( ( ( rule__XIfExpression__IfAssignment_3 ) ) )
+            // InternalTableDSL.g:18041:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
             {
-            // InternalTableDSL.g:18662:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
-            // InternalTableDSL.g:18663:2: ( rule__XIfExpression__IfAssignment_3 )
+            // InternalTableDSL.g:18041:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
+            // InternalTableDSL.g:18042:2: ( rule__XIfExpression__IfAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfAssignment_3()); 
             }
-            // InternalTableDSL.g:18664:2: ( rule__XIfExpression__IfAssignment_3 )
-            // InternalTableDSL.g:18664:3: rule__XIfExpression__IfAssignment_3
+            // InternalTableDSL.g:18043:2: ( rule__XIfExpression__IfAssignment_3 )
+            // InternalTableDSL.g:18043:3: rule__XIfExpression__IfAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__XIfExpression__IfAssignment_3();
@@ -61829,16 +59871,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group__4"
-    // InternalTableDSL.g:18672:1: rule__XIfExpression__Group__4 : rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 ;
+    // InternalTableDSL.g:18051:1: rule__XIfExpression__Group__4 : rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 ;
     public final void rule__XIfExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18676:1: ( rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 )
-            // InternalTableDSL.g:18677:2: rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5
+            // InternalTableDSL.g:18055:1: ( rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 )
+            // InternalTableDSL.g:18056:2: rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XIfExpression__Group__4__Impl();
 
             state._fsp--;
@@ -61867,17 +59909,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group__4__Impl"
-    // InternalTableDSL.g:18684:1: rule__XIfExpression__Group__4__Impl : ( ')' ) ;
+    // InternalTableDSL.g:18063:1: rule__XIfExpression__Group__4__Impl : ( ')' ) ;
     public final void rule__XIfExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18688:1: ( ( ')' ) )
-            // InternalTableDSL.g:18689:1: ( ')' )
+            // InternalTableDSL.g:18067:1: ( ( ')' ) )
+            // InternalTableDSL.g:18068:1: ( ')' )
             {
-            // InternalTableDSL.g:18689:1: ( ')' )
-            // InternalTableDSL.g:18690:2: ')'
+            // InternalTableDSL.g:18068:1: ( ')' )
+            // InternalTableDSL.g:18069:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4()); 
@@ -61908,16 +59950,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group__5"
-    // InternalTableDSL.g:18699:1: rule__XIfExpression__Group__5 : rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 ;
+    // InternalTableDSL.g:18078:1: rule__XIfExpression__Group__5 : rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 ;
     public final void rule__XIfExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18703:1: ( rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 )
-            // InternalTableDSL.g:18704:2: rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6
+            // InternalTableDSL.g:18082:1: ( rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 )
+            // InternalTableDSL.g:18083:2: rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6
             {
-            pushFollow(FOLLOW_147);
+            pushFollow(FOLLOW_146);
             rule__XIfExpression__Group__5__Impl();
 
             state._fsp--;
@@ -61946,23 +59988,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group__5__Impl"
-    // InternalTableDSL.g:18711:1: rule__XIfExpression__Group__5__Impl : ( ( rule__XIfExpression__ThenAssignment_5 ) ) ;
+    // InternalTableDSL.g:18090:1: rule__XIfExpression__Group__5__Impl : ( ( rule__XIfExpression__ThenAssignment_5 ) ) ;
     public final void rule__XIfExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18715:1: ( ( ( rule__XIfExpression__ThenAssignment_5 ) ) )
-            // InternalTableDSL.g:18716:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
+            // InternalTableDSL.g:18094:1: ( ( ( rule__XIfExpression__ThenAssignment_5 ) ) )
+            // InternalTableDSL.g:18095:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
             {
-            // InternalTableDSL.g:18716:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
-            // InternalTableDSL.g:18717:2: ( rule__XIfExpression__ThenAssignment_5 )
+            // InternalTableDSL.g:18095:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
+            // InternalTableDSL.g:18096:2: ( rule__XIfExpression__ThenAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getThenAssignment_5()); 
             }
-            // InternalTableDSL.g:18718:2: ( rule__XIfExpression__ThenAssignment_5 )
-            // InternalTableDSL.g:18718:3: rule__XIfExpression__ThenAssignment_5
+            // InternalTableDSL.g:18097:2: ( rule__XIfExpression__ThenAssignment_5 )
+            // InternalTableDSL.g:18097:3: rule__XIfExpression__ThenAssignment_5
             {
             pushFollow(FOLLOW_2);
             rule__XIfExpression__ThenAssignment_5();
@@ -61997,14 +60039,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group__6"
-    // InternalTableDSL.g:18726:1: rule__XIfExpression__Group__6 : rule__XIfExpression__Group__6__Impl ;
+    // InternalTableDSL.g:18105:1: rule__XIfExpression__Group__6 : rule__XIfExpression__Group__6__Impl ;
     public final void rule__XIfExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18730:1: ( rule__XIfExpression__Group__6__Impl )
-            // InternalTableDSL.g:18731:2: rule__XIfExpression__Group__6__Impl
+            // InternalTableDSL.g:18109:1: ( rule__XIfExpression__Group__6__Impl )
+            // InternalTableDSL.g:18110:2: rule__XIfExpression__Group__6__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__6__Impl();
@@ -62030,35 +60072,35 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group__6__Impl"
-    // InternalTableDSL.g:18737:1: rule__XIfExpression__Group__6__Impl : ( ( rule__XIfExpression__Group_6__0 )? ) ;
+    // InternalTableDSL.g:18116:1: rule__XIfExpression__Group__6__Impl : ( ( rule__XIfExpression__Group_6__0 )? ) ;
     public final void rule__XIfExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18741:1: ( ( ( rule__XIfExpression__Group_6__0 )? ) )
-            // InternalTableDSL.g:18742:1: ( ( rule__XIfExpression__Group_6__0 )? )
+            // InternalTableDSL.g:18120:1: ( ( ( rule__XIfExpression__Group_6__0 )? ) )
+            // InternalTableDSL.g:18121:1: ( ( rule__XIfExpression__Group_6__0 )? )
             {
-            // InternalTableDSL.g:18742:1: ( ( rule__XIfExpression__Group_6__0 )? )
-            // InternalTableDSL.g:18743:2: ( rule__XIfExpression__Group_6__0 )?
+            // InternalTableDSL.g:18121:1: ( ( rule__XIfExpression__Group_6__0 )? )
+            // InternalTableDSL.g:18122:2: ( rule__XIfExpression__Group_6__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getGroup_6()); 
             }
-            // InternalTableDSL.g:18744:2: ( rule__XIfExpression__Group_6__0 )?
-            int alt130=2;
-            int LA130_0 = input.LA(1);
+            // InternalTableDSL.g:18123:2: ( rule__XIfExpression__Group_6__0 )?
+            int alt128=2;
+            int LA128_0 = input.LA(1);
 
-            if ( (LA130_0==143) ) {
-                int LA130_1 = input.LA(2);
+            if ( (LA128_0==143) ) {
+                int LA128_1 = input.LA(2);
 
-                if ( (synpred208_InternalTableDSL()) ) {
-                    alt130=1;
+                if ( (synpred206_InternalTableDSL()) ) {
+                    alt128=1;
                 }
             }
-            switch (alt130) {
+            switch (alt128) {
                 case 1 :
-                    // InternalTableDSL.g:18744:3: rule__XIfExpression__Group_6__0
+                    // InternalTableDSL.g:18123:3: rule__XIfExpression__Group_6__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XIfExpression__Group_6__0();
@@ -62096,16 +60138,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__0"
-    // InternalTableDSL.g:18753:1: rule__XIfExpression__Group_6__0 : rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 ;
+    // InternalTableDSL.g:18132:1: rule__XIfExpression__Group_6__0 : rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 ;
     public final void rule__XIfExpression__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18757:1: ( rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 )
-            // InternalTableDSL.g:18758:2: rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1
+            // InternalTableDSL.g:18136:1: ( rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 )
+            // InternalTableDSL.g:18137:2: rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XIfExpression__Group_6__0__Impl();
 
             state._fsp--;
@@ -62134,23 +60176,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__0__Impl"
-    // InternalTableDSL.g:18765:1: rule__XIfExpression__Group_6__0__Impl : ( ( 'else' ) ) ;
+    // InternalTableDSL.g:18144:1: rule__XIfExpression__Group_6__0__Impl : ( ( 'else' ) ) ;
     public final void rule__XIfExpression__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18769:1: ( ( ( 'else' ) ) )
-            // InternalTableDSL.g:18770:1: ( ( 'else' ) )
+            // InternalTableDSL.g:18148:1: ( ( ( 'else' ) ) )
+            // InternalTableDSL.g:18149:1: ( ( 'else' ) )
             {
-            // InternalTableDSL.g:18770:1: ( ( 'else' ) )
-            // InternalTableDSL.g:18771:2: ( 'else' )
+            // InternalTableDSL.g:18149:1: ( ( 'else' ) )
+            // InternalTableDSL.g:18150:2: ( 'else' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseKeyword_6_0()); 
             }
-            // InternalTableDSL.g:18772:2: ( 'else' )
-            // InternalTableDSL.g:18772:3: 'else'
+            // InternalTableDSL.g:18151:2: ( 'else' )
+            // InternalTableDSL.g:18151:3: 'else'
             {
             match(input,143,FOLLOW_2); if (state.failed) return ;
 
@@ -62181,14 +60223,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__1"
-    // InternalTableDSL.g:18780:1: rule__XIfExpression__Group_6__1 : rule__XIfExpression__Group_6__1__Impl ;
+    // InternalTableDSL.g:18159:1: rule__XIfExpression__Group_6__1 : rule__XIfExpression__Group_6__1__Impl ;
     public final void rule__XIfExpression__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18784:1: ( rule__XIfExpression__Group_6__1__Impl )
-            // InternalTableDSL.g:18785:2: rule__XIfExpression__Group_6__1__Impl
+            // InternalTableDSL.g:18163:1: ( rule__XIfExpression__Group_6__1__Impl )
+            // InternalTableDSL.g:18164:2: rule__XIfExpression__Group_6__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XIfExpression__Group_6__1__Impl();
@@ -62214,23 +60256,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__1__Impl"
-    // InternalTableDSL.g:18791:1: rule__XIfExpression__Group_6__1__Impl : ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) ;
+    // InternalTableDSL.g:18170:1: rule__XIfExpression__Group_6__1__Impl : ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) ;
     public final void rule__XIfExpression__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18795:1: ( ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) )
-            // InternalTableDSL.g:18796:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
+            // InternalTableDSL.g:18174:1: ( ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) )
+            // InternalTableDSL.g:18175:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
             {
-            // InternalTableDSL.g:18796:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
-            // InternalTableDSL.g:18797:2: ( rule__XIfExpression__ElseAssignment_6_1 )
+            // InternalTableDSL.g:18175:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
+            // InternalTableDSL.g:18176:2: ( rule__XIfExpression__ElseAssignment_6_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseAssignment_6_1()); 
             }
-            // InternalTableDSL.g:18798:2: ( rule__XIfExpression__ElseAssignment_6_1 )
-            // InternalTableDSL.g:18798:3: rule__XIfExpression__ElseAssignment_6_1
+            // InternalTableDSL.g:18177:2: ( rule__XIfExpression__ElseAssignment_6_1 )
+            // InternalTableDSL.g:18177:3: rule__XIfExpression__ElseAssignment_6_1
             {
             pushFollow(FOLLOW_2);
             rule__XIfExpression__ElseAssignment_6_1();
@@ -62265,16 +60307,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__0"
-    // InternalTableDSL.g:18807:1: rule__XSwitchExpression__Group__0 : rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 ;
+    // InternalTableDSL.g:18186:1: rule__XSwitchExpression__Group__0 : rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 ;
     public final void rule__XSwitchExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18811:1: ( rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 )
-            // InternalTableDSL.g:18812:2: rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1
+            // InternalTableDSL.g:18190:1: ( rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 )
+            // InternalTableDSL.g:18191:2: rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1
             {
-            pushFollow(FOLLOW_148);
+            pushFollow(FOLLOW_147);
             rule__XSwitchExpression__Group__0__Impl();
 
             state._fsp--;
@@ -62303,23 +60345,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__0__Impl"
-    // InternalTableDSL.g:18819:1: rule__XSwitchExpression__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:18198:1: rule__XSwitchExpression__Group__0__Impl : ( () ) ;
     public final void rule__XSwitchExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18823:1: ( ( () ) )
-            // InternalTableDSL.g:18824:1: ( () )
+            // InternalTableDSL.g:18202:1: ( ( () ) )
+            // InternalTableDSL.g:18203:1: ( () )
             {
-            // InternalTableDSL.g:18824:1: ( () )
-            // InternalTableDSL.g:18825:2: ()
+            // InternalTableDSL.g:18203:1: ( () )
+            // InternalTableDSL.g:18204:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getXSwitchExpressionAction_0()); 
             }
-            // InternalTableDSL.g:18826:2: ()
-            // InternalTableDSL.g:18826:3: 
+            // InternalTableDSL.g:18205:2: ()
+            // InternalTableDSL.g:18205:3: 
             {
             }
 
@@ -62344,16 +60386,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__1"
-    // InternalTableDSL.g:18834:1: rule__XSwitchExpression__Group__1 : rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 ;
+    // InternalTableDSL.g:18213:1: rule__XSwitchExpression__Group__1 : rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 ;
     public final void rule__XSwitchExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18838:1: ( rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 )
-            // InternalTableDSL.g:18839:2: rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2
+            // InternalTableDSL.g:18217:1: ( rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 )
+            // InternalTableDSL.g:18218:2: rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2
             {
-            pushFollow(FOLLOW_149);
+            pushFollow(FOLLOW_148);
             rule__XSwitchExpression__Group__1__Impl();
 
             state._fsp--;
@@ -62382,17 +60424,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__1__Impl"
-    // InternalTableDSL.g:18846:1: rule__XSwitchExpression__Group__1__Impl : ( 'switch' ) ;
+    // InternalTableDSL.g:18225:1: rule__XSwitchExpression__Group__1__Impl : ( 'switch' ) ;
     public final void rule__XSwitchExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18850:1: ( ( 'switch' ) )
-            // InternalTableDSL.g:18851:1: ( 'switch' )
+            // InternalTableDSL.g:18229:1: ( ( 'switch' ) )
+            // InternalTableDSL.g:18230:1: ( 'switch' )
             {
-            // InternalTableDSL.g:18851:1: ( 'switch' )
-            // InternalTableDSL.g:18852:2: 'switch'
+            // InternalTableDSL.g:18230:1: ( 'switch' )
+            // InternalTableDSL.g:18231:2: 'switch'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1()); 
@@ -62423,14 +60465,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__2"
-    // InternalTableDSL.g:18861:1: rule__XSwitchExpression__Group__2 : rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 ;
+    // InternalTableDSL.g:18240:1: rule__XSwitchExpression__Group__2 : rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 ;
     public final void rule__XSwitchExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18865:1: ( rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 )
-            // InternalTableDSL.g:18866:2: rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3
+            // InternalTableDSL.g:18244:1: ( rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 )
+            // InternalTableDSL.g:18245:2: rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3
             {
             pushFollow(FOLLOW_8);
             rule__XSwitchExpression__Group__2__Impl();
@@ -62461,23 +60503,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__2__Impl"
-    // InternalTableDSL.g:18873:1: rule__XSwitchExpression__Group__2__Impl : ( ( rule__XSwitchExpression__Alternatives_2 ) ) ;
+    // InternalTableDSL.g:18252:1: rule__XSwitchExpression__Group__2__Impl : ( ( rule__XSwitchExpression__Alternatives_2 ) ) ;
     public final void rule__XSwitchExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18877:1: ( ( ( rule__XSwitchExpression__Alternatives_2 ) ) )
-            // InternalTableDSL.g:18878:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
+            // InternalTableDSL.g:18256:1: ( ( ( rule__XSwitchExpression__Alternatives_2 ) ) )
+            // InternalTableDSL.g:18257:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
             {
-            // InternalTableDSL.g:18878:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
-            // InternalTableDSL.g:18879:2: ( rule__XSwitchExpression__Alternatives_2 )
+            // InternalTableDSL.g:18257:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
+            // InternalTableDSL.g:18258:2: ( rule__XSwitchExpression__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getAlternatives_2()); 
             }
-            // InternalTableDSL.g:18880:2: ( rule__XSwitchExpression__Alternatives_2 )
-            // InternalTableDSL.g:18880:3: rule__XSwitchExpression__Alternatives_2
+            // InternalTableDSL.g:18259:2: ( rule__XSwitchExpression__Alternatives_2 )
+            // InternalTableDSL.g:18259:3: rule__XSwitchExpression__Alternatives_2
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Alternatives_2();
@@ -62512,16 +60554,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__3"
-    // InternalTableDSL.g:18888:1: rule__XSwitchExpression__Group__3 : rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 ;
+    // InternalTableDSL.g:18267:1: rule__XSwitchExpression__Group__3 : rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 ;
     public final void rule__XSwitchExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18892:1: ( rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 )
-            // InternalTableDSL.g:18893:2: rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4
+            // InternalTableDSL.g:18271:1: ( rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 )
+            // InternalTableDSL.g:18272:2: rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4
             {
-            pushFollow(FOLLOW_150);
+            pushFollow(FOLLOW_149);
             rule__XSwitchExpression__Group__3__Impl();
 
             state._fsp--;
@@ -62550,17 +60592,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__3__Impl"
-    // InternalTableDSL.g:18900:1: rule__XSwitchExpression__Group__3__Impl : ( '{' ) ;
+    // InternalTableDSL.g:18279:1: rule__XSwitchExpression__Group__3__Impl : ( '{' ) ;
     public final void rule__XSwitchExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18904:1: ( ( '{' ) )
-            // InternalTableDSL.g:18905:1: ( '{' )
+            // InternalTableDSL.g:18283:1: ( ( '{' ) )
+            // InternalTableDSL.g:18284:1: ( '{' )
             {
-            // InternalTableDSL.g:18905:1: ( '{' )
-            // InternalTableDSL.g:18906:2: '{'
+            // InternalTableDSL.g:18284:1: ( '{' )
+            // InternalTableDSL.g:18285:2: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3()); 
@@ -62591,16 +60633,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__4"
-    // InternalTableDSL.g:18915:1: rule__XSwitchExpression__Group__4 : rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 ;
+    // InternalTableDSL.g:18294:1: rule__XSwitchExpression__Group__4 : rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 ;
     public final void rule__XSwitchExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18919:1: ( rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 )
-            // InternalTableDSL.g:18920:2: rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5
+            // InternalTableDSL.g:18298:1: ( rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 )
+            // InternalTableDSL.g:18299:2: rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5
             {
-            pushFollow(FOLLOW_150);
+            pushFollow(FOLLOW_149);
             rule__XSwitchExpression__Group__4__Impl();
 
             state._fsp--;
@@ -62629,37 +60671,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__4__Impl"
-    // InternalTableDSL.g:18927:1: rule__XSwitchExpression__Group__4__Impl : ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) ;
+    // InternalTableDSL.g:18306:1: rule__XSwitchExpression__Group__4__Impl : ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) ;
     public final void rule__XSwitchExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18931:1: ( ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) )
-            // InternalTableDSL.g:18932:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
+            // InternalTableDSL.g:18310:1: ( ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) )
+            // InternalTableDSL.g:18311:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
             {
-            // InternalTableDSL.g:18932:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
-            // InternalTableDSL.g:18933:2: ( rule__XSwitchExpression__CasesAssignment_4 )*
+            // InternalTableDSL.g:18311:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
+            // InternalTableDSL.g:18312:2: ( rule__XSwitchExpression__CasesAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getCasesAssignment_4()); 
             }
-            // InternalTableDSL.g:18934:2: ( rule__XSwitchExpression__CasesAssignment_4 )*
-            loop131:
+            // InternalTableDSL.g:18313:2: ( rule__XSwitchExpression__CasesAssignment_4 )*
+            loop129:
             do {
-                int alt131=2;
-                int LA131_0 = input.LA(1);
+                int alt129=2;
+                int LA129_0 = input.LA(1);
 
-                if ( (LA131_0==RULE_ID||LA131_0==36||LA131_0==135||LA131_0==137||(LA131_0>=145 && LA131_0<=146)) ) {
-                    alt131=1;
+                if ( (LA129_0==RULE_ID||LA129_0==36||LA129_0==135||LA129_0==137||(LA129_0>=145 && LA129_0<=146)) ) {
+                    alt129=1;
                 }
 
 
-                switch (alt131) {
+                switch (alt129) {
             	case 1 :
-            	    // InternalTableDSL.g:18934:3: rule__XSwitchExpression__CasesAssignment_4
+            	    // InternalTableDSL.g:18313:3: rule__XSwitchExpression__CasesAssignment_4
             	    {
-            	    pushFollow(FOLLOW_151);
+            	    pushFollow(FOLLOW_150);
             	    rule__XSwitchExpression__CasesAssignment_4();
 
             	    state._fsp--;
@@ -62669,7 +60711,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop131;
+            	    break loop129;
                 }
             } while (true);
 
@@ -62698,16 +60740,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__5"
-    // InternalTableDSL.g:18942:1: rule__XSwitchExpression__Group__5 : rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 ;
+    // InternalTableDSL.g:18321:1: rule__XSwitchExpression__Group__5 : rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 ;
     public final void rule__XSwitchExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18946:1: ( rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 )
-            // InternalTableDSL.g:18947:2: rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6
+            // InternalTableDSL.g:18325:1: ( rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 )
+            // InternalTableDSL.g:18326:2: rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6
             {
-            pushFollow(FOLLOW_150);
+            pushFollow(FOLLOW_149);
             rule__XSwitchExpression__Group__5__Impl();
 
             state._fsp--;
@@ -62736,31 +60778,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__5__Impl"
-    // InternalTableDSL.g:18954:1: rule__XSwitchExpression__Group__5__Impl : ( ( rule__XSwitchExpression__Group_5__0 )? ) ;
+    // InternalTableDSL.g:18333:1: rule__XSwitchExpression__Group__5__Impl : ( ( rule__XSwitchExpression__Group_5__0 )? ) ;
     public final void rule__XSwitchExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18958:1: ( ( ( rule__XSwitchExpression__Group_5__0 )? ) )
-            // InternalTableDSL.g:18959:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
+            // InternalTableDSL.g:18337:1: ( ( ( rule__XSwitchExpression__Group_5__0 )? ) )
+            // InternalTableDSL.g:18338:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
             {
-            // InternalTableDSL.g:18959:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
-            // InternalTableDSL.g:18960:2: ( rule__XSwitchExpression__Group_5__0 )?
+            // InternalTableDSL.g:18338:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
+            // InternalTableDSL.g:18339:2: ( rule__XSwitchExpression__Group_5__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_5()); 
             }
-            // InternalTableDSL.g:18961:2: ( rule__XSwitchExpression__Group_5__0 )?
-            int alt132=2;
-            int LA132_0 = input.LA(1);
+            // InternalTableDSL.g:18340:2: ( rule__XSwitchExpression__Group_5__0 )?
+            int alt130=2;
+            int LA130_0 = input.LA(1);
 
-            if ( (LA132_0==68) ) {
-                alt132=1;
+            if ( (LA130_0==68) ) {
+                alt130=1;
             }
-            switch (alt132) {
+            switch (alt130) {
                 case 1 :
-                    // InternalTableDSL.g:18961:3: rule__XSwitchExpression__Group_5__0
+                    // InternalTableDSL.g:18340:3: rule__XSwitchExpression__Group_5__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_5__0();
@@ -62798,14 +60840,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__6"
-    // InternalTableDSL.g:18969:1: rule__XSwitchExpression__Group__6 : rule__XSwitchExpression__Group__6__Impl ;
+    // InternalTableDSL.g:18348:1: rule__XSwitchExpression__Group__6 : rule__XSwitchExpression__Group__6__Impl ;
     public final void rule__XSwitchExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18973:1: ( rule__XSwitchExpression__Group__6__Impl )
-            // InternalTableDSL.g:18974:2: rule__XSwitchExpression__Group__6__Impl
+            // InternalTableDSL.g:18352:1: ( rule__XSwitchExpression__Group__6__Impl )
+            // InternalTableDSL.g:18353:2: rule__XSwitchExpression__Group__6__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__6__Impl();
@@ -62831,17 +60873,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__6__Impl"
-    // InternalTableDSL.g:18980:1: rule__XSwitchExpression__Group__6__Impl : ( '}' ) ;
+    // InternalTableDSL.g:18359:1: rule__XSwitchExpression__Group__6__Impl : ( '}' ) ;
     public final void rule__XSwitchExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:18984:1: ( ( '}' ) )
-            // InternalTableDSL.g:18985:1: ( '}' )
+            // InternalTableDSL.g:18363:1: ( ( '}' ) )
+            // InternalTableDSL.g:18364:1: ( '}' )
             {
-            // InternalTableDSL.g:18985:1: ( '}' )
-            // InternalTableDSL.g:18986:2: '}'
+            // InternalTableDSL.g:18364:1: ( '}' )
+            // InternalTableDSL.g:18365:2: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6()); 
@@ -62872,16 +60914,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__0"
-    // InternalTableDSL.g:18996:1: rule__XSwitchExpression__Group_2_0__0 : rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 ;
+    // InternalTableDSL.g:18375:1: rule__XSwitchExpression__Group_2_0__0 : rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 ;
     public final void rule__XSwitchExpression__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19000:1: ( rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 )
-            // InternalTableDSL.g:19001:2: rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1
+            // InternalTableDSL.g:18379:1: ( rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 )
+            // InternalTableDSL.g:18380:2: rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XSwitchExpression__Group_2_0__0__Impl();
 
             state._fsp--;
@@ -62910,23 +60952,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__0__Impl"
-    // InternalTableDSL.g:19008:1: rule__XSwitchExpression__Group_2_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) ;
+    // InternalTableDSL.g:18387:1: rule__XSwitchExpression__Group_2_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19012:1: ( ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) )
-            // InternalTableDSL.g:19013:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
+            // InternalTableDSL.g:18391:1: ( ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) )
+            // InternalTableDSL.g:18392:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
             {
-            // InternalTableDSL.g:19013:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
-            // InternalTableDSL.g:19014:2: ( rule__XSwitchExpression__Group_2_0_0__0 )
+            // InternalTableDSL.g:18392:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
+            // InternalTableDSL.g:18393:2: ( rule__XSwitchExpression__Group_2_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0_0()); 
             }
-            // InternalTableDSL.g:19015:2: ( rule__XSwitchExpression__Group_2_0_0__0 )
-            // InternalTableDSL.g:19015:3: rule__XSwitchExpression__Group_2_0_0__0
+            // InternalTableDSL.g:18394:2: ( rule__XSwitchExpression__Group_2_0_0__0 )
+            // InternalTableDSL.g:18394:3: rule__XSwitchExpression__Group_2_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0__0();
@@ -62961,16 +61003,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__1"
-    // InternalTableDSL.g:19023:1: rule__XSwitchExpression__Group_2_0__1 : rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 ;
+    // InternalTableDSL.g:18402:1: rule__XSwitchExpression__Group_2_0__1 : rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 ;
     public final void rule__XSwitchExpression__Group_2_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19027:1: ( rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 )
-            // InternalTableDSL.g:19028:2: rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2
+            // InternalTableDSL.g:18406:1: ( rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 )
+            // InternalTableDSL.g:18407:2: rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2
             {
-            pushFollow(FOLLOW_145);
+            pushFollow(FOLLOW_144);
             rule__XSwitchExpression__Group_2_0__1__Impl();
 
             state._fsp--;
@@ -62999,23 +61041,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__1__Impl"
-    // InternalTableDSL.g:19035:1: rule__XSwitchExpression__Group_2_0__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) ;
+    // InternalTableDSL.g:18414:1: rule__XSwitchExpression__Group_2_0__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19039:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) )
-            // InternalTableDSL.g:19040:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
+            // InternalTableDSL.g:18418:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) )
+            // InternalTableDSL.g:18419:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
             {
-            // InternalTableDSL.g:19040:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
-            // InternalTableDSL.g:19041:2: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
+            // InternalTableDSL.g:18419:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
+            // InternalTableDSL.g:18420:2: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchAssignment_2_0_1()); 
             }
-            // InternalTableDSL.g:19042:2: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
-            // InternalTableDSL.g:19042:3: rule__XSwitchExpression__SwitchAssignment_2_0_1
+            // InternalTableDSL.g:18421:2: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
+            // InternalTableDSL.g:18421:3: rule__XSwitchExpression__SwitchAssignment_2_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__SwitchAssignment_2_0_1();
@@ -63050,14 +61092,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__2"
-    // InternalTableDSL.g:19050:1: rule__XSwitchExpression__Group_2_0__2 : rule__XSwitchExpression__Group_2_0__2__Impl ;
+    // InternalTableDSL.g:18429:1: rule__XSwitchExpression__Group_2_0__2 : rule__XSwitchExpression__Group_2_0__2__Impl ;
     public final void rule__XSwitchExpression__Group_2_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19054:1: ( rule__XSwitchExpression__Group_2_0__2__Impl )
-            // InternalTableDSL.g:19055:2: rule__XSwitchExpression__Group_2_0__2__Impl
+            // InternalTableDSL.g:18433:1: ( rule__XSwitchExpression__Group_2_0__2__Impl )
+            // InternalTableDSL.g:18434:2: rule__XSwitchExpression__Group_2_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0__2__Impl();
@@ -63083,17 +61125,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__2__Impl"
-    // InternalTableDSL.g:19061:1: rule__XSwitchExpression__Group_2_0__2__Impl : ( ')' ) ;
+    // InternalTableDSL.g:18440:1: rule__XSwitchExpression__Group_2_0__2__Impl : ( ')' ) ;
     public final void rule__XSwitchExpression__Group_2_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19065:1: ( ( ')' ) )
-            // InternalTableDSL.g:19066:1: ( ')' )
+            // InternalTableDSL.g:18444:1: ( ( ')' ) )
+            // InternalTableDSL.g:18445:1: ( ')' )
             {
-            // InternalTableDSL.g:19066:1: ( ')' )
-            // InternalTableDSL.g:19067:2: ')'
+            // InternalTableDSL.g:18445:1: ( ')' )
+            // InternalTableDSL.g:18446:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2()); 
@@ -63124,14 +61166,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0__0"
-    // InternalTableDSL.g:19077:1: rule__XSwitchExpression__Group_2_0_0__0 : rule__XSwitchExpression__Group_2_0_0__0__Impl ;
+    // InternalTableDSL.g:18456:1: rule__XSwitchExpression__Group_2_0_0__0 : rule__XSwitchExpression__Group_2_0_0__0__Impl ;
     public final void rule__XSwitchExpression__Group_2_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19081:1: ( rule__XSwitchExpression__Group_2_0_0__0__Impl )
-            // InternalTableDSL.g:19082:2: rule__XSwitchExpression__Group_2_0_0__0__Impl
+            // InternalTableDSL.g:18460:1: ( rule__XSwitchExpression__Group_2_0_0__0__Impl )
+            // InternalTableDSL.g:18461:2: rule__XSwitchExpression__Group_2_0_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0__0__Impl();
@@ -63157,23 +61199,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0__0__Impl"
-    // InternalTableDSL.g:19088:1: rule__XSwitchExpression__Group_2_0_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) ;
+    // InternalTableDSL.g:18467:1: rule__XSwitchExpression__Group_2_0_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19092:1: ( ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) )
-            // InternalTableDSL.g:19093:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
+            // InternalTableDSL.g:18471:1: ( ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) )
+            // InternalTableDSL.g:18472:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
             {
-            // InternalTableDSL.g:19093:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
-            // InternalTableDSL.g:19094:2: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
+            // InternalTableDSL.g:18472:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
+            // InternalTableDSL.g:18473:2: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0_0_0()); 
             }
-            // InternalTableDSL.g:19095:2: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
-            // InternalTableDSL.g:19095:3: rule__XSwitchExpression__Group_2_0_0_0__0
+            // InternalTableDSL.g:18474:2: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
+            // InternalTableDSL.g:18474:3: rule__XSwitchExpression__Group_2_0_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__0();
@@ -63208,16 +61250,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__0"
-    // InternalTableDSL.g:19104:1: rule__XSwitchExpression__Group_2_0_0_0__0 : rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 ;
+    // InternalTableDSL.g:18483:1: rule__XSwitchExpression__Group_2_0_0_0__0 : rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19108:1: ( rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 )
-            // InternalTableDSL.g:19109:2: rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1
+            // InternalTableDSL.g:18487:1: ( rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 )
+            // InternalTableDSL.g:18488:2: rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__XSwitchExpression__Group_2_0_0_0__0__Impl();
 
             state._fsp--;
@@ -63246,17 +61288,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__0__Impl"
-    // InternalTableDSL.g:19116:1: rule__XSwitchExpression__Group_2_0_0_0__0__Impl : ( '(' ) ;
+    // InternalTableDSL.g:18495:1: rule__XSwitchExpression__Group_2_0_0_0__0__Impl : ( '(' ) ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19120:1: ( ( '(' ) )
-            // InternalTableDSL.g:19121:1: ( '(' )
+            // InternalTableDSL.g:18499:1: ( ( '(' ) )
+            // InternalTableDSL.g:18500:1: ( '(' )
             {
-            // InternalTableDSL.g:19121:1: ( '(' )
-            // InternalTableDSL.g:19122:2: '('
+            // InternalTableDSL.g:18500:1: ( '(' )
+            // InternalTableDSL.g:18501:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0()); 
@@ -63287,16 +61329,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__1"
-    // InternalTableDSL.g:19131:1: rule__XSwitchExpression__Group_2_0_0_0__1 : rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 ;
+    // InternalTableDSL.g:18510:1: rule__XSwitchExpression__Group_2_0_0_0__1 : rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19135:1: ( rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 )
-            // InternalTableDSL.g:19136:2: rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2
+            // InternalTableDSL.g:18514:1: ( rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 )
+            // InternalTableDSL.g:18515:2: rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2
             {
-            pushFollow(FOLLOW_152);
+            pushFollow(FOLLOW_151);
             rule__XSwitchExpression__Group_2_0_0_0__1__Impl();
 
             state._fsp--;
@@ -63325,23 +61367,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__1__Impl"
-    // InternalTableDSL.g:19143:1: rule__XSwitchExpression__Group_2_0_0_0__1__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) ;
+    // InternalTableDSL.g:18522:1: rule__XSwitchExpression__Group_2_0_0_0__1__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19147:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) )
-            // InternalTableDSL.g:19148:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
+            // InternalTableDSL.g:18526:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) )
+            // InternalTableDSL.g:18527:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
             {
-            // InternalTableDSL.g:19148:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
-            // InternalTableDSL.g:19149:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
+            // InternalTableDSL.g:18527:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
+            // InternalTableDSL.g:18528:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamAssignment_2_0_0_0_1()); 
             }
-            // InternalTableDSL.g:19150:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
-            // InternalTableDSL.g:19150:3: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1
+            // InternalTableDSL.g:18529:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
+            // InternalTableDSL.g:18529:3: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1();
@@ -63376,14 +61418,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__2"
-    // InternalTableDSL.g:19158:1: rule__XSwitchExpression__Group_2_0_0_0__2 : rule__XSwitchExpression__Group_2_0_0_0__2__Impl ;
+    // InternalTableDSL.g:18537:1: rule__XSwitchExpression__Group_2_0_0_0__2 : rule__XSwitchExpression__Group_2_0_0_0__2__Impl ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19162:1: ( rule__XSwitchExpression__Group_2_0_0_0__2__Impl )
-            // InternalTableDSL.g:19163:2: rule__XSwitchExpression__Group_2_0_0_0__2__Impl
+            // InternalTableDSL.g:18541:1: ( rule__XSwitchExpression__Group_2_0_0_0__2__Impl )
+            // InternalTableDSL.g:18542:2: rule__XSwitchExpression__Group_2_0_0_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__2__Impl();
@@ -63409,17 +61451,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__2__Impl"
-    // InternalTableDSL.g:19169:1: rule__XSwitchExpression__Group_2_0_0_0__2__Impl : ( ':' ) ;
+    // InternalTableDSL.g:18548:1: rule__XSwitchExpression__Group_2_0_0_0__2__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19173:1: ( ( ':' ) )
-            // InternalTableDSL.g:19174:1: ( ':' )
+            // InternalTableDSL.g:18552:1: ( ( ':' ) )
+            // InternalTableDSL.g:18553:1: ( ':' )
             {
-            // InternalTableDSL.g:19174:1: ( ':' )
-            // InternalTableDSL.g:19175:2: ':'
+            // InternalTableDSL.g:18553:1: ( ':' )
+            // InternalTableDSL.g:18554:2: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2()); 
@@ -63450,16 +61492,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__0"
-    // InternalTableDSL.g:19185:1: rule__XSwitchExpression__Group_2_1__0 : rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 ;
+    // InternalTableDSL.g:18564:1: rule__XSwitchExpression__Group_2_1__0 : rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 ;
     public final void rule__XSwitchExpression__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19189:1: ( rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 )
-            // InternalTableDSL.g:19190:2: rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1
+            // InternalTableDSL.g:18568:1: ( rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 )
+            // InternalTableDSL.g:18569:2: rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1
             {
-            pushFollow(FOLLOW_149);
+            pushFollow(FOLLOW_148);
             rule__XSwitchExpression__Group_2_1__0__Impl();
 
             state._fsp--;
@@ -63488,27 +61530,27 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__0__Impl"
-    // InternalTableDSL.g:19197:1: rule__XSwitchExpression__Group_2_1__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) ;
+    // InternalTableDSL.g:18576:1: rule__XSwitchExpression__Group_2_1__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) ;
     public final void rule__XSwitchExpression__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19201:1: ( ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) )
-            // InternalTableDSL.g:19202:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
+            // InternalTableDSL.g:18580:1: ( ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) )
+            // InternalTableDSL.g:18581:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
             {
-            // InternalTableDSL.g:19202:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
-            // InternalTableDSL.g:19203:2: ( rule__XSwitchExpression__Group_2_1_0__0 )?
+            // InternalTableDSL.g:18581:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
+            // InternalTableDSL.g:18582:2: ( rule__XSwitchExpression__Group_2_1_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1_0()); 
             }
-            // InternalTableDSL.g:19204:2: ( rule__XSwitchExpression__Group_2_1_0__0 )?
-            int alt133=2;
-            alt133 = dfa133.predict(input);
-            switch (alt133) {
+            // InternalTableDSL.g:18583:2: ( rule__XSwitchExpression__Group_2_1_0__0 )?
+            int alt131=2;
+            alt131 = dfa131.predict(input);
+            switch (alt131) {
                 case 1 :
-                    // InternalTableDSL.g:19204:3: rule__XSwitchExpression__Group_2_1_0__0
+                    // InternalTableDSL.g:18583:3: rule__XSwitchExpression__Group_2_1_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_2_1_0__0();
@@ -63546,14 +61588,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__1"
-    // InternalTableDSL.g:19212:1: rule__XSwitchExpression__Group_2_1__1 : rule__XSwitchExpression__Group_2_1__1__Impl ;
+    // InternalTableDSL.g:18591:1: rule__XSwitchExpression__Group_2_1__1 : rule__XSwitchExpression__Group_2_1__1__Impl ;
     public final void rule__XSwitchExpression__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19216:1: ( rule__XSwitchExpression__Group_2_1__1__Impl )
-            // InternalTableDSL.g:19217:2: rule__XSwitchExpression__Group_2_1__1__Impl
+            // InternalTableDSL.g:18595:1: ( rule__XSwitchExpression__Group_2_1__1__Impl )
+            // InternalTableDSL.g:18596:2: rule__XSwitchExpression__Group_2_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1__1__Impl();
@@ -63579,23 +61621,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__1__Impl"
-    // InternalTableDSL.g:19223:1: rule__XSwitchExpression__Group_2_1__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) ;
+    // InternalTableDSL.g:18602:1: rule__XSwitchExpression__Group_2_1__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) ;
     public final void rule__XSwitchExpression__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19227:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) )
-            // InternalTableDSL.g:19228:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
+            // InternalTableDSL.g:18606:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) )
+            // InternalTableDSL.g:18607:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
             {
-            // InternalTableDSL.g:19228:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
-            // InternalTableDSL.g:19229:2: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
+            // InternalTableDSL.g:18607:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
+            // InternalTableDSL.g:18608:2: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchAssignment_2_1_1()); 
             }
-            // InternalTableDSL.g:19230:2: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
-            // InternalTableDSL.g:19230:3: rule__XSwitchExpression__SwitchAssignment_2_1_1
+            // InternalTableDSL.g:18609:2: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
+            // InternalTableDSL.g:18609:3: rule__XSwitchExpression__SwitchAssignment_2_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__SwitchAssignment_2_1_1();
@@ -63630,14 +61672,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0__0"
-    // InternalTableDSL.g:19239:1: rule__XSwitchExpression__Group_2_1_0__0 : rule__XSwitchExpression__Group_2_1_0__0__Impl ;
+    // InternalTableDSL.g:18618:1: rule__XSwitchExpression__Group_2_1_0__0 : rule__XSwitchExpression__Group_2_1_0__0__Impl ;
     public final void rule__XSwitchExpression__Group_2_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19243:1: ( rule__XSwitchExpression__Group_2_1_0__0__Impl )
-            // InternalTableDSL.g:19244:2: rule__XSwitchExpression__Group_2_1_0__0__Impl
+            // InternalTableDSL.g:18622:1: ( rule__XSwitchExpression__Group_2_1_0__0__Impl )
+            // InternalTableDSL.g:18623:2: rule__XSwitchExpression__Group_2_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0__0__Impl();
@@ -63663,23 +61705,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0__0__Impl"
-    // InternalTableDSL.g:19250:1: rule__XSwitchExpression__Group_2_1_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) ;
+    // InternalTableDSL.g:18629:1: rule__XSwitchExpression__Group_2_1_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19254:1: ( ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) )
-            // InternalTableDSL.g:19255:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
+            // InternalTableDSL.g:18633:1: ( ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) )
+            // InternalTableDSL.g:18634:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
             {
-            // InternalTableDSL.g:19255:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
-            // InternalTableDSL.g:19256:2: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
+            // InternalTableDSL.g:18634:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
+            // InternalTableDSL.g:18635:2: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1_0_0()); 
             }
-            // InternalTableDSL.g:19257:2: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
-            // InternalTableDSL.g:19257:3: rule__XSwitchExpression__Group_2_1_0_0__0
+            // InternalTableDSL.g:18636:2: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
+            // InternalTableDSL.g:18636:3: rule__XSwitchExpression__Group_2_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0_0__0();
@@ -63714,16 +61756,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__0"
-    // InternalTableDSL.g:19266:1: rule__XSwitchExpression__Group_2_1_0_0__0 : rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 ;
+    // InternalTableDSL.g:18645:1: rule__XSwitchExpression__Group_2_1_0_0__0 : rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19270:1: ( rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 )
-            // InternalTableDSL.g:19271:2: rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1
+            // InternalTableDSL.g:18649:1: ( rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 )
+            // InternalTableDSL.g:18650:2: rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1
             {
-            pushFollow(FOLLOW_152);
+            pushFollow(FOLLOW_151);
             rule__XSwitchExpression__Group_2_1_0_0__0__Impl();
 
             state._fsp--;
@@ -63752,23 +61794,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__0__Impl"
-    // InternalTableDSL.g:19278:1: rule__XSwitchExpression__Group_2_1_0_0__0__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) ;
+    // InternalTableDSL.g:18657:1: rule__XSwitchExpression__Group_2_1_0_0__0__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19282:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) )
-            // InternalTableDSL.g:19283:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
+            // InternalTableDSL.g:18661:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) )
+            // InternalTableDSL.g:18662:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
             {
-            // InternalTableDSL.g:19283:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
-            // InternalTableDSL.g:19284:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
+            // InternalTableDSL.g:18662:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
+            // InternalTableDSL.g:18663:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamAssignment_2_1_0_0_0()); 
             }
-            // InternalTableDSL.g:19285:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
-            // InternalTableDSL.g:19285:3: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0
+            // InternalTableDSL.g:18664:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
+            // InternalTableDSL.g:18664:3: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0();
@@ -63803,14 +61845,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__1"
-    // InternalTableDSL.g:19293:1: rule__XSwitchExpression__Group_2_1_0_0__1 : rule__XSwitchExpression__Group_2_1_0_0__1__Impl ;
+    // InternalTableDSL.g:18672:1: rule__XSwitchExpression__Group_2_1_0_0__1 : rule__XSwitchExpression__Group_2_1_0_0__1__Impl ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19297:1: ( rule__XSwitchExpression__Group_2_1_0_0__1__Impl )
-            // InternalTableDSL.g:19298:2: rule__XSwitchExpression__Group_2_1_0_0__1__Impl
+            // InternalTableDSL.g:18676:1: ( rule__XSwitchExpression__Group_2_1_0_0__1__Impl )
+            // InternalTableDSL.g:18677:2: rule__XSwitchExpression__Group_2_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0_0__1__Impl();
@@ -63836,17 +61878,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__1__Impl"
-    // InternalTableDSL.g:19304:1: rule__XSwitchExpression__Group_2_1_0_0__1__Impl : ( ':' ) ;
+    // InternalTableDSL.g:18683:1: rule__XSwitchExpression__Group_2_1_0_0__1__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19308:1: ( ( ':' ) )
-            // InternalTableDSL.g:19309:1: ( ':' )
+            // InternalTableDSL.g:18687:1: ( ( ':' ) )
+            // InternalTableDSL.g:18688:1: ( ':' )
             {
-            // InternalTableDSL.g:19309:1: ( ':' )
-            // InternalTableDSL.g:19310:2: ':'
+            // InternalTableDSL.g:18688:1: ( ':' )
+            // InternalTableDSL.g:18689:2: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1()); 
@@ -63877,16 +61919,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__0"
-    // InternalTableDSL.g:19320:1: rule__XSwitchExpression__Group_5__0 : rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 ;
+    // InternalTableDSL.g:18699:1: rule__XSwitchExpression__Group_5__0 : rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 ;
     public final void rule__XSwitchExpression__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19324:1: ( rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 )
-            // InternalTableDSL.g:19325:2: rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1
+            // InternalTableDSL.g:18703:1: ( rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 )
+            // InternalTableDSL.g:18704:2: rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1
             {
-            pushFollow(FOLLOW_152);
+            pushFollow(FOLLOW_151);
             rule__XSwitchExpression__Group_5__0__Impl();
 
             state._fsp--;
@@ -63915,17 +61957,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__0__Impl"
-    // InternalTableDSL.g:19332:1: rule__XSwitchExpression__Group_5__0__Impl : ( 'default' ) ;
+    // InternalTableDSL.g:18711:1: rule__XSwitchExpression__Group_5__0__Impl : ( 'default' ) ;
     public final void rule__XSwitchExpression__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19336:1: ( ( 'default' ) )
-            // InternalTableDSL.g:19337:1: ( 'default' )
+            // InternalTableDSL.g:18715:1: ( ( 'default' ) )
+            // InternalTableDSL.g:18716:1: ( 'default' )
             {
-            // InternalTableDSL.g:19337:1: ( 'default' )
-            // InternalTableDSL.g:19338:2: 'default'
+            // InternalTableDSL.g:18716:1: ( 'default' )
+            // InternalTableDSL.g:18717:2: 'default'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0()); 
@@ -63956,16 +61998,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__1"
-    // InternalTableDSL.g:19347:1: rule__XSwitchExpression__Group_5__1 : rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 ;
+    // InternalTableDSL.g:18726:1: rule__XSwitchExpression__Group_5__1 : rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 ;
     public final void rule__XSwitchExpression__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19351:1: ( rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 )
-            // InternalTableDSL.g:19352:2: rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2
+            // InternalTableDSL.g:18730:1: ( rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 )
+            // InternalTableDSL.g:18731:2: rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XSwitchExpression__Group_5__1__Impl();
 
             state._fsp--;
@@ -63994,17 +62036,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__1__Impl"
-    // InternalTableDSL.g:19359:1: rule__XSwitchExpression__Group_5__1__Impl : ( ':' ) ;
+    // InternalTableDSL.g:18738:1: rule__XSwitchExpression__Group_5__1__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19363:1: ( ( ':' ) )
-            // InternalTableDSL.g:19364:1: ( ':' )
+            // InternalTableDSL.g:18742:1: ( ( ':' ) )
+            // InternalTableDSL.g:18743:1: ( ':' )
             {
-            // InternalTableDSL.g:19364:1: ( ':' )
-            // InternalTableDSL.g:19365:2: ':'
+            // InternalTableDSL.g:18743:1: ( ':' )
+            // InternalTableDSL.g:18744:2: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1()); 
@@ -64035,14 +62077,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__2"
-    // InternalTableDSL.g:19374:1: rule__XSwitchExpression__Group_5__2 : rule__XSwitchExpression__Group_5__2__Impl ;
+    // InternalTableDSL.g:18753:1: rule__XSwitchExpression__Group_5__2 : rule__XSwitchExpression__Group_5__2__Impl ;
     public final void rule__XSwitchExpression__Group_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19378:1: ( rule__XSwitchExpression__Group_5__2__Impl )
-            // InternalTableDSL.g:19379:2: rule__XSwitchExpression__Group_5__2__Impl
+            // InternalTableDSL.g:18757:1: ( rule__XSwitchExpression__Group_5__2__Impl )
+            // InternalTableDSL.g:18758:2: rule__XSwitchExpression__Group_5__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_5__2__Impl();
@@ -64068,23 +62110,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__2__Impl"
-    // InternalTableDSL.g:19385:1: rule__XSwitchExpression__Group_5__2__Impl : ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) ;
+    // InternalTableDSL.g:18764:1: rule__XSwitchExpression__Group_5__2__Impl : ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) ;
     public final void rule__XSwitchExpression__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19389:1: ( ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) )
-            // InternalTableDSL.g:19390:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
+            // InternalTableDSL.g:18768:1: ( ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) )
+            // InternalTableDSL.g:18769:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
             {
-            // InternalTableDSL.g:19390:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
-            // InternalTableDSL.g:19391:2: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
+            // InternalTableDSL.g:18769:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
+            // InternalTableDSL.g:18770:2: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultAssignment_5_2()); 
             }
-            // InternalTableDSL.g:19392:2: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
-            // InternalTableDSL.g:19392:3: rule__XSwitchExpression__DefaultAssignment_5_2
+            // InternalTableDSL.g:18771:2: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
+            // InternalTableDSL.g:18771:3: rule__XSwitchExpression__DefaultAssignment_5_2
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__DefaultAssignment_5_2();
@@ -64119,16 +62161,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group__0"
-    // InternalTableDSL.g:19401:1: rule__XCasePart__Group__0 : rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 ;
+    // InternalTableDSL.g:18780:1: rule__XCasePart__Group__0 : rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 ;
     public final void rule__XCasePart__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19405:1: ( rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 )
-            // InternalTableDSL.g:19406:2: rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1
+            // InternalTableDSL.g:18784:1: ( rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 )
+            // InternalTableDSL.g:18785:2: rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1
             {
-            pushFollow(FOLLOW_153);
+            pushFollow(FOLLOW_152);
             rule__XCasePart__Group__0__Impl();
 
             state._fsp--;
@@ -64157,23 +62199,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group__0__Impl"
-    // InternalTableDSL.g:19413:1: rule__XCasePart__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:18792:1: rule__XCasePart__Group__0__Impl : ( () ) ;
     public final void rule__XCasePart__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19417:1: ( ( () ) )
-            // InternalTableDSL.g:19418:1: ( () )
+            // InternalTableDSL.g:18796:1: ( ( () ) )
+            // InternalTableDSL.g:18797:1: ( () )
             {
-            // InternalTableDSL.g:19418:1: ( () )
-            // InternalTableDSL.g:19419:2: ()
+            // InternalTableDSL.g:18797:1: ( () )
+            // InternalTableDSL.g:18798:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getXCasePartAction_0()); 
             }
-            // InternalTableDSL.g:19420:2: ()
-            // InternalTableDSL.g:19420:3: 
+            // InternalTableDSL.g:18799:2: ()
+            // InternalTableDSL.g:18799:3: 
             {
             }
 
@@ -64198,16 +62240,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group__1"
-    // InternalTableDSL.g:19428:1: rule__XCasePart__Group__1 : rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 ;
+    // InternalTableDSL.g:18807:1: rule__XCasePart__Group__1 : rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 ;
     public final void rule__XCasePart__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19432:1: ( rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 )
-            // InternalTableDSL.g:19433:2: rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2
+            // InternalTableDSL.g:18811:1: ( rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 )
+            // InternalTableDSL.g:18812:2: rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2
             {
-            pushFollow(FOLLOW_153);
+            pushFollow(FOLLOW_152);
             rule__XCasePart__Group__1__Impl();
 
             state._fsp--;
@@ -64236,31 +62278,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group__1__Impl"
-    // InternalTableDSL.g:19440:1: rule__XCasePart__Group__1__Impl : ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) ;
+    // InternalTableDSL.g:18819:1: rule__XCasePart__Group__1__Impl : ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) ;
     public final void rule__XCasePart__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19444:1: ( ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) )
-            // InternalTableDSL.g:19445:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
+            // InternalTableDSL.g:18823:1: ( ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) )
+            // InternalTableDSL.g:18824:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
             {
-            // InternalTableDSL.g:19445:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
-            // InternalTableDSL.g:19446:2: ( rule__XCasePart__TypeGuardAssignment_1 )?
+            // InternalTableDSL.g:18824:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
+            // InternalTableDSL.g:18825:2: ( rule__XCasePart__TypeGuardAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getTypeGuardAssignment_1()); 
             }
-            // InternalTableDSL.g:19447:2: ( rule__XCasePart__TypeGuardAssignment_1 )?
-            int alt134=2;
-            int LA134_0 = input.LA(1);
+            // InternalTableDSL.g:18826:2: ( rule__XCasePart__TypeGuardAssignment_1 )?
+            int alt132=2;
+            int LA132_0 = input.LA(1);
 
-            if ( (LA134_0==RULE_ID||LA134_0==36||LA134_0==135) ) {
-                alt134=1;
+            if ( (LA132_0==RULE_ID||LA132_0==36||LA132_0==135) ) {
+                alt132=1;
             }
-            switch (alt134) {
+            switch (alt132) {
                 case 1 :
-                    // InternalTableDSL.g:19447:3: rule__XCasePart__TypeGuardAssignment_1
+                    // InternalTableDSL.g:18826:3: rule__XCasePart__TypeGuardAssignment_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XCasePart__TypeGuardAssignment_1();
@@ -64298,16 +62340,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group__2"
-    // InternalTableDSL.g:19455:1: rule__XCasePart__Group__2 : rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 ;
+    // InternalTableDSL.g:18834:1: rule__XCasePart__Group__2 : rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 ;
     public final void rule__XCasePart__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19459:1: ( rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 )
-            // InternalTableDSL.g:19460:2: rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3
+            // InternalTableDSL.g:18838:1: ( rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 )
+            // InternalTableDSL.g:18839:2: rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3
             {
-            pushFollow(FOLLOW_153);
+            pushFollow(FOLLOW_152);
             rule__XCasePart__Group__2__Impl();
 
             state._fsp--;
@@ -64336,31 +62378,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group__2__Impl"
-    // InternalTableDSL.g:19467:1: rule__XCasePart__Group__2__Impl : ( ( rule__XCasePart__Group_2__0 )? ) ;
+    // InternalTableDSL.g:18846:1: rule__XCasePart__Group__2__Impl : ( ( rule__XCasePart__Group_2__0 )? ) ;
     public final void rule__XCasePart__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19471:1: ( ( ( rule__XCasePart__Group_2__0 )? ) )
-            // InternalTableDSL.g:19472:1: ( ( rule__XCasePart__Group_2__0 )? )
+            // InternalTableDSL.g:18850:1: ( ( ( rule__XCasePart__Group_2__0 )? ) )
+            // InternalTableDSL.g:18851:1: ( ( rule__XCasePart__Group_2__0 )? )
             {
-            // InternalTableDSL.g:19472:1: ( ( rule__XCasePart__Group_2__0 )? )
-            // InternalTableDSL.g:19473:2: ( rule__XCasePart__Group_2__0 )?
+            // InternalTableDSL.g:18851:1: ( ( rule__XCasePart__Group_2__0 )? )
+            // InternalTableDSL.g:18852:2: ( rule__XCasePart__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getGroup_2()); 
             }
-            // InternalTableDSL.g:19474:2: ( rule__XCasePart__Group_2__0 )?
-            int alt135=2;
-            int LA135_0 = input.LA(1);
+            // InternalTableDSL.g:18853:2: ( rule__XCasePart__Group_2__0 )?
+            int alt133=2;
+            int LA133_0 = input.LA(1);
 
-            if ( (LA135_0==146) ) {
-                alt135=1;
+            if ( (LA133_0==146) ) {
+                alt133=1;
             }
-            switch (alt135) {
+            switch (alt133) {
                 case 1 :
-                    // InternalTableDSL.g:19474:3: rule__XCasePart__Group_2__0
+                    // InternalTableDSL.g:18853:3: rule__XCasePart__Group_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XCasePart__Group_2__0();
@@ -64398,14 +62440,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group__3"
-    // InternalTableDSL.g:19482:1: rule__XCasePart__Group__3 : rule__XCasePart__Group__3__Impl ;
+    // InternalTableDSL.g:18861:1: rule__XCasePart__Group__3 : rule__XCasePart__Group__3__Impl ;
     public final void rule__XCasePart__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19486:1: ( rule__XCasePart__Group__3__Impl )
-            // InternalTableDSL.g:19487:2: rule__XCasePart__Group__3__Impl
+            // InternalTableDSL.g:18865:1: ( rule__XCasePart__Group__3__Impl )
+            // InternalTableDSL.g:18866:2: rule__XCasePart__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCasePart__Group__3__Impl();
@@ -64431,23 +62473,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group__3__Impl"
-    // InternalTableDSL.g:19493:1: rule__XCasePart__Group__3__Impl : ( ( rule__XCasePart__Alternatives_3 ) ) ;
+    // InternalTableDSL.g:18872:1: rule__XCasePart__Group__3__Impl : ( ( rule__XCasePart__Alternatives_3 ) ) ;
     public final void rule__XCasePart__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19497:1: ( ( ( rule__XCasePart__Alternatives_3 ) ) )
-            // InternalTableDSL.g:19498:1: ( ( rule__XCasePart__Alternatives_3 ) )
+            // InternalTableDSL.g:18876:1: ( ( ( rule__XCasePart__Alternatives_3 ) ) )
+            // InternalTableDSL.g:18877:1: ( ( rule__XCasePart__Alternatives_3 ) )
             {
-            // InternalTableDSL.g:19498:1: ( ( rule__XCasePart__Alternatives_3 ) )
-            // InternalTableDSL.g:19499:2: ( rule__XCasePart__Alternatives_3 )
+            // InternalTableDSL.g:18877:1: ( ( rule__XCasePart__Alternatives_3 ) )
+            // InternalTableDSL.g:18878:2: ( rule__XCasePart__Alternatives_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getAlternatives_3()); 
             }
-            // InternalTableDSL.g:19500:2: ( rule__XCasePart__Alternatives_3 )
-            // InternalTableDSL.g:19500:3: rule__XCasePart__Alternatives_3
+            // InternalTableDSL.g:18879:2: ( rule__XCasePart__Alternatives_3 )
+            // InternalTableDSL.g:18879:3: rule__XCasePart__Alternatives_3
             {
             pushFollow(FOLLOW_2);
             rule__XCasePart__Alternatives_3();
@@ -64482,16 +62524,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group_2__0"
-    // InternalTableDSL.g:19509:1: rule__XCasePart__Group_2__0 : rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 ;
+    // InternalTableDSL.g:18888:1: rule__XCasePart__Group_2__0 : rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 ;
     public final void rule__XCasePart__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19513:1: ( rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 )
-            // InternalTableDSL.g:19514:2: rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1
+            // InternalTableDSL.g:18892:1: ( rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 )
+            // InternalTableDSL.g:18893:2: rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XCasePart__Group_2__0__Impl();
 
             state._fsp--;
@@ -64520,17 +62562,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group_2__0__Impl"
-    // InternalTableDSL.g:19521:1: rule__XCasePart__Group_2__0__Impl : ( 'case' ) ;
+    // InternalTableDSL.g:18900:1: rule__XCasePart__Group_2__0__Impl : ( 'case' ) ;
     public final void rule__XCasePart__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19525:1: ( ( 'case' ) )
-            // InternalTableDSL.g:19526:1: ( 'case' )
+            // InternalTableDSL.g:18904:1: ( ( 'case' ) )
+            // InternalTableDSL.g:18905:1: ( 'case' )
             {
-            // InternalTableDSL.g:19526:1: ( 'case' )
-            // InternalTableDSL.g:19527:2: 'case'
+            // InternalTableDSL.g:18905:1: ( 'case' )
+            // InternalTableDSL.g:18906:2: 'case'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseKeyword_2_0()); 
@@ -64561,14 +62603,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group_2__1"
-    // InternalTableDSL.g:19536:1: rule__XCasePart__Group_2__1 : rule__XCasePart__Group_2__1__Impl ;
+    // InternalTableDSL.g:18915:1: rule__XCasePart__Group_2__1 : rule__XCasePart__Group_2__1__Impl ;
     public final void rule__XCasePart__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19540:1: ( rule__XCasePart__Group_2__1__Impl )
-            // InternalTableDSL.g:19541:2: rule__XCasePart__Group_2__1__Impl
+            // InternalTableDSL.g:18919:1: ( rule__XCasePart__Group_2__1__Impl )
+            // InternalTableDSL.g:18920:2: rule__XCasePart__Group_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCasePart__Group_2__1__Impl();
@@ -64594,23 +62636,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group_2__1__Impl"
-    // InternalTableDSL.g:19547:1: rule__XCasePart__Group_2__1__Impl : ( ( rule__XCasePart__CaseAssignment_2_1 ) ) ;
+    // InternalTableDSL.g:18926:1: rule__XCasePart__Group_2__1__Impl : ( ( rule__XCasePart__CaseAssignment_2_1 ) ) ;
     public final void rule__XCasePart__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19551:1: ( ( ( rule__XCasePart__CaseAssignment_2_1 ) ) )
-            // InternalTableDSL.g:19552:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
+            // InternalTableDSL.g:18930:1: ( ( ( rule__XCasePart__CaseAssignment_2_1 ) ) )
+            // InternalTableDSL.g:18931:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
             {
-            // InternalTableDSL.g:19552:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
-            // InternalTableDSL.g:19553:2: ( rule__XCasePart__CaseAssignment_2_1 )
+            // InternalTableDSL.g:18931:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
+            // InternalTableDSL.g:18932:2: ( rule__XCasePart__CaseAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseAssignment_2_1()); 
             }
-            // InternalTableDSL.g:19554:2: ( rule__XCasePart__CaseAssignment_2_1 )
-            // InternalTableDSL.g:19554:3: rule__XCasePart__CaseAssignment_2_1
+            // InternalTableDSL.g:18933:2: ( rule__XCasePart__CaseAssignment_2_1 )
+            // InternalTableDSL.g:18933:3: rule__XCasePart__CaseAssignment_2_1
             {
             pushFollow(FOLLOW_2);
             rule__XCasePart__CaseAssignment_2_1();
@@ -64645,16 +62687,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__0"
-    // InternalTableDSL.g:19563:1: rule__XCasePart__Group_3_0__0 : rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 ;
+    // InternalTableDSL.g:18942:1: rule__XCasePart__Group_3_0__0 : rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 ;
     public final void rule__XCasePart__Group_3_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19567:1: ( rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 )
-            // InternalTableDSL.g:19568:2: rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1
+            // InternalTableDSL.g:18946:1: ( rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 )
+            // InternalTableDSL.g:18947:2: rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XCasePart__Group_3_0__0__Impl();
 
             state._fsp--;
@@ -64683,17 +62725,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__0__Impl"
-    // InternalTableDSL.g:19575:1: rule__XCasePart__Group_3_0__0__Impl : ( ':' ) ;
+    // InternalTableDSL.g:18954:1: rule__XCasePart__Group_3_0__0__Impl : ( ':' ) ;
     public final void rule__XCasePart__Group_3_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19579:1: ( ( ':' ) )
-            // InternalTableDSL.g:19580:1: ( ':' )
+            // InternalTableDSL.g:18958:1: ( ( ':' ) )
+            // InternalTableDSL.g:18959:1: ( ':' )
             {
-            // InternalTableDSL.g:19580:1: ( ':' )
-            // InternalTableDSL.g:19581:2: ':'
+            // InternalTableDSL.g:18959:1: ( ':' )
+            // InternalTableDSL.g:18960:2: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0()); 
@@ -64724,14 +62766,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__1"
-    // InternalTableDSL.g:19590:1: rule__XCasePart__Group_3_0__1 : rule__XCasePart__Group_3_0__1__Impl ;
+    // InternalTableDSL.g:18969:1: rule__XCasePart__Group_3_0__1 : rule__XCasePart__Group_3_0__1__Impl ;
     public final void rule__XCasePart__Group_3_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19594:1: ( rule__XCasePart__Group_3_0__1__Impl )
-            // InternalTableDSL.g:19595:2: rule__XCasePart__Group_3_0__1__Impl
+            // InternalTableDSL.g:18973:1: ( rule__XCasePart__Group_3_0__1__Impl )
+            // InternalTableDSL.g:18974:2: rule__XCasePart__Group_3_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCasePart__Group_3_0__1__Impl();
@@ -64757,23 +62799,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__1__Impl"
-    // InternalTableDSL.g:19601:1: rule__XCasePart__Group_3_0__1__Impl : ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) ;
+    // InternalTableDSL.g:18980:1: rule__XCasePart__Group_3_0__1__Impl : ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) ;
     public final void rule__XCasePart__Group_3_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19605:1: ( ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) )
-            // InternalTableDSL.g:19606:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
+            // InternalTableDSL.g:18984:1: ( ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) )
+            // InternalTableDSL.g:18985:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
             {
-            // InternalTableDSL.g:19606:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
-            // InternalTableDSL.g:19607:2: ( rule__XCasePart__ThenAssignment_3_0_1 )
+            // InternalTableDSL.g:18985:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
+            // InternalTableDSL.g:18986:2: ( rule__XCasePart__ThenAssignment_3_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getThenAssignment_3_0_1()); 
             }
-            // InternalTableDSL.g:19608:2: ( rule__XCasePart__ThenAssignment_3_0_1 )
-            // InternalTableDSL.g:19608:3: rule__XCasePart__ThenAssignment_3_0_1
+            // InternalTableDSL.g:18987:2: ( rule__XCasePart__ThenAssignment_3_0_1 )
+            // InternalTableDSL.g:18987:3: rule__XCasePart__ThenAssignment_3_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XCasePart__ThenAssignment_3_0_1();
@@ -64808,16 +62850,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__0"
-    // InternalTableDSL.g:19617:1: rule__XForLoopExpression__Group__0 : rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 ;
+    // InternalTableDSL.g:18996:1: rule__XForLoopExpression__Group__0 : rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 ;
     public final void rule__XForLoopExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19621:1: ( rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 )
-            // InternalTableDSL.g:19622:2: rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1
+            // InternalTableDSL.g:19000:1: ( rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 )
+            // InternalTableDSL.g:19001:2: rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XForLoopExpression__Group__0__Impl();
 
             state._fsp--;
@@ -64846,23 +62888,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__0__Impl"
-    // InternalTableDSL.g:19629:1: rule__XForLoopExpression__Group__0__Impl : ( ( rule__XForLoopExpression__Group_0__0 ) ) ;
+    // InternalTableDSL.g:19008:1: rule__XForLoopExpression__Group__0__Impl : ( ( rule__XForLoopExpression__Group_0__0 ) ) ;
     public final void rule__XForLoopExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19633:1: ( ( ( rule__XForLoopExpression__Group_0__0 ) ) )
-            // InternalTableDSL.g:19634:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
+            // InternalTableDSL.g:19012:1: ( ( ( rule__XForLoopExpression__Group_0__0 ) ) )
+            // InternalTableDSL.g:19013:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
             {
-            // InternalTableDSL.g:19634:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
-            // InternalTableDSL.g:19635:2: ( rule__XForLoopExpression__Group_0__0 )
+            // InternalTableDSL.g:19013:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
+            // InternalTableDSL.g:19014:2: ( rule__XForLoopExpression__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup_0()); 
             }
-            // InternalTableDSL.g:19636:2: ( rule__XForLoopExpression__Group_0__0 )
-            // InternalTableDSL.g:19636:3: rule__XForLoopExpression__Group_0__0
+            // InternalTableDSL.g:19015:2: ( rule__XForLoopExpression__Group_0__0 )
+            // InternalTableDSL.g:19015:3: rule__XForLoopExpression__Group_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0__0();
@@ -64897,16 +62939,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__1"
-    // InternalTableDSL.g:19644:1: rule__XForLoopExpression__Group__1 : rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 ;
+    // InternalTableDSL.g:19023:1: rule__XForLoopExpression__Group__1 : rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 ;
     public final void rule__XForLoopExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19648:1: ( rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 )
-            // InternalTableDSL.g:19649:2: rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2
+            // InternalTableDSL.g:19027:1: ( rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 )
+            // InternalTableDSL.g:19028:2: rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2
             {
-            pushFollow(FOLLOW_145);
+            pushFollow(FOLLOW_144);
             rule__XForLoopExpression__Group__1__Impl();
 
             state._fsp--;
@@ -64935,23 +62977,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__1__Impl"
-    // InternalTableDSL.g:19656:1: rule__XForLoopExpression__Group__1__Impl : ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) ;
+    // InternalTableDSL.g:19035:1: rule__XForLoopExpression__Group__1__Impl : ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) ;
     public final void rule__XForLoopExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19660:1: ( ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) )
-            // InternalTableDSL.g:19661:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
+            // InternalTableDSL.g:19039:1: ( ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) )
+            // InternalTableDSL.g:19040:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
             {
-            // InternalTableDSL.g:19661:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
-            // InternalTableDSL.g:19662:2: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
+            // InternalTableDSL.g:19040:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
+            // InternalTableDSL.g:19041:2: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForExpressionAssignment_1()); 
             }
-            // InternalTableDSL.g:19663:2: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
-            // InternalTableDSL.g:19663:3: rule__XForLoopExpression__ForExpressionAssignment_1
+            // InternalTableDSL.g:19042:2: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
+            // InternalTableDSL.g:19042:3: rule__XForLoopExpression__ForExpressionAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__ForExpressionAssignment_1();
@@ -64986,16 +63028,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__2"
-    // InternalTableDSL.g:19671:1: rule__XForLoopExpression__Group__2 : rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 ;
+    // InternalTableDSL.g:19050:1: rule__XForLoopExpression__Group__2 : rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 ;
     public final void rule__XForLoopExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19675:1: ( rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 )
-            // InternalTableDSL.g:19676:2: rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3
+            // InternalTableDSL.g:19054:1: ( rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 )
+            // InternalTableDSL.g:19055:2: rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XForLoopExpression__Group__2__Impl();
 
             state._fsp--;
@@ -65024,17 +63066,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__2__Impl"
-    // InternalTableDSL.g:19683:1: rule__XForLoopExpression__Group__2__Impl : ( ')' ) ;
+    // InternalTableDSL.g:19062:1: rule__XForLoopExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XForLoopExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19687:1: ( ( ')' ) )
-            // InternalTableDSL.g:19688:1: ( ')' )
+            // InternalTableDSL.g:19066:1: ( ( ')' ) )
+            // InternalTableDSL.g:19067:1: ( ')' )
             {
-            // InternalTableDSL.g:19688:1: ( ')' )
-            // InternalTableDSL.g:19689:2: ')'
+            // InternalTableDSL.g:19067:1: ( ')' )
+            // InternalTableDSL.g:19068:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2()); 
@@ -65065,14 +63107,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__3"
-    // InternalTableDSL.g:19698:1: rule__XForLoopExpression__Group__3 : rule__XForLoopExpression__Group__3__Impl ;
+    // InternalTableDSL.g:19077:1: rule__XForLoopExpression__Group__3 : rule__XForLoopExpression__Group__3__Impl ;
     public final void rule__XForLoopExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19702:1: ( rule__XForLoopExpression__Group__3__Impl )
-            // InternalTableDSL.g:19703:2: rule__XForLoopExpression__Group__3__Impl
+            // InternalTableDSL.g:19081:1: ( rule__XForLoopExpression__Group__3__Impl )
+            // InternalTableDSL.g:19082:2: rule__XForLoopExpression__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__3__Impl();
@@ -65098,23 +63140,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__3__Impl"
-    // InternalTableDSL.g:19709:1: rule__XForLoopExpression__Group__3__Impl : ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) ;
+    // InternalTableDSL.g:19088:1: rule__XForLoopExpression__Group__3__Impl : ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) ;
     public final void rule__XForLoopExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19713:1: ( ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) )
-            // InternalTableDSL.g:19714:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
+            // InternalTableDSL.g:19092:1: ( ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) )
+            // InternalTableDSL.g:19093:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
             {
-            // InternalTableDSL.g:19714:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
-            // InternalTableDSL.g:19715:2: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
+            // InternalTableDSL.g:19093:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
+            // InternalTableDSL.g:19094:2: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getEachExpressionAssignment_3()); 
             }
-            // InternalTableDSL.g:19716:2: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
-            // InternalTableDSL.g:19716:3: rule__XForLoopExpression__EachExpressionAssignment_3
+            // InternalTableDSL.g:19095:2: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
+            // InternalTableDSL.g:19095:3: rule__XForLoopExpression__EachExpressionAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__EachExpressionAssignment_3();
@@ -65149,14 +63191,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0__0"
-    // InternalTableDSL.g:19725:1: rule__XForLoopExpression__Group_0__0 : rule__XForLoopExpression__Group_0__0__Impl ;
+    // InternalTableDSL.g:19104:1: rule__XForLoopExpression__Group_0__0 : rule__XForLoopExpression__Group_0__0__Impl ;
     public final void rule__XForLoopExpression__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19729:1: ( rule__XForLoopExpression__Group_0__0__Impl )
-            // InternalTableDSL.g:19730:2: rule__XForLoopExpression__Group_0__0__Impl
+            // InternalTableDSL.g:19108:1: ( rule__XForLoopExpression__Group_0__0__Impl )
+            // InternalTableDSL.g:19109:2: rule__XForLoopExpression__Group_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0__0__Impl();
@@ -65182,23 +63224,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0__0__Impl"
-    // InternalTableDSL.g:19736:1: rule__XForLoopExpression__Group_0__0__Impl : ( ( rule__XForLoopExpression__Group_0_0__0 ) ) ;
+    // InternalTableDSL.g:19115:1: rule__XForLoopExpression__Group_0__0__Impl : ( ( rule__XForLoopExpression__Group_0_0__0 ) ) ;
     public final void rule__XForLoopExpression__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19740:1: ( ( ( rule__XForLoopExpression__Group_0_0__0 ) ) )
-            // InternalTableDSL.g:19741:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
+            // InternalTableDSL.g:19119:1: ( ( ( rule__XForLoopExpression__Group_0_0__0 ) ) )
+            // InternalTableDSL.g:19120:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
             {
-            // InternalTableDSL.g:19741:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
-            // InternalTableDSL.g:19742:2: ( rule__XForLoopExpression__Group_0_0__0 )
+            // InternalTableDSL.g:19120:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
+            // InternalTableDSL.g:19121:2: ( rule__XForLoopExpression__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup_0_0()); 
             }
-            // InternalTableDSL.g:19743:2: ( rule__XForLoopExpression__Group_0_0__0 )
-            // InternalTableDSL.g:19743:3: rule__XForLoopExpression__Group_0_0__0
+            // InternalTableDSL.g:19122:2: ( rule__XForLoopExpression__Group_0_0__0 )
+            // InternalTableDSL.g:19122:3: rule__XForLoopExpression__Group_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__0();
@@ -65233,16 +63275,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__0"
-    // InternalTableDSL.g:19752:1: rule__XForLoopExpression__Group_0_0__0 : rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 ;
+    // InternalTableDSL.g:19131:1: rule__XForLoopExpression__Group_0_0__0 : rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 ;
     public final void rule__XForLoopExpression__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19756:1: ( rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 )
-            // InternalTableDSL.g:19757:2: rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1
+            // InternalTableDSL.g:19135:1: ( rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 )
+            // InternalTableDSL.g:19136:2: rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1
             {
-            pushFollow(FOLLOW_154);
+            pushFollow(FOLLOW_153);
             rule__XForLoopExpression__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -65271,23 +63313,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__0__Impl"
-    // InternalTableDSL.g:19764:1: rule__XForLoopExpression__Group_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:19143:1: rule__XForLoopExpression__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XForLoopExpression__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19768:1: ( ( () ) )
-            // InternalTableDSL.g:19769:1: ( () )
+            // InternalTableDSL.g:19147:1: ( ( () ) )
+            // InternalTableDSL.g:19148:1: ( () )
             {
-            // InternalTableDSL.g:19769:1: ( () )
-            // InternalTableDSL.g:19770:2: ()
+            // InternalTableDSL.g:19148:1: ( () )
+            // InternalTableDSL.g:19149:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getXForLoopExpressionAction_0_0_0()); 
             }
-            // InternalTableDSL.g:19771:2: ()
-            // InternalTableDSL.g:19771:3: 
+            // InternalTableDSL.g:19150:2: ()
+            // InternalTableDSL.g:19150:3: 
             {
             }
 
@@ -65312,16 +63354,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__1"
-    // InternalTableDSL.g:19779:1: rule__XForLoopExpression__Group_0_0__1 : rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 ;
+    // InternalTableDSL.g:19158:1: rule__XForLoopExpression__Group_0_0__1 : rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 ;
     public final void rule__XForLoopExpression__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19783:1: ( rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 )
-            // InternalTableDSL.g:19784:2: rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2
+            // InternalTableDSL.g:19162:1: ( rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 )
+            // InternalTableDSL.g:19163:2: rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2
             {
-            pushFollow(FOLLOW_96);
+            pushFollow(FOLLOW_95);
             rule__XForLoopExpression__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -65350,17 +63392,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__1__Impl"
-    // InternalTableDSL.g:19791:1: rule__XForLoopExpression__Group_0_0__1__Impl : ( 'for' ) ;
+    // InternalTableDSL.g:19170:1: rule__XForLoopExpression__Group_0_0__1__Impl : ( 'for' ) ;
     public final void rule__XForLoopExpression__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19795:1: ( ( 'for' ) )
-            // InternalTableDSL.g:19796:1: ( 'for' )
+            // InternalTableDSL.g:19174:1: ( ( 'for' ) )
+            // InternalTableDSL.g:19175:1: ( 'for' )
             {
-            // InternalTableDSL.g:19796:1: ( 'for' )
-            // InternalTableDSL.g:19797:2: 'for'
+            // InternalTableDSL.g:19175:1: ( 'for' )
+            // InternalTableDSL.g:19176:2: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1()); 
@@ -65391,16 +63433,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__2"
-    // InternalTableDSL.g:19806:1: rule__XForLoopExpression__Group_0_0__2 : rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 ;
+    // InternalTableDSL.g:19185:1: rule__XForLoopExpression__Group_0_0__2 : rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 ;
     public final void rule__XForLoopExpression__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19810:1: ( rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 )
-            // InternalTableDSL.g:19811:2: rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3
+            // InternalTableDSL.g:19189:1: ( rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 )
+            // InternalTableDSL.g:19190:2: rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__XForLoopExpression__Group_0_0__2__Impl();
 
             state._fsp--;
@@ -65429,17 +63471,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__2__Impl"
-    // InternalTableDSL.g:19818:1: rule__XForLoopExpression__Group_0_0__2__Impl : ( '(' ) ;
+    // InternalTableDSL.g:19197:1: rule__XForLoopExpression__Group_0_0__2__Impl : ( '(' ) ;
     public final void rule__XForLoopExpression__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19822:1: ( ( '(' ) )
-            // InternalTableDSL.g:19823:1: ( '(' )
+            // InternalTableDSL.g:19201:1: ( ( '(' ) )
+            // InternalTableDSL.g:19202:1: ( '(' )
             {
-            // InternalTableDSL.g:19823:1: ( '(' )
-            // InternalTableDSL.g:19824:2: '('
+            // InternalTableDSL.g:19202:1: ( '(' )
+            // InternalTableDSL.g:19203:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
@@ -65470,16 +63512,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__3"
-    // InternalTableDSL.g:19833:1: rule__XForLoopExpression__Group_0_0__3 : rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 ;
+    // InternalTableDSL.g:19212:1: rule__XForLoopExpression__Group_0_0__3 : rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 ;
     public final void rule__XForLoopExpression__Group_0_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19837:1: ( rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 )
-            // InternalTableDSL.g:19838:2: rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4
+            // InternalTableDSL.g:19216:1: ( rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 )
+            // InternalTableDSL.g:19217:2: rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4
             {
-            pushFollow(FOLLOW_152);
+            pushFollow(FOLLOW_151);
             rule__XForLoopExpression__Group_0_0__3__Impl();
 
             state._fsp--;
@@ -65508,23 +63550,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__3__Impl"
-    // InternalTableDSL.g:19845:1: rule__XForLoopExpression__Group_0_0__3__Impl : ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) ;
+    // InternalTableDSL.g:19224:1: rule__XForLoopExpression__Group_0_0__3__Impl : ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) ;
     public final void rule__XForLoopExpression__Group_0_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19849:1: ( ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) )
-            // InternalTableDSL.g:19850:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
+            // InternalTableDSL.g:19228:1: ( ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) )
+            // InternalTableDSL.g:19229:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
             {
-            // InternalTableDSL.g:19850:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
-            // InternalTableDSL.g:19851:2: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
+            // InternalTableDSL.g:19229:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
+            // InternalTableDSL.g:19230:2: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamAssignment_0_0_3()); 
             }
-            // InternalTableDSL.g:19852:2: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
-            // InternalTableDSL.g:19852:3: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3
+            // InternalTableDSL.g:19231:2: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
+            // InternalTableDSL.g:19231:3: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__DeclaredParamAssignment_0_0_3();
@@ -65559,14 +63601,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__4"
-    // InternalTableDSL.g:19860:1: rule__XForLoopExpression__Group_0_0__4 : rule__XForLoopExpression__Group_0_0__4__Impl ;
+    // InternalTableDSL.g:19239:1: rule__XForLoopExpression__Group_0_0__4 : rule__XForLoopExpression__Group_0_0__4__Impl ;
     public final void rule__XForLoopExpression__Group_0_0__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19864:1: ( rule__XForLoopExpression__Group_0_0__4__Impl )
-            // InternalTableDSL.g:19865:2: rule__XForLoopExpression__Group_0_0__4__Impl
+            // InternalTableDSL.g:19243:1: ( rule__XForLoopExpression__Group_0_0__4__Impl )
+            // InternalTableDSL.g:19244:2: rule__XForLoopExpression__Group_0_0__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__4__Impl();
@@ -65592,17 +63634,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__4__Impl"
-    // InternalTableDSL.g:19871:1: rule__XForLoopExpression__Group_0_0__4__Impl : ( ':' ) ;
+    // InternalTableDSL.g:19250:1: rule__XForLoopExpression__Group_0_0__4__Impl : ( ':' ) ;
     public final void rule__XForLoopExpression__Group_0_0__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19875:1: ( ( ':' ) )
-            // InternalTableDSL.g:19876:1: ( ':' )
+            // InternalTableDSL.g:19254:1: ( ( ':' ) )
+            // InternalTableDSL.g:19255:1: ( ':' )
             {
-            // InternalTableDSL.g:19876:1: ( ':' )
-            // InternalTableDSL.g:19877:2: ':'
+            // InternalTableDSL.g:19255:1: ( ':' )
+            // InternalTableDSL.g:19256:2: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4()); 
@@ -65633,16 +63675,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__0"
-    // InternalTableDSL.g:19887:1: rule__XBasicForLoopExpression__Group__0 : rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 ;
+    // InternalTableDSL.g:19266:1: rule__XBasicForLoopExpression__Group__0 : rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 ;
     public final void rule__XBasicForLoopExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19891:1: ( rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 )
-            // InternalTableDSL.g:19892:2: rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1
+            // InternalTableDSL.g:19270:1: ( rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 )
+            // InternalTableDSL.g:19271:2: rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1
             {
-            pushFollow(FOLLOW_154);
+            pushFollow(FOLLOW_153);
             rule__XBasicForLoopExpression__Group__0__Impl();
 
             state._fsp--;
@@ -65671,23 +63713,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__0__Impl"
-    // InternalTableDSL.g:19899:1: rule__XBasicForLoopExpression__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:19278:1: rule__XBasicForLoopExpression__Group__0__Impl : ( () ) ;
     public final void rule__XBasicForLoopExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19903:1: ( ( () ) )
-            // InternalTableDSL.g:19904:1: ( () )
+            // InternalTableDSL.g:19282:1: ( ( () ) )
+            // InternalTableDSL.g:19283:1: ( () )
             {
-            // InternalTableDSL.g:19904:1: ( () )
-            // InternalTableDSL.g:19905:2: ()
+            // InternalTableDSL.g:19283:1: ( () )
+            // InternalTableDSL.g:19284:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getXBasicForLoopExpressionAction_0()); 
             }
-            // InternalTableDSL.g:19906:2: ()
-            // InternalTableDSL.g:19906:3: 
+            // InternalTableDSL.g:19285:2: ()
+            // InternalTableDSL.g:19285:3: 
             {
             }
 
@@ -65712,16 +63754,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__1"
-    // InternalTableDSL.g:19914:1: rule__XBasicForLoopExpression__Group__1 : rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 ;
+    // InternalTableDSL.g:19293:1: rule__XBasicForLoopExpression__Group__1 : rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 ;
     public final void rule__XBasicForLoopExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19918:1: ( rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 )
-            // InternalTableDSL.g:19919:2: rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2
+            // InternalTableDSL.g:19297:1: ( rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 )
+            // InternalTableDSL.g:19298:2: rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2
             {
-            pushFollow(FOLLOW_96);
+            pushFollow(FOLLOW_95);
             rule__XBasicForLoopExpression__Group__1__Impl();
 
             state._fsp--;
@@ -65750,17 +63792,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__1__Impl"
-    // InternalTableDSL.g:19926:1: rule__XBasicForLoopExpression__Group__1__Impl : ( 'for' ) ;
+    // InternalTableDSL.g:19305:1: rule__XBasicForLoopExpression__Group__1__Impl : ( 'for' ) ;
     public final void rule__XBasicForLoopExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19930:1: ( ( 'for' ) )
-            // InternalTableDSL.g:19931:1: ( 'for' )
+            // InternalTableDSL.g:19309:1: ( ( 'for' ) )
+            // InternalTableDSL.g:19310:1: ( 'for' )
             {
-            // InternalTableDSL.g:19931:1: ( 'for' )
-            // InternalTableDSL.g:19932:2: 'for'
+            // InternalTableDSL.g:19310:1: ( 'for' )
+            // InternalTableDSL.g:19311:2: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1()); 
@@ -65791,16 +63833,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__2"
-    // InternalTableDSL.g:19941:1: rule__XBasicForLoopExpression__Group__2 : rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 ;
+    // InternalTableDSL.g:19320:1: rule__XBasicForLoopExpression__Group__2 : rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 ;
     public final void rule__XBasicForLoopExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19945:1: ( rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 )
-            // InternalTableDSL.g:19946:2: rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3
+            // InternalTableDSL.g:19324:1: ( rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 )
+            // InternalTableDSL.g:19325:2: rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3
             {
-            pushFollow(FOLLOW_155);
+            pushFollow(FOLLOW_154);
             rule__XBasicForLoopExpression__Group__2__Impl();
 
             state._fsp--;
@@ -65829,17 +63871,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__2__Impl"
-    // InternalTableDSL.g:19953:1: rule__XBasicForLoopExpression__Group__2__Impl : ( '(' ) ;
+    // InternalTableDSL.g:19332:1: rule__XBasicForLoopExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XBasicForLoopExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19957:1: ( ( '(' ) )
-            // InternalTableDSL.g:19958:1: ( '(' )
+            // InternalTableDSL.g:19336:1: ( ( '(' ) )
+            // InternalTableDSL.g:19337:1: ( '(' )
             {
-            // InternalTableDSL.g:19958:1: ( '(' )
-            // InternalTableDSL.g:19959:2: '('
+            // InternalTableDSL.g:19337:1: ( '(' )
+            // InternalTableDSL.g:19338:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2()); 
@@ -65870,16 +63912,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__3"
-    // InternalTableDSL.g:19968:1: rule__XBasicForLoopExpression__Group__3 : rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 ;
+    // InternalTableDSL.g:19347:1: rule__XBasicForLoopExpression__Group__3 : rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 ;
     public final void rule__XBasicForLoopExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19972:1: ( rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 )
-            // InternalTableDSL.g:19973:2: rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4
+            // InternalTableDSL.g:19351:1: ( rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 )
+            // InternalTableDSL.g:19352:2: rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4
             {
-            pushFollow(FOLLOW_155);
+            pushFollow(FOLLOW_154);
             rule__XBasicForLoopExpression__Group__3__Impl();
 
             state._fsp--;
@@ -65908,31 +63950,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__3__Impl"
-    // InternalTableDSL.g:19980:1: rule__XBasicForLoopExpression__Group__3__Impl : ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) ;
+    // InternalTableDSL.g:19359:1: rule__XBasicForLoopExpression__Group__3__Impl : ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19984:1: ( ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) )
-            // InternalTableDSL.g:19985:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
+            // InternalTableDSL.g:19363:1: ( ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) )
+            // InternalTableDSL.g:19364:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
             {
-            // InternalTableDSL.g:19985:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
-            // InternalTableDSL.g:19986:2: ( rule__XBasicForLoopExpression__Group_3__0 )?
+            // InternalTableDSL.g:19364:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
+            // InternalTableDSL.g:19365:2: ( rule__XBasicForLoopExpression__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_3()); 
             }
-            // InternalTableDSL.g:19987:2: ( rule__XBasicForLoopExpression__Group_3__0 )?
-            int alt136=2;
-            int LA136_0 = input.LA(1);
+            // InternalTableDSL.g:19366:2: ( rule__XBasicForLoopExpression__Group_3__0 )?
+            int alt134=2;
+            int LA134_0 = input.LA(1);
 
-            if ( ((LA136_0>=RULE_STRING && LA136_0<=RULE_DECIMAL)||(LA136_0>=19 && LA136_0<=20)||LA136_0==32||LA136_0==43||(LA136_0>=47 && LA136_0<=53)||LA136_0==75||LA136_0==135||(LA136_0>=139 && LA136_0<=140)||LA136_0==142||LA136_0==144||(LA136_0>=147 && LA136_0<=155)||LA136_0==157||(LA136_0>=183 && LA136_0<=184)) ) {
-                alt136=1;
+            if ( ((LA134_0>=RULE_STRING && LA134_0<=RULE_DECIMAL)||(LA134_0>=19 && LA134_0<=20)||LA134_0==32||LA134_0==43||(LA134_0>=47 && LA134_0<=53)||LA134_0==75||LA134_0==135||(LA134_0>=139 && LA134_0<=140)||LA134_0==142||LA134_0==144||(LA134_0>=147 && LA134_0<=155)||LA134_0==157||(LA134_0>=180 && LA134_0<=181)) ) {
+                alt134=1;
             }
-            switch (alt136) {
+            switch (alt134) {
                 case 1 :
-                    // InternalTableDSL.g:19987:3: rule__XBasicForLoopExpression__Group_3__0
+                    // InternalTableDSL.g:19366:3: rule__XBasicForLoopExpression__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XBasicForLoopExpression__Group_3__0();
@@ -65970,16 +64012,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__4"
-    // InternalTableDSL.g:19995:1: rule__XBasicForLoopExpression__Group__4 : rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 ;
+    // InternalTableDSL.g:19374:1: rule__XBasicForLoopExpression__Group__4 : rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 ;
     public final void rule__XBasicForLoopExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:19999:1: ( rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 )
-            // InternalTableDSL.g:20000:2: rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5
+            // InternalTableDSL.g:19378:1: ( rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 )
+            // InternalTableDSL.g:19379:2: rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5
             {
-            pushFollow(FOLLOW_156);
+            pushFollow(FOLLOW_155);
             rule__XBasicForLoopExpression__Group__4__Impl();
 
             state._fsp--;
@@ -66008,17 +64050,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__4__Impl"
-    // InternalTableDSL.g:20007:1: rule__XBasicForLoopExpression__Group__4__Impl : ( ';' ) ;
+    // InternalTableDSL.g:19386:1: rule__XBasicForLoopExpression__Group__4__Impl : ( ';' ) ;
     public final void rule__XBasicForLoopExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20011:1: ( ( ';' ) )
-            // InternalTableDSL.g:20012:1: ( ';' )
+            // InternalTableDSL.g:19390:1: ( ( ';' ) )
+            // InternalTableDSL.g:19391:1: ( ';' )
             {
-            // InternalTableDSL.g:20012:1: ( ';' )
-            // InternalTableDSL.g:20013:2: ';'
+            // InternalTableDSL.g:19391:1: ( ';' )
+            // InternalTableDSL.g:19392:2: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4()); 
@@ -66049,16 +64091,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__5"
-    // InternalTableDSL.g:20022:1: rule__XBasicForLoopExpression__Group__5 : rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 ;
+    // InternalTableDSL.g:19401:1: rule__XBasicForLoopExpression__Group__5 : rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 ;
     public final void rule__XBasicForLoopExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20026:1: ( rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 )
-            // InternalTableDSL.g:20027:2: rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6
+            // InternalTableDSL.g:19405:1: ( rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 )
+            // InternalTableDSL.g:19406:2: rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6
             {
-            pushFollow(FOLLOW_156);
+            pushFollow(FOLLOW_155);
             rule__XBasicForLoopExpression__Group__5__Impl();
 
             state._fsp--;
@@ -66087,31 +64129,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__5__Impl"
-    // InternalTableDSL.g:20034:1: rule__XBasicForLoopExpression__Group__5__Impl : ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) ;
+    // InternalTableDSL.g:19413:1: rule__XBasicForLoopExpression__Group__5__Impl : ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20038:1: ( ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) )
-            // InternalTableDSL.g:20039:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
+            // InternalTableDSL.g:19417:1: ( ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) )
+            // InternalTableDSL.g:19418:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
             {
-            // InternalTableDSL.g:20039:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
-            // InternalTableDSL.g:20040:2: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
+            // InternalTableDSL.g:19418:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
+            // InternalTableDSL.g:19419:2: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionAssignment_5()); 
             }
-            // InternalTableDSL.g:20041:2: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
-            int alt137=2;
-            int LA137_0 = input.LA(1);
+            // InternalTableDSL.g:19420:2: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
+            int alt135=2;
+            int LA135_0 = input.LA(1);
 
-            if ( ((LA137_0>=RULE_STRING && LA137_0<=RULE_DECIMAL)||(LA137_0>=19 && LA137_0<=20)||LA137_0==32||LA137_0==43||(LA137_0>=48 && LA137_0<=53)||LA137_0==75||LA137_0==135||(LA137_0>=139 && LA137_0<=140)||LA137_0==142||LA137_0==144||(LA137_0>=147 && LA137_0<=155)||LA137_0==157||LA137_0==184) ) {
-                alt137=1;
+            if ( ((LA135_0>=RULE_STRING && LA135_0<=RULE_DECIMAL)||(LA135_0>=19 && LA135_0<=20)||LA135_0==32||LA135_0==43||(LA135_0>=48 && LA135_0<=53)||LA135_0==75||LA135_0==135||(LA135_0>=139 && LA135_0<=140)||LA135_0==142||LA135_0==144||(LA135_0>=147 && LA135_0<=155)||LA135_0==157||LA135_0==181) ) {
+                alt135=1;
             }
-            switch (alt137) {
+            switch (alt135) {
                 case 1 :
-                    // InternalTableDSL.g:20041:3: rule__XBasicForLoopExpression__ExpressionAssignment_5
+                    // InternalTableDSL.g:19420:3: rule__XBasicForLoopExpression__ExpressionAssignment_5
                     {
                     pushFollow(FOLLOW_2);
                     rule__XBasicForLoopExpression__ExpressionAssignment_5();
@@ -66149,16 +64191,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__6"
-    // InternalTableDSL.g:20049:1: rule__XBasicForLoopExpression__Group__6 : rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 ;
+    // InternalTableDSL.g:19428:1: rule__XBasicForLoopExpression__Group__6 : rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 ;
     public final void rule__XBasicForLoopExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20053:1: ( rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 )
-            // InternalTableDSL.g:20054:2: rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7
+            // InternalTableDSL.g:19432:1: ( rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 )
+            // InternalTableDSL.g:19433:2: rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7
             {
-            pushFollow(FOLLOW_97);
+            pushFollow(FOLLOW_96);
             rule__XBasicForLoopExpression__Group__6__Impl();
 
             state._fsp--;
@@ -66187,17 +64229,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__6__Impl"
-    // InternalTableDSL.g:20061:1: rule__XBasicForLoopExpression__Group__6__Impl : ( ';' ) ;
+    // InternalTableDSL.g:19440:1: rule__XBasicForLoopExpression__Group__6__Impl : ( ';' ) ;
     public final void rule__XBasicForLoopExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20065:1: ( ( ';' ) )
-            // InternalTableDSL.g:20066:1: ( ';' )
+            // InternalTableDSL.g:19444:1: ( ( ';' ) )
+            // InternalTableDSL.g:19445:1: ( ';' )
             {
-            // InternalTableDSL.g:20066:1: ( ';' )
-            // InternalTableDSL.g:20067:2: ';'
+            // InternalTableDSL.g:19445:1: ( ';' )
+            // InternalTableDSL.g:19446:2: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6()); 
@@ -66228,16 +64270,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__7"
-    // InternalTableDSL.g:20076:1: rule__XBasicForLoopExpression__Group__7 : rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 ;
+    // InternalTableDSL.g:19455:1: rule__XBasicForLoopExpression__Group__7 : rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 ;
     public final void rule__XBasicForLoopExpression__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20080:1: ( rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 )
-            // InternalTableDSL.g:20081:2: rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8
+            // InternalTableDSL.g:19459:1: ( rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 )
+            // InternalTableDSL.g:19460:2: rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8
             {
-            pushFollow(FOLLOW_97);
+            pushFollow(FOLLOW_96);
             rule__XBasicForLoopExpression__Group__7__Impl();
 
             state._fsp--;
@@ -66266,31 +64308,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__7__Impl"
-    // InternalTableDSL.g:20088:1: rule__XBasicForLoopExpression__Group__7__Impl : ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) ;
+    // InternalTableDSL.g:19467:1: rule__XBasicForLoopExpression__Group__7__Impl : ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20092:1: ( ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) )
-            // InternalTableDSL.g:20093:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
+            // InternalTableDSL.g:19471:1: ( ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) )
+            // InternalTableDSL.g:19472:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
             {
-            // InternalTableDSL.g:20093:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
-            // InternalTableDSL.g:20094:2: ( rule__XBasicForLoopExpression__Group_7__0 )?
+            // InternalTableDSL.g:19472:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
+            // InternalTableDSL.g:19473:2: ( rule__XBasicForLoopExpression__Group_7__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_7()); 
             }
-            // InternalTableDSL.g:20095:2: ( rule__XBasicForLoopExpression__Group_7__0 )?
-            int alt138=2;
-            int LA138_0 = input.LA(1);
+            // InternalTableDSL.g:19474:2: ( rule__XBasicForLoopExpression__Group_7__0 )?
+            int alt136=2;
+            int LA136_0 = input.LA(1);
 
-            if ( ((LA138_0>=RULE_STRING && LA138_0<=RULE_DECIMAL)||(LA138_0>=19 && LA138_0<=20)||LA138_0==32||LA138_0==43||(LA138_0>=48 && LA138_0<=53)||LA138_0==75||LA138_0==135||(LA138_0>=139 && LA138_0<=140)||LA138_0==142||LA138_0==144||(LA138_0>=147 && LA138_0<=155)||LA138_0==157||LA138_0==184) ) {
-                alt138=1;
+            if ( ((LA136_0>=RULE_STRING && LA136_0<=RULE_DECIMAL)||(LA136_0>=19 && LA136_0<=20)||LA136_0==32||LA136_0==43||(LA136_0>=48 && LA136_0<=53)||LA136_0==75||LA136_0==135||(LA136_0>=139 && LA136_0<=140)||LA136_0==142||LA136_0==144||(LA136_0>=147 && LA136_0<=155)||LA136_0==157||LA136_0==181) ) {
+                alt136=1;
             }
-            switch (alt138) {
+            switch (alt136) {
                 case 1 :
-                    // InternalTableDSL.g:20095:3: rule__XBasicForLoopExpression__Group_7__0
+                    // InternalTableDSL.g:19474:3: rule__XBasicForLoopExpression__Group_7__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XBasicForLoopExpression__Group_7__0();
@@ -66328,16 +64370,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__8"
-    // InternalTableDSL.g:20103:1: rule__XBasicForLoopExpression__Group__8 : rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 ;
+    // InternalTableDSL.g:19482:1: rule__XBasicForLoopExpression__Group__8 : rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 ;
     public final void rule__XBasicForLoopExpression__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20107:1: ( rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 )
-            // InternalTableDSL.g:20108:2: rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9
+            // InternalTableDSL.g:19486:1: ( rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 )
+            // InternalTableDSL.g:19487:2: rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XBasicForLoopExpression__Group__8__Impl();
 
             state._fsp--;
@@ -66366,17 +64408,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__8__Impl"
-    // InternalTableDSL.g:20115:1: rule__XBasicForLoopExpression__Group__8__Impl : ( ')' ) ;
+    // InternalTableDSL.g:19494:1: rule__XBasicForLoopExpression__Group__8__Impl : ( ')' ) ;
     public final void rule__XBasicForLoopExpression__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20119:1: ( ( ')' ) )
-            // InternalTableDSL.g:20120:1: ( ')' )
+            // InternalTableDSL.g:19498:1: ( ( ')' ) )
+            // InternalTableDSL.g:19499:1: ( ')' )
             {
-            // InternalTableDSL.g:20120:1: ( ')' )
-            // InternalTableDSL.g:20121:2: ')'
+            // InternalTableDSL.g:19499:1: ( ')' )
+            // InternalTableDSL.g:19500:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8()); 
@@ -66407,14 +64449,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__9"
-    // InternalTableDSL.g:20130:1: rule__XBasicForLoopExpression__Group__9 : rule__XBasicForLoopExpression__Group__9__Impl ;
+    // InternalTableDSL.g:19509:1: rule__XBasicForLoopExpression__Group__9 : rule__XBasicForLoopExpression__Group__9__Impl ;
     public final void rule__XBasicForLoopExpression__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20134:1: ( rule__XBasicForLoopExpression__Group__9__Impl )
-            // InternalTableDSL.g:20135:2: rule__XBasicForLoopExpression__Group__9__Impl
+            // InternalTableDSL.g:19513:1: ( rule__XBasicForLoopExpression__Group__9__Impl )
+            // InternalTableDSL.g:19514:2: rule__XBasicForLoopExpression__Group__9__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__9__Impl();
@@ -66440,23 +64482,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__9__Impl"
-    // InternalTableDSL.g:20141:1: rule__XBasicForLoopExpression__Group__9__Impl : ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) ;
+    // InternalTableDSL.g:19520:1: rule__XBasicForLoopExpression__Group__9__Impl : ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) ;
     public final void rule__XBasicForLoopExpression__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20145:1: ( ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) )
-            // InternalTableDSL.g:20146:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
+            // InternalTableDSL.g:19524:1: ( ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) )
+            // InternalTableDSL.g:19525:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
             {
-            // InternalTableDSL.g:20146:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
-            // InternalTableDSL.g:20147:2: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
+            // InternalTableDSL.g:19525:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
+            // InternalTableDSL.g:19526:2: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionAssignment_9()); 
             }
-            // InternalTableDSL.g:20148:2: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
-            // InternalTableDSL.g:20148:3: rule__XBasicForLoopExpression__EachExpressionAssignment_9
+            // InternalTableDSL.g:19527:2: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
+            // InternalTableDSL.g:19527:3: rule__XBasicForLoopExpression__EachExpressionAssignment_9
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__EachExpressionAssignment_9();
@@ -66491,16 +64533,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__0"
-    // InternalTableDSL.g:20157:1: rule__XBasicForLoopExpression__Group_3__0 : rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 ;
+    // InternalTableDSL.g:19536:1: rule__XBasicForLoopExpression__Group_3__0 : rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 ;
     public final void rule__XBasicForLoopExpression__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20161:1: ( rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 )
-            // InternalTableDSL.g:20162:2: rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1
+            // InternalTableDSL.g:19540:1: ( rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 )
+            // InternalTableDSL.g:19541:2: rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_97);
             rule__XBasicForLoopExpression__Group_3__0__Impl();
 
             state._fsp--;
@@ -66529,23 +64571,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__0__Impl"
-    // InternalTableDSL.g:20169:1: rule__XBasicForLoopExpression__Group_3__0__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) ;
+    // InternalTableDSL.g:19548:1: rule__XBasicForLoopExpression__Group_3__0__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20173:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) )
-            // InternalTableDSL.g:20174:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
+            // InternalTableDSL.g:19552:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) )
+            // InternalTableDSL.g:19553:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
             {
-            // InternalTableDSL.g:20174:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
-            // InternalTableDSL.g:20175:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
+            // InternalTableDSL.g:19553:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
+            // InternalTableDSL.g:19554:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsAssignment_3_0()); 
             }
-            // InternalTableDSL.g:20176:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
-            // InternalTableDSL.g:20176:3: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0
+            // InternalTableDSL.g:19555:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
+            // InternalTableDSL.g:19555:3: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0();
@@ -66580,14 +64622,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__1"
-    // InternalTableDSL.g:20184:1: rule__XBasicForLoopExpression__Group_3__1 : rule__XBasicForLoopExpression__Group_3__1__Impl ;
+    // InternalTableDSL.g:19563:1: rule__XBasicForLoopExpression__Group_3__1 : rule__XBasicForLoopExpression__Group_3__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20188:1: ( rule__XBasicForLoopExpression__Group_3__1__Impl )
-            // InternalTableDSL.g:20189:2: rule__XBasicForLoopExpression__Group_3__1__Impl
+            // InternalTableDSL.g:19567:1: ( rule__XBasicForLoopExpression__Group_3__1__Impl )
+            // InternalTableDSL.g:19568:2: rule__XBasicForLoopExpression__Group_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3__1__Impl();
@@ -66613,37 +64655,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__1__Impl"
-    // InternalTableDSL.g:20195:1: rule__XBasicForLoopExpression__Group_3__1__Impl : ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) ;
+    // InternalTableDSL.g:19574:1: rule__XBasicForLoopExpression__Group_3__1__Impl : ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) ;
     public final void rule__XBasicForLoopExpression__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20199:1: ( ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) )
-            // InternalTableDSL.g:20200:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
+            // InternalTableDSL.g:19578:1: ( ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) )
+            // InternalTableDSL.g:19579:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
             {
-            // InternalTableDSL.g:20200:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
-            // InternalTableDSL.g:20201:2: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
+            // InternalTableDSL.g:19579:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
+            // InternalTableDSL.g:19580:2: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_3_1()); 
             }
-            // InternalTableDSL.g:20202:2: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
-            loop139:
+            // InternalTableDSL.g:19581:2: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
+            loop137:
             do {
-                int alt139=2;
-                int LA139_0 = input.LA(1);
+                int alt137=2;
+                int LA137_0 = input.LA(1);
 
-                if ( (LA139_0==137) ) {
-                    alt139=1;
+                if ( (LA137_0==137) ) {
+                    alt137=1;
                 }
 
 
-                switch (alt139) {
+                switch (alt137) {
             	case 1 :
-            	    // InternalTableDSL.g:20202:3: rule__XBasicForLoopExpression__Group_3_1__0
+            	    // InternalTableDSL.g:19581:3: rule__XBasicForLoopExpression__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XBasicForLoopExpression__Group_3_1__0();
 
             	    state._fsp--;
@@ -66653,7 +64695,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop139;
+            	    break loop137;
                 }
             } while (true);
 
@@ -66682,16 +64724,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__0"
-    // InternalTableDSL.g:20211:1: rule__XBasicForLoopExpression__Group_3_1__0 : rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 ;
+    // InternalTableDSL.g:19590:1: rule__XBasicForLoopExpression__Group_3_1__0 : rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 ;
     public final void rule__XBasicForLoopExpression__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20215:1: ( rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 )
-            // InternalTableDSL.g:20216:2: rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1
+            // InternalTableDSL.g:19594:1: ( rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 )
+            // InternalTableDSL.g:19595:2: rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1
             {
-            pushFollow(FOLLOW_157);
+            pushFollow(FOLLOW_156);
             rule__XBasicForLoopExpression__Group_3_1__0__Impl();
 
             state._fsp--;
@@ -66720,17 +64762,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__0__Impl"
-    // InternalTableDSL.g:20223:1: rule__XBasicForLoopExpression__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:19602:1: rule__XBasicForLoopExpression__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XBasicForLoopExpression__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20227:1: ( ( ',' ) )
-            // InternalTableDSL.g:20228:1: ( ',' )
+            // InternalTableDSL.g:19606:1: ( ( ',' ) )
+            // InternalTableDSL.g:19607:1: ( ',' )
             {
-            // InternalTableDSL.g:20228:1: ( ',' )
-            // InternalTableDSL.g:20229:2: ','
+            // InternalTableDSL.g:19607:1: ( ',' )
+            // InternalTableDSL.g:19608:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0()); 
@@ -66761,14 +64803,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__1"
-    // InternalTableDSL.g:20238:1: rule__XBasicForLoopExpression__Group_3_1__1 : rule__XBasicForLoopExpression__Group_3_1__1__Impl ;
+    // InternalTableDSL.g:19617:1: rule__XBasicForLoopExpression__Group_3_1__1 : rule__XBasicForLoopExpression__Group_3_1__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20242:1: ( rule__XBasicForLoopExpression__Group_3_1__1__Impl )
-            // InternalTableDSL.g:20243:2: rule__XBasicForLoopExpression__Group_3_1__1__Impl
+            // InternalTableDSL.g:19621:1: ( rule__XBasicForLoopExpression__Group_3_1__1__Impl )
+            // InternalTableDSL.g:19622:2: rule__XBasicForLoopExpression__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3_1__1__Impl();
@@ -66794,23 +64836,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__1__Impl"
-    // InternalTableDSL.g:20249:1: rule__XBasicForLoopExpression__Group_3_1__1__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) ;
+    // InternalTableDSL.g:19628:1: rule__XBasicForLoopExpression__Group_3_1__1__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20253:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) )
-            // InternalTableDSL.g:20254:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
+            // InternalTableDSL.g:19632:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) )
+            // InternalTableDSL.g:19633:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
             {
-            // InternalTableDSL.g:20254:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
-            // InternalTableDSL.g:20255:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
+            // InternalTableDSL.g:19633:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
+            // InternalTableDSL.g:19634:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsAssignment_3_1_1()); 
             }
-            // InternalTableDSL.g:20256:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
-            // InternalTableDSL.g:20256:3: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
+            // InternalTableDSL.g:19635:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
+            // InternalTableDSL.g:19635:3: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1();
@@ -66845,16 +64887,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__0"
-    // InternalTableDSL.g:20265:1: rule__XBasicForLoopExpression__Group_7__0 : rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 ;
+    // InternalTableDSL.g:19644:1: rule__XBasicForLoopExpression__Group_7__0 : rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 ;
     public final void rule__XBasicForLoopExpression__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20269:1: ( rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 )
-            // InternalTableDSL.g:20270:2: rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1
+            // InternalTableDSL.g:19648:1: ( rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 )
+            // InternalTableDSL.g:19649:2: rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_97);
             rule__XBasicForLoopExpression__Group_7__0__Impl();
 
             state._fsp--;
@@ -66883,23 +64925,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__0__Impl"
-    // InternalTableDSL.g:20277:1: rule__XBasicForLoopExpression__Group_7__0__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) ;
+    // InternalTableDSL.g:19656:1: rule__XBasicForLoopExpression__Group_7__0__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20281:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) )
-            // InternalTableDSL.g:20282:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
+            // InternalTableDSL.g:19660:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) )
+            // InternalTableDSL.g:19661:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
             {
-            // InternalTableDSL.g:20282:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
-            // InternalTableDSL.g:20283:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
+            // InternalTableDSL.g:19661:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
+            // InternalTableDSL.g:19662:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsAssignment_7_0()); 
             }
-            // InternalTableDSL.g:20284:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
-            // InternalTableDSL.g:20284:3: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
+            // InternalTableDSL.g:19663:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
+            // InternalTableDSL.g:19663:3: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0();
@@ -66934,14 +64976,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__1"
-    // InternalTableDSL.g:20292:1: rule__XBasicForLoopExpression__Group_7__1 : rule__XBasicForLoopExpression__Group_7__1__Impl ;
+    // InternalTableDSL.g:19671:1: rule__XBasicForLoopExpression__Group_7__1 : rule__XBasicForLoopExpression__Group_7__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20296:1: ( rule__XBasicForLoopExpression__Group_7__1__Impl )
-            // InternalTableDSL.g:20297:2: rule__XBasicForLoopExpression__Group_7__1__Impl
+            // InternalTableDSL.g:19675:1: ( rule__XBasicForLoopExpression__Group_7__1__Impl )
+            // InternalTableDSL.g:19676:2: rule__XBasicForLoopExpression__Group_7__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7__1__Impl();
@@ -66967,37 +65009,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__1__Impl"
-    // InternalTableDSL.g:20303:1: rule__XBasicForLoopExpression__Group_7__1__Impl : ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) ;
+    // InternalTableDSL.g:19682:1: rule__XBasicForLoopExpression__Group_7__1__Impl : ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) ;
     public final void rule__XBasicForLoopExpression__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20307:1: ( ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) )
-            // InternalTableDSL.g:20308:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
+            // InternalTableDSL.g:19686:1: ( ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) )
+            // InternalTableDSL.g:19687:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
             {
-            // InternalTableDSL.g:20308:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
-            // InternalTableDSL.g:20309:2: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
+            // InternalTableDSL.g:19687:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
+            // InternalTableDSL.g:19688:2: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_7_1()); 
             }
-            // InternalTableDSL.g:20310:2: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
-            loop140:
+            // InternalTableDSL.g:19689:2: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
+            loop138:
             do {
-                int alt140=2;
-                int LA140_0 = input.LA(1);
+                int alt138=2;
+                int LA138_0 = input.LA(1);
 
-                if ( (LA140_0==137) ) {
-                    alt140=1;
+                if ( (LA138_0==137) ) {
+                    alt138=1;
                 }
 
 
-                switch (alt140) {
+                switch (alt138) {
             	case 1 :
-            	    // InternalTableDSL.g:20310:3: rule__XBasicForLoopExpression__Group_7_1__0
+            	    // InternalTableDSL.g:19689:3: rule__XBasicForLoopExpression__Group_7_1__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XBasicForLoopExpression__Group_7_1__0();
 
             	    state._fsp--;
@@ -67007,7 +65049,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop140;
+            	    break loop138;
                 }
             } while (true);
 
@@ -67036,16 +65078,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__0"
-    // InternalTableDSL.g:20319:1: rule__XBasicForLoopExpression__Group_7_1__0 : rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 ;
+    // InternalTableDSL.g:19698:1: rule__XBasicForLoopExpression__Group_7_1__0 : rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 ;
     public final void rule__XBasicForLoopExpression__Group_7_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20323:1: ( rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 )
-            // InternalTableDSL.g:20324:2: rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1
+            // InternalTableDSL.g:19702:1: ( rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 )
+            // InternalTableDSL.g:19703:2: rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XBasicForLoopExpression__Group_7_1__0__Impl();
 
             state._fsp--;
@@ -67074,17 +65116,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__0__Impl"
-    // InternalTableDSL.g:20331:1: rule__XBasicForLoopExpression__Group_7_1__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:19710:1: rule__XBasicForLoopExpression__Group_7_1__0__Impl : ( ',' ) ;
     public final void rule__XBasicForLoopExpression__Group_7_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20335:1: ( ( ',' ) )
-            // InternalTableDSL.g:20336:1: ( ',' )
+            // InternalTableDSL.g:19714:1: ( ( ',' ) )
+            // InternalTableDSL.g:19715:1: ( ',' )
             {
-            // InternalTableDSL.g:20336:1: ( ',' )
-            // InternalTableDSL.g:20337:2: ','
+            // InternalTableDSL.g:19715:1: ( ',' )
+            // InternalTableDSL.g:19716:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0()); 
@@ -67115,14 +65157,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__1"
-    // InternalTableDSL.g:20346:1: rule__XBasicForLoopExpression__Group_7_1__1 : rule__XBasicForLoopExpression__Group_7_1__1__Impl ;
+    // InternalTableDSL.g:19725:1: rule__XBasicForLoopExpression__Group_7_1__1 : rule__XBasicForLoopExpression__Group_7_1__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_7_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20350:1: ( rule__XBasicForLoopExpression__Group_7_1__1__Impl )
-            // InternalTableDSL.g:20351:2: rule__XBasicForLoopExpression__Group_7_1__1__Impl
+            // InternalTableDSL.g:19729:1: ( rule__XBasicForLoopExpression__Group_7_1__1__Impl )
+            // InternalTableDSL.g:19730:2: rule__XBasicForLoopExpression__Group_7_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7_1__1__Impl();
@@ -67148,23 +65190,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__1__Impl"
-    // InternalTableDSL.g:20357:1: rule__XBasicForLoopExpression__Group_7_1__1__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) ;
+    // InternalTableDSL.g:19736:1: rule__XBasicForLoopExpression__Group_7_1__1__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_7_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20361:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) )
-            // InternalTableDSL.g:20362:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
+            // InternalTableDSL.g:19740:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) )
+            // InternalTableDSL.g:19741:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
             {
-            // InternalTableDSL.g:20362:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
-            // InternalTableDSL.g:20363:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
+            // InternalTableDSL.g:19741:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
+            // InternalTableDSL.g:19742:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsAssignment_7_1_1()); 
             }
-            // InternalTableDSL.g:20364:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
-            // InternalTableDSL.g:20364:3: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1
+            // InternalTableDSL.g:19743:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
+            // InternalTableDSL.g:19743:3: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1();
@@ -67199,16 +65241,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XWhileExpression__Group__0"
-    // InternalTableDSL.g:20373:1: rule__XWhileExpression__Group__0 : rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 ;
+    // InternalTableDSL.g:19752:1: rule__XWhileExpression__Group__0 : rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 ;
     public final void rule__XWhileExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20377:1: ( rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 )
-            // InternalTableDSL.g:20378:2: rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1
+            // InternalTableDSL.g:19756:1: ( rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 )
+            // InternalTableDSL.g:19757:2: rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1
             {
-            pushFollow(FOLLOW_158);
+            pushFollow(FOLLOW_157);
             rule__XWhileExpression__Group__0__Impl();
 
             state._fsp--;
@@ -67237,23 +65279,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XWhileExpression__Group__0__Impl"
-    // InternalTableDSL.g:20385:1: rule__XWhileExpression__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:19764:1: rule__XWhileExpression__Group__0__Impl : ( () ) ;
     public final void rule__XWhileExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20389:1: ( ( () ) )
-            // InternalTableDSL.g:20390:1: ( () )
+            // InternalTableDSL.g:19768:1: ( ( () ) )
+            // InternalTableDSL.g:19769:1: ( () )
             {
-            // InternalTableDSL.g:20390:1: ( () )
-            // InternalTableDSL.g:20391:2: ()
+            // InternalTableDSL.g:19769:1: ( () )
+            // InternalTableDSL.g:19770:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getXWhileExpressionAction_0()); 
             }
-            // InternalTableDSL.g:20392:2: ()
-            // InternalTableDSL.g:20392:3: 
+            // InternalTableDSL.g:19771:2: ()
+            // InternalTableDSL.g:19771:3: 
             {
             }
 
@@ -67278,16 +65320,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XWhileExpression__Group__1"
-    // InternalTableDSL.g:20400:1: rule__XWhileExpression__Group__1 : rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 ;
+    // InternalTableDSL.g:19779:1: rule__XWhileExpression__Group__1 : rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 ;
     public final void rule__XWhileExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20404:1: ( rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 )
-            // InternalTableDSL.g:20405:2: rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2
+            // InternalTableDSL.g:19783:1: ( rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 )
+            // InternalTableDSL.g:19784:2: rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2
             {
-            pushFollow(FOLLOW_96);
+            pushFollow(FOLLOW_95);
             rule__XWhileExpression__Group__1__Impl();
 
             state._fsp--;
@@ -67316,17 +65358,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XWhileExpression__Group__1__Impl"
-    // InternalTableDSL.g:20412:1: rule__XWhileExpression__Group__1__Impl : ( 'while' ) ;
+    // InternalTableDSL.g:19791:1: rule__XWhileExpression__Group__1__Impl : ( 'while' ) ;
     public final void rule__XWhileExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20416:1: ( ( 'while' ) )
-            // InternalTableDSL.g:20417:1: ( 'while' )
+            // InternalTableDSL.g:19795:1: ( ( 'while' ) )
+            // InternalTableDSL.g:19796:1: ( 'while' )
             {
-            // InternalTableDSL.g:20417:1: ( 'while' )
-            // InternalTableDSL.g:20418:2: 'while'
+            // InternalTableDSL.g:19796:1: ( 'while' )
+            // InternalTableDSL.g:19797:2: 'while'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1()); 
@@ -67357,16 +65399,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XWhileExpression__Group__2"
-    // InternalTableDSL.g:20427:1: rule__XWhileExpression__Group__2 : rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 ;
+    // InternalTableDSL.g:19806:1: rule__XWhileExpression__Group__2 : rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 ;
     public final void rule__XWhileExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20431:1: ( rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 )
-            // InternalTableDSL.g:20432:2: rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3
+            // InternalTableDSL.g:19810:1: ( rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 )
+            // InternalTableDSL.g:19811:2: rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XWhileExpression__Group__2__Impl();
 
             state._fsp--;
@@ -67395,17 +65437,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XWhileExpression__Group__2__Impl"
-    // InternalTableDSL.g:20439:1: rule__XWhileExpression__Group__2__Impl : ( '(' ) ;
+    // InternalTableDSL.g:19818:1: rule__XWhileExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XWhileExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20443:1: ( ( '(' ) )
-            // InternalTableDSL.g:20444:1: ( '(' )
+            // InternalTableDSL.g:19822:1: ( ( '(' ) )
+            // InternalTableDSL.g:19823:1: ( '(' )
             {
-            // InternalTableDSL.g:20444:1: ( '(' )
-            // InternalTableDSL.g:20445:2: '('
+            // InternalTableDSL.g:19823:1: ( '(' )
+            // InternalTableDSL.g:19824:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2()); 
@@ -67436,16 +65478,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XWhileExpression__Group__3"
-    // InternalTableDSL.g:20454:1: rule__XWhileExpression__Group__3 : rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 ;
+    // InternalTableDSL.g:19833:1: rule__XWhileExpression__Group__3 : rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 ;
     public final void rule__XWhileExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20458:1: ( rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 )
-            // InternalTableDSL.g:20459:2: rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4
+            // InternalTableDSL.g:19837:1: ( rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 )
+            // InternalTableDSL.g:19838:2: rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4
             {
-            pushFollow(FOLLOW_145);
+            pushFollow(FOLLOW_144);
             rule__XWhileExpression__Group__3__Impl();
 
             state._fsp--;
@@ -67474,23 +65516,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XWhileExpression__Group__3__Impl"
-    // InternalTableDSL.g:20466:1: rule__XWhileExpression__Group__3__Impl : ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) ;
+    // InternalTableDSL.g:19845:1: rule__XWhileExpression__Group__3__Impl : ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) ;
     public final void rule__XWhileExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20470:1: ( ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) )
-            // InternalTableDSL.g:20471:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
+            // InternalTableDSL.g:19849:1: ( ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) )
+            // InternalTableDSL.g:19850:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
             {
-            // InternalTableDSL.g:20471:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
-            // InternalTableDSL.g:20472:2: ( rule__XWhileExpression__PredicateAssignment_3 )
+            // InternalTableDSL.g:19850:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
+            // InternalTableDSL.g:19851:2: ( rule__XWhileExpression__PredicateAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getPredicateAssignment_3()); 
             }
-            // InternalTableDSL.g:20473:2: ( rule__XWhileExpression__PredicateAssignment_3 )
-            // InternalTableDSL.g:20473:3: rule__XWhileExpression__PredicateAssignment_3
+            // InternalTableDSL.g:19852:2: ( rule__XWhileExpression__PredicateAssignment_3 )
+            // InternalTableDSL.g:19852:3: rule__XWhileExpression__PredicateAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__XWhileExpression__PredicateAssignment_3();
@@ -67525,16 +65567,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XWhileExpression__Group__4"
-    // InternalTableDSL.g:20481:1: rule__XWhileExpression__Group__4 : rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 ;
+    // InternalTableDSL.g:19860:1: rule__XWhileExpression__Group__4 : rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 ;
     public final void rule__XWhileExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20485:1: ( rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 )
-            // InternalTableDSL.g:20486:2: rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5
+            // InternalTableDSL.g:19864:1: ( rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 )
+            // InternalTableDSL.g:19865:2: rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XWhileExpression__Group__4__Impl();
 
             state._fsp--;
@@ -67563,17 +65605,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XWhileExpression__Group__4__Impl"
-    // InternalTableDSL.g:20493:1: rule__XWhileExpression__Group__4__Impl : ( ')' ) ;
+    // InternalTableDSL.g:19872:1: rule__XWhileExpression__Group__4__Impl : ( ')' ) ;
     public final void rule__XWhileExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20497:1: ( ( ')' ) )
-            // InternalTableDSL.g:20498:1: ( ')' )
+            // InternalTableDSL.g:19876:1: ( ( ')' ) )
+            // InternalTableDSL.g:19877:1: ( ')' )
             {
-            // InternalTableDSL.g:20498:1: ( ')' )
-            // InternalTableDSL.g:20499:2: ')'
+            // InternalTableDSL.g:19877:1: ( ')' )
+            // InternalTableDSL.g:19878:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4()); 
@@ -67604,14 +65646,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XWhileExpression__Group__5"
-    // InternalTableDSL.g:20508:1: rule__XWhileExpression__Group__5 : rule__XWhileExpression__Group__5__Impl ;
+    // InternalTableDSL.g:19887:1: rule__XWhileExpression__Group__5 : rule__XWhileExpression__Group__5__Impl ;
     public final void rule__XWhileExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20512:1: ( rule__XWhileExpression__Group__5__Impl )
-            // InternalTableDSL.g:20513:2: rule__XWhileExpression__Group__5__Impl
+            // InternalTableDSL.g:19891:1: ( rule__XWhileExpression__Group__5__Impl )
+            // InternalTableDSL.g:19892:2: rule__XWhileExpression__Group__5__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__5__Impl();
@@ -67637,23 +65679,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XWhileExpression__Group__5__Impl"
-    // InternalTableDSL.g:20519:1: rule__XWhileExpression__Group__5__Impl : ( ( rule__XWhileExpression__BodyAssignment_5 ) ) ;
+    // InternalTableDSL.g:19898:1: rule__XWhileExpression__Group__5__Impl : ( ( rule__XWhileExpression__BodyAssignment_5 ) ) ;
     public final void rule__XWhileExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20523:1: ( ( ( rule__XWhileExpression__BodyAssignment_5 ) ) )
-            // InternalTableDSL.g:20524:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
+            // InternalTableDSL.g:19902:1: ( ( ( rule__XWhileExpression__BodyAssignment_5 ) ) )
+            // InternalTableDSL.g:19903:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
             {
-            // InternalTableDSL.g:20524:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
-            // InternalTableDSL.g:20525:2: ( rule__XWhileExpression__BodyAssignment_5 )
+            // InternalTableDSL.g:19903:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
+            // InternalTableDSL.g:19904:2: ( rule__XWhileExpression__BodyAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getBodyAssignment_5()); 
             }
-            // InternalTableDSL.g:20526:2: ( rule__XWhileExpression__BodyAssignment_5 )
-            // InternalTableDSL.g:20526:3: rule__XWhileExpression__BodyAssignment_5
+            // InternalTableDSL.g:19905:2: ( rule__XWhileExpression__BodyAssignment_5 )
+            // InternalTableDSL.g:19905:3: rule__XWhileExpression__BodyAssignment_5
             {
             pushFollow(FOLLOW_2);
             rule__XWhileExpression__BodyAssignment_5();
@@ -67688,16 +65730,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__0"
-    // InternalTableDSL.g:20535:1: rule__XDoWhileExpression__Group__0 : rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 ;
+    // InternalTableDSL.g:19914:1: rule__XDoWhileExpression__Group__0 : rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 ;
     public final void rule__XDoWhileExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20539:1: ( rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 )
-            // InternalTableDSL.g:20540:2: rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1
+            // InternalTableDSL.g:19918:1: ( rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 )
+            // InternalTableDSL.g:19919:2: rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1
             {
-            pushFollow(FOLLOW_159);
+            pushFollow(FOLLOW_158);
             rule__XDoWhileExpression__Group__0__Impl();
 
             state._fsp--;
@@ -67726,23 +65768,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__0__Impl"
-    // InternalTableDSL.g:20547:1: rule__XDoWhileExpression__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:19926:1: rule__XDoWhileExpression__Group__0__Impl : ( () ) ;
     public final void rule__XDoWhileExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20551:1: ( ( () ) )
-            // InternalTableDSL.g:20552:1: ( () )
+            // InternalTableDSL.g:19930:1: ( ( () ) )
+            // InternalTableDSL.g:19931:1: ( () )
             {
-            // InternalTableDSL.g:20552:1: ( () )
-            // InternalTableDSL.g:20553:2: ()
+            // InternalTableDSL.g:19931:1: ( () )
+            // InternalTableDSL.g:19932:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getXDoWhileExpressionAction_0()); 
             }
-            // InternalTableDSL.g:20554:2: ()
-            // InternalTableDSL.g:20554:3: 
+            // InternalTableDSL.g:19933:2: ()
+            // InternalTableDSL.g:19933:3: 
             {
             }
 
@@ -67767,16 +65809,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__1"
-    // InternalTableDSL.g:20562:1: rule__XDoWhileExpression__Group__1 : rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 ;
+    // InternalTableDSL.g:19941:1: rule__XDoWhileExpression__Group__1 : rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 ;
     public final void rule__XDoWhileExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20566:1: ( rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 )
-            // InternalTableDSL.g:20567:2: rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2
+            // InternalTableDSL.g:19945:1: ( rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 )
+            // InternalTableDSL.g:19946:2: rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XDoWhileExpression__Group__1__Impl();
 
             state._fsp--;
@@ -67805,17 +65847,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__1__Impl"
-    // InternalTableDSL.g:20574:1: rule__XDoWhileExpression__Group__1__Impl : ( 'do' ) ;
+    // InternalTableDSL.g:19953:1: rule__XDoWhileExpression__Group__1__Impl : ( 'do' ) ;
     public final void rule__XDoWhileExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20578:1: ( ( 'do' ) )
-            // InternalTableDSL.g:20579:1: ( 'do' )
+            // InternalTableDSL.g:19957:1: ( ( 'do' ) )
+            // InternalTableDSL.g:19958:1: ( 'do' )
             {
-            // InternalTableDSL.g:20579:1: ( 'do' )
-            // InternalTableDSL.g:20580:2: 'do'
+            // InternalTableDSL.g:19958:1: ( 'do' )
+            // InternalTableDSL.g:19959:2: 'do'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1()); 
@@ -67846,16 +65888,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__2"
-    // InternalTableDSL.g:20589:1: rule__XDoWhileExpression__Group__2 : rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 ;
+    // InternalTableDSL.g:19968:1: rule__XDoWhileExpression__Group__2 : rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 ;
     public final void rule__XDoWhileExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20593:1: ( rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 )
-            // InternalTableDSL.g:20594:2: rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3
+            // InternalTableDSL.g:19972:1: ( rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 )
+            // InternalTableDSL.g:19973:2: rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3
             {
-            pushFollow(FOLLOW_158);
+            pushFollow(FOLLOW_157);
             rule__XDoWhileExpression__Group__2__Impl();
 
             state._fsp--;
@@ -67884,23 +65926,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__2__Impl"
-    // InternalTableDSL.g:20601:1: rule__XDoWhileExpression__Group__2__Impl : ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) ;
+    // InternalTableDSL.g:19980:1: rule__XDoWhileExpression__Group__2__Impl : ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) ;
     public final void rule__XDoWhileExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20605:1: ( ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) )
-            // InternalTableDSL.g:20606:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
+            // InternalTableDSL.g:19984:1: ( ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) )
+            // InternalTableDSL.g:19985:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
             {
-            // InternalTableDSL.g:20606:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
-            // InternalTableDSL.g:20607:2: ( rule__XDoWhileExpression__BodyAssignment_2 )
+            // InternalTableDSL.g:19985:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
+            // InternalTableDSL.g:19986:2: ( rule__XDoWhileExpression__BodyAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getBodyAssignment_2()); 
             }
-            // InternalTableDSL.g:20608:2: ( rule__XDoWhileExpression__BodyAssignment_2 )
-            // InternalTableDSL.g:20608:3: rule__XDoWhileExpression__BodyAssignment_2
+            // InternalTableDSL.g:19987:2: ( rule__XDoWhileExpression__BodyAssignment_2 )
+            // InternalTableDSL.g:19987:3: rule__XDoWhileExpression__BodyAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__BodyAssignment_2();
@@ -67935,16 +65977,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__3"
-    // InternalTableDSL.g:20616:1: rule__XDoWhileExpression__Group__3 : rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 ;
+    // InternalTableDSL.g:19995:1: rule__XDoWhileExpression__Group__3 : rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 ;
     public final void rule__XDoWhileExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20620:1: ( rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 )
-            // InternalTableDSL.g:20621:2: rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4
+            // InternalTableDSL.g:19999:1: ( rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 )
+            // InternalTableDSL.g:20000:2: rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4
             {
-            pushFollow(FOLLOW_96);
+            pushFollow(FOLLOW_95);
             rule__XDoWhileExpression__Group__3__Impl();
 
             state._fsp--;
@@ -67973,17 +66015,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__3__Impl"
-    // InternalTableDSL.g:20628:1: rule__XDoWhileExpression__Group__3__Impl : ( 'while' ) ;
+    // InternalTableDSL.g:20007:1: rule__XDoWhileExpression__Group__3__Impl : ( 'while' ) ;
     public final void rule__XDoWhileExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20632:1: ( ( 'while' ) )
-            // InternalTableDSL.g:20633:1: ( 'while' )
+            // InternalTableDSL.g:20011:1: ( ( 'while' ) )
+            // InternalTableDSL.g:20012:1: ( 'while' )
             {
-            // InternalTableDSL.g:20633:1: ( 'while' )
-            // InternalTableDSL.g:20634:2: 'while'
+            // InternalTableDSL.g:20012:1: ( 'while' )
+            // InternalTableDSL.g:20013:2: 'while'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3()); 
@@ -68014,16 +66056,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__4"
-    // InternalTableDSL.g:20643:1: rule__XDoWhileExpression__Group__4 : rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 ;
+    // InternalTableDSL.g:20022:1: rule__XDoWhileExpression__Group__4 : rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 ;
     public final void rule__XDoWhileExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20647:1: ( rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 )
-            // InternalTableDSL.g:20648:2: rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5
+            // InternalTableDSL.g:20026:1: ( rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 )
+            // InternalTableDSL.g:20027:2: rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XDoWhileExpression__Group__4__Impl();
 
             state._fsp--;
@@ -68052,17 +66094,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__4__Impl"
-    // InternalTableDSL.g:20655:1: rule__XDoWhileExpression__Group__4__Impl : ( '(' ) ;
+    // InternalTableDSL.g:20034:1: rule__XDoWhileExpression__Group__4__Impl : ( '(' ) ;
     public final void rule__XDoWhileExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20659:1: ( ( '(' ) )
-            // InternalTableDSL.g:20660:1: ( '(' )
+            // InternalTableDSL.g:20038:1: ( ( '(' ) )
+            // InternalTableDSL.g:20039:1: ( '(' )
             {
-            // InternalTableDSL.g:20660:1: ( '(' )
-            // InternalTableDSL.g:20661:2: '('
+            // InternalTableDSL.g:20039:1: ( '(' )
+            // InternalTableDSL.g:20040:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4()); 
@@ -68093,16 +66135,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__5"
-    // InternalTableDSL.g:20670:1: rule__XDoWhileExpression__Group__5 : rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 ;
+    // InternalTableDSL.g:20049:1: rule__XDoWhileExpression__Group__5 : rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 ;
     public final void rule__XDoWhileExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20674:1: ( rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 )
-            // InternalTableDSL.g:20675:2: rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6
+            // InternalTableDSL.g:20053:1: ( rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 )
+            // InternalTableDSL.g:20054:2: rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6
             {
-            pushFollow(FOLLOW_145);
+            pushFollow(FOLLOW_144);
             rule__XDoWhileExpression__Group__5__Impl();
 
             state._fsp--;
@@ -68131,23 +66173,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__5__Impl"
-    // InternalTableDSL.g:20682:1: rule__XDoWhileExpression__Group__5__Impl : ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) ;
+    // InternalTableDSL.g:20061:1: rule__XDoWhileExpression__Group__5__Impl : ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) ;
     public final void rule__XDoWhileExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20686:1: ( ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) )
-            // InternalTableDSL.g:20687:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
+            // InternalTableDSL.g:20065:1: ( ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) )
+            // InternalTableDSL.g:20066:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
             {
-            // InternalTableDSL.g:20687:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
-            // InternalTableDSL.g:20688:2: ( rule__XDoWhileExpression__PredicateAssignment_5 )
+            // InternalTableDSL.g:20066:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
+            // InternalTableDSL.g:20067:2: ( rule__XDoWhileExpression__PredicateAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getPredicateAssignment_5()); 
             }
-            // InternalTableDSL.g:20689:2: ( rule__XDoWhileExpression__PredicateAssignment_5 )
-            // InternalTableDSL.g:20689:3: rule__XDoWhileExpression__PredicateAssignment_5
+            // InternalTableDSL.g:20068:2: ( rule__XDoWhileExpression__PredicateAssignment_5 )
+            // InternalTableDSL.g:20068:3: rule__XDoWhileExpression__PredicateAssignment_5
             {
             pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__PredicateAssignment_5();
@@ -68182,14 +66224,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__6"
-    // InternalTableDSL.g:20697:1: rule__XDoWhileExpression__Group__6 : rule__XDoWhileExpression__Group__6__Impl ;
+    // InternalTableDSL.g:20076:1: rule__XDoWhileExpression__Group__6 : rule__XDoWhileExpression__Group__6__Impl ;
     public final void rule__XDoWhileExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20701:1: ( rule__XDoWhileExpression__Group__6__Impl )
-            // InternalTableDSL.g:20702:2: rule__XDoWhileExpression__Group__6__Impl
+            // InternalTableDSL.g:20080:1: ( rule__XDoWhileExpression__Group__6__Impl )
+            // InternalTableDSL.g:20081:2: rule__XDoWhileExpression__Group__6__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__6__Impl();
@@ -68215,17 +66257,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__6__Impl"
-    // InternalTableDSL.g:20708:1: rule__XDoWhileExpression__Group__6__Impl : ( ')' ) ;
+    // InternalTableDSL.g:20087:1: rule__XDoWhileExpression__Group__6__Impl : ( ')' ) ;
     public final void rule__XDoWhileExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20712:1: ( ( ')' ) )
-            // InternalTableDSL.g:20713:1: ( ')' )
+            // InternalTableDSL.g:20091:1: ( ( ')' ) )
+            // InternalTableDSL.g:20092:1: ( ')' )
             {
-            // InternalTableDSL.g:20713:1: ( ')' )
-            // InternalTableDSL.g:20714:2: ')'
+            // InternalTableDSL.g:20092:1: ( ')' )
+            // InternalTableDSL.g:20093:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6()); 
@@ -68256,14 +66298,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBlockExpression__Group__0"
-    // InternalTableDSL.g:20724:1: rule__XBlockExpression__Group__0 : rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 ;
+    // InternalTableDSL.g:20103:1: rule__XBlockExpression__Group__0 : rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 ;
     public final void rule__XBlockExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20728:1: ( rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 )
-            // InternalTableDSL.g:20729:2: rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1
+            // InternalTableDSL.g:20107:1: ( rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 )
+            // InternalTableDSL.g:20108:2: rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1
             {
             pushFollow(FOLLOW_8);
             rule__XBlockExpression__Group__0__Impl();
@@ -68294,23 +66336,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBlockExpression__Group__0__Impl"
-    // InternalTableDSL.g:20736:1: rule__XBlockExpression__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:20115:1: rule__XBlockExpression__Group__0__Impl : ( () ) ;
     public final void rule__XBlockExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20740:1: ( ( () ) )
-            // InternalTableDSL.g:20741:1: ( () )
+            // InternalTableDSL.g:20119:1: ( ( () ) )
+            // InternalTableDSL.g:20120:1: ( () )
             {
-            // InternalTableDSL.g:20741:1: ( () )
-            // InternalTableDSL.g:20742:2: ()
+            // InternalTableDSL.g:20120:1: ( () )
+            // InternalTableDSL.g:20121:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getXBlockExpressionAction_0()); 
             }
-            // InternalTableDSL.g:20743:2: ()
-            // InternalTableDSL.g:20743:3: 
+            // InternalTableDSL.g:20122:2: ()
+            // InternalTableDSL.g:20122:3: 
             {
             }
 
@@ -68335,16 +66377,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBlockExpression__Group__1"
-    // InternalTableDSL.g:20751:1: rule__XBlockExpression__Group__1 : rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 ;
+    // InternalTableDSL.g:20130:1: rule__XBlockExpression__Group__1 : rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 ;
     public final void rule__XBlockExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20755:1: ( rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 )
-            // InternalTableDSL.g:20756:2: rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2
+            // InternalTableDSL.g:20134:1: ( rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 )
+            // InternalTableDSL.g:20135:2: rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2
             {
-            pushFollow(FOLLOW_160);
+            pushFollow(FOLLOW_159);
             rule__XBlockExpression__Group__1__Impl();
 
             state._fsp--;
@@ -68373,17 +66415,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBlockExpression__Group__1__Impl"
-    // InternalTableDSL.g:20763:1: rule__XBlockExpression__Group__1__Impl : ( '{' ) ;
+    // InternalTableDSL.g:20142:1: rule__XBlockExpression__Group__1__Impl : ( '{' ) ;
     public final void rule__XBlockExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20767:1: ( ( '{' ) )
-            // InternalTableDSL.g:20768:1: ( '{' )
+            // InternalTableDSL.g:20146:1: ( ( '{' ) )
+            // InternalTableDSL.g:20147:1: ( '{' )
             {
-            // InternalTableDSL.g:20768:1: ( '{' )
-            // InternalTableDSL.g:20769:2: '{'
+            // InternalTableDSL.g:20147:1: ( '{' )
+            // InternalTableDSL.g:20148:2: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1()); 
@@ -68414,16 +66456,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBlockExpression__Group__2"
-    // InternalTableDSL.g:20778:1: rule__XBlockExpression__Group__2 : rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 ;
+    // InternalTableDSL.g:20157:1: rule__XBlockExpression__Group__2 : rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 ;
     public final void rule__XBlockExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20782:1: ( rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 )
-            // InternalTableDSL.g:20783:2: rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3
+            // InternalTableDSL.g:20161:1: ( rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 )
+            // InternalTableDSL.g:20162:2: rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3
             {
-            pushFollow(FOLLOW_160);
+            pushFollow(FOLLOW_159);
             rule__XBlockExpression__Group__2__Impl();
 
             state._fsp--;
@@ -68452,37 +66494,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBlockExpression__Group__2__Impl"
-    // InternalTableDSL.g:20790:1: rule__XBlockExpression__Group__2__Impl : ( ( rule__XBlockExpression__Group_2__0 )* ) ;
+    // InternalTableDSL.g:20169:1: rule__XBlockExpression__Group__2__Impl : ( ( rule__XBlockExpression__Group_2__0 )* ) ;
     public final void rule__XBlockExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20794:1: ( ( ( rule__XBlockExpression__Group_2__0 )* ) )
-            // InternalTableDSL.g:20795:1: ( ( rule__XBlockExpression__Group_2__0 )* )
+            // InternalTableDSL.g:20173:1: ( ( ( rule__XBlockExpression__Group_2__0 )* ) )
+            // InternalTableDSL.g:20174:1: ( ( rule__XBlockExpression__Group_2__0 )* )
             {
-            // InternalTableDSL.g:20795:1: ( ( rule__XBlockExpression__Group_2__0 )* )
-            // InternalTableDSL.g:20796:2: ( rule__XBlockExpression__Group_2__0 )*
+            // InternalTableDSL.g:20174:1: ( ( rule__XBlockExpression__Group_2__0 )* )
+            // InternalTableDSL.g:20175:2: ( rule__XBlockExpression__Group_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getGroup_2()); 
             }
-            // InternalTableDSL.g:20797:2: ( rule__XBlockExpression__Group_2__0 )*
-            loop141:
+            // InternalTableDSL.g:20176:2: ( rule__XBlockExpression__Group_2__0 )*
+            loop139:
             do {
-                int alt141=2;
-                int LA141_0 = input.LA(1);
+                int alt139=2;
+                int LA139_0 = input.LA(1);
 
-                if ( ((LA141_0>=RULE_STRING && LA141_0<=RULE_DECIMAL)||(LA141_0>=19 && LA141_0<=20)||LA141_0==32||LA141_0==43||(LA141_0>=47 && LA141_0<=53)||LA141_0==75||LA141_0==135||(LA141_0>=139 && LA141_0<=140)||LA141_0==142||LA141_0==144||(LA141_0>=147 && LA141_0<=155)||LA141_0==157||(LA141_0>=183 && LA141_0<=184)) ) {
-                    alt141=1;
+                if ( ((LA139_0>=RULE_STRING && LA139_0<=RULE_DECIMAL)||(LA139_0>=19 && LA139_0<=20)||LA139_0==32||LA139_0==43||(LA139_0>=47 && LA139_0<=53)||LA139_0==75||LA139_0==135||(LA139_0>=139 && LA139_0<=140)||LA139_0==142||LA139_0==144||(LA139_0>=147 && LA139_0<=155)||LA139_0==157||(LA139_0>=180 && LA139_0<=181)) ) {
+                    alt139=1;
                 }
 
 
-                switch (alt141) {
+                switch (alt139) {
             	case 1 :
-            	    // InternalTableDSL.g:20797:3: rule__XBlockExpression__Group_2__0
+            	    // InternalTableDSL.g:20176:3: rule__XBlockExpression__Group_2__0
             	    {
-            	    pushFollow(FOLLOW_144);
+            	    pushFollow(FOLLOW_143);
             	    rule__XBlockExpression__Group_2__0();
 
             	    state._fsp--;
@@ -68492,7 +66534,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop141;
+            	    break loop139;
                 }
             } while (true);
 
@@ -68521,14 +66563,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBlockExpression__Group__3"
-    // InternalTableDSL.g:20805:1: rule__XBlockExpression__Group__3 : rule__XBlockExpression__Group__3__Impl ;
+    // InternalTableDSL.g:20184:1: rule__XBlockExpression__Group__3 : rule__XBlockExpression__Group__3__Impl ;
     public final void rule__XBlockExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20809:1: ( rule__XBlockExpression__Group__3__Impl )
-            // InternalTableDSL.g:20810:2: rule__XBlockExpression__Group__3__Impl
+            // InternalTableDSL.g:20188:1: ( rule__XBlockExpression__Group__3__Impl )
+            // InternalTableDSL.g:20189:2: rule__XBlockExpression__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__3__Impl();
@@ -68554,17 +66596,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBlockExpression__Group__3__Impl"
-    // InternalTableDSL.g:20816:1: rule__XBlockExpression__Group__3__Impl : ( '}' ) ;
+    // InternalTableDSL.g:20195:1: rule__XBlockExpression__Group__3__Impl : ( '}' ) ;
     public final void rule__XBlockExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20820:1: ( ( '}' ) )
-            // InternalTableDSL.g:20821:1: ( '}' )
+            // InternalTableDSL.g:20199:1: ( ( '}' ) )
+            // InternalTableDSL.g:20200:1: ( '}' )
             {
-            // InternalTableDSL.g:20821:1: ( '}' )
-            // InternalTableDSL.g:20822:2: '}'
+            // InternalTableDSL.g:20200:1: ( '}' )
+            // InternalTableDSL.g:20201:2: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3()); 
@@ -68595,16 +66637,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__0"
-    // InternalTableDSL.g:20832:1: rule__XBlockExpression__Group_2__0 : rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 ;
+    // InternalTableDSL.g:20211:1: rule__XBlockExpression__Group_2__0 : rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 ;
     public final void rule__XBlockExpression__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20836:1: ( rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 )
-            // InternalTableDSL.g:20837:2: rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1
+            // InternalTableDSL.g:20215:1: ( rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 )
+            // InternalTableDSL.g:20216:2: rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1
             {
-            pushFollow(FOLLOW_92);
+            pushFollow(FOLLOW_91);
             rule__XBlockExpression__Group_2__0__Impl();
 
             state._fsp--;
@@ -68633,23 +66675,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__0__Impl"
-    // InternalTableDSL.g:20844:1: rule__XBlockExpression__Group_2__0__Impl : ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) ;
+    // InternalTableDSL.g:20223:1: rule__XBlockExpression__Group_2__0__Impl : ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) ;
     public final void rule__XBlockExpression__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20848:1: ( ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) )
-            // InternalTableDSL.g:20849:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
+            // InternalTableDSL.g:20227:1: ( ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) )
+            // InternalTableDSL.g:20228:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
             {
-            // InternalTableDSL.g:20849:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
-            // InternalTableDSL.g:20850:2: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
+            // InternalTableDSL.g:20228:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
+            // InternalTableDSL.g:20229:2: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getExpressionsAssignment_2_0()); 
             }
-            // InternalTableDSL.g:20851:2: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
-            // InternalTableDSL.g:20851:3: rule__XBlockExpression__ExpressionsAssignment_2_0
+            // InternalTableDSL.g:20230:2: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
+            // InternalTableDSL.g:20230:3: rule__XBlockExpression__ExpressionsAssignment_2_0
             {
             pushFollow(FOLLOW_2);
             rule__XBlockExpression__ExpressionsAssignment_2_0();
@@ -68684,14 +66726,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__1"
-    // InternalTableDSL.g:20859:1: rule__XBlockExpression__Group_2__1 : rule__XBlockExpression__Group_2__1__Impl ;
+    // InternalTableDSL.g:20238:1: rule__XBlockExpression__Group_2__1 : rule__XBlockExpression__Group_2__1__Impl ;
     public final void rule__XBlockExpression__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20863:1: ( rule__XBlockExpression__Group_2__1__Impl )
-            // InternalTableDSL.g:20864:2: rule__XBlockExpression__Group_2__1__Impl
+            // InternalTableDSL.g:20242:1: ( rule__XBlockExpression__Group_2__1__Impl )
+            // InternalTableDSL.g:20243:2: rule__XBlockExpression__Group_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group_2__1__Impl();
@@ -68717,31 +66759,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__1__Impl"
-    // InternalTableDSL.g:20870:1: rule__XBlockExpression__Group_2__1__Impl : ( ( ';' )? ) ;
+    // InternalTableDSL.g:20249:1: rule__XBlockExpression__Group_2__1__Impl : ( ( ';' )? ) ;
     public final void rule__XBlockExpression__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20874:1: ( ( ( ';' )? ) )
-            // InternalTableDSL.g:20875:1: ( ( ';' )? )
+            // InternalTableDSL.g:20253:1: ( ( ( ';' )? ) )
+            // InternalTableDSL.g:20254:1: ( ( ';' )? )
             {
-            // InternalTableDSL.g:20875:1: ( ( ';' )? )
-            // InternalTableDSL.g:20876:2: ( ';' )?
+            // InternalTableDSL.g:20254:1: ( ( ';' )? )
+            // InternalTableDSL.g:20255:2: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getSemicolonKeyword_2_1()); 
             }
-            // InternalTableDSL.g:20877:2: ( ';' )?
-            int alt142=2;
-            int LA142_0 = input.LA(1);
+            // InternalTableDSL.g:20256:2: ( ';' )?
+            int alt140=2;
+            int LA140_0 = input.LA(1);
 
-            if ( (LA142_0==133) ) {
-                alt142=1;
+            if ( (LA140_0==133) ) {
+                alt140=1;
             }
-            switch (alt142) {
+            switch (alt140) {
                 case 1 :
-                    // InternalTableDSL.g:20877:3: ';'
+                    // InternalTableDSL.g:20256:3: ';'
                     {
                     match(input,133,FOLLOW_2); if (state.failed) return ;
 
@@ -68775,16 +66817,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__0"
-    // InternalTableDSL.g:20886:1: rule__XVariableDeclaration__Group__0 : rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 ;
+    // InternalTableDSL.g:20265:1: rule__XVariableDeclaration__Group__0 : rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 ;
     public final void rule__XVariableDeclaration__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20890:1: ( rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 )
-            // InternalTableDSL.g:20891:2: rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1
+            // InternalTableDSL.g:20269:1: ( rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 )
+            // InternalTableDSL.g:20270:2: rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1
             {
-            pushFollow(FOLLOW_161);
+            pushFollow(FOLLOW_160);
             rule__XVariableDeclaration__Group__0__Impl();
 
             state._fsp--;
@@ -68813,23 +66855,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__0__Impl"
-    // InternalTableDSL.g:20898:1: rule__XVariableDeclaration__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:20277:1: rule__XVariableDeclaration__Group__0__Impl : ( () ) ;
     public final void rule__XVariableDeclaration__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20902:1: ( ( () ) )
-            // InternalTableDSL.g:20903:1: ( () )
+            // InternalTableDSL.g:20281:1: ( ( () ) )
+            // InternalTableDSL.g:20282:1: ( () )
             {
-            // InternalTableDSL.g:20903:1: ( () )
-            // InternalTableDSL.g:20904:2: ()
+            // InternalTableDSL.g:20282:1: ( () )
+            // InternalTableDSL.g:20283:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getXVariableDeclarationAction_0()); 
             }
-            // InternalTableDSL.g:20905:2: ()
-            // InternalTableDSL.g:20905:3: 
+            // InternalTableDSL.g:20284:2: ()
+            // InternalTableDSL.g:20284:3: 
             {
             }
 
@@ -68854,16 +66896,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__1"
-    // InternalTableDSL.g:20913:1: rule__XVariableDeclaration__Group__1 : rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 ;
+    // InternalTableDSL.g:20292:1: rule__XVariableDeclaration__Group__1 : rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 ;
     public final void rule__XVariableDeclaration__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20917:1: ( rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 )
-            // InternalTableDSL.g:20918:2: rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2
+            // InternalTableDSL.g:20296:1: ( rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 )
+            // InternalTableDSL.g:20297:2: rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__XVariableDeclaration__Group__1__Impl();
 
             state._fsp--;
@@ -68892,23 +66934,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__1__Impl"
-    // InternalTableDSL.g:20925:1: rule__XVariableDeclaration__Group__1__Impl : ( ( rule__XVariableDeclaration__Alternatives_1 ) ) ;
+    // InternalTableDSL.g:20304:1: rule__XVariableDeclaration__Group__1__Impl : ( ( rule__XVariableDeclaration__Alternatives_1 ) ) ;
     public final void rule__XVariableDeclaration__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20929:1: ( ( ( rule__XVariableDeclaration__Alternatives_1 ) ) )
-            // InternalTableDSL.g:20930:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
+            // InternalTableDSL.g:20308:1: ( ( ( rule__XVariableDeclaration__Alternatives_1 ) ) )
+            // InternalTableDSL.g:20309:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
             {
-            // InternalTableDSL.g:20930:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
-            // InternalTableDSL.g:20931:2: ( rule__XVariableDeclaration__Alternatives_1 )
+            // InternalTableDSL.g:20309:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
+            // InternalTableDSL.g:20310:2: ( rule__XVariableDeclaration__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getAlternatives_1()); 
             }
-            // InternalTableDSL.g:20932:2: ( rule__XVariableDeclaration__Alternatives_1 )
-            // InternalTableDSL.g:20932:3: rule__XVariableDeclaration__Alternatives_1
+            // InternalTableDSL.g:20311:2: ( rule__XVariableDeclaration__Alternatives_1 )
+            // InternalTableDSL.g:20311:3: rule__XVariableDeclaration__Alternatives_1
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Alternatives_1();
@@ -68943,16 +66985,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__2"
-    // InternalTableDSL.g:20940:1: rule__XVariableDeclaration__Group__2 : rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 ;
+    // InternalTableDSL.g:20319:1: rule__XVariableDeclaration__Group__2 : rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 ;
     public final void rule__XVariableDeclaration__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20944:1: ( rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 )
-            // InternalTableDSL.g:20945:2: rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3
+            // InternalTableDSL.g:20323:1: ( rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 )
+            // InternalTableDSL.g:20324:2: rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3
             {
-            pushFollow(FOLLOW_101);
+            pushFollow(FOLLOW_100);
             rule__XVariableDeclaration__Group__2__Impl();
 
             state._fsp--;
@@ -68981,23 +67023,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__2__Impl"
-    // InternalTableDSL.g:20952:1: rule__XVariableDeclaration__Group__2__Impl : ( ( rule__XVariableDeclaration__Alternatives_2 ) ) ;
+    // InternalTableDSL.g:20331:1: rule__XVariableDeclaration__Group__2__Impl : ( ( rule__XVariableDeclaration__Alternatives_2 ) ) ;
     public final void rule__XVariableDeclaration__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20956:1: ( ( ( rule__XVariableDeclaration__Alternatives_2 ) ) )
-            // InternalTableDSL.g:20957:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
+            // InternalTableDSL.g:20335:1: ( ( ( rule__XVariableDeclaration__Alternatives_2 ) ) )
+            // InternalTableDSL.g:20336:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
             {
-            // InternalTableDSL.g:20957:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
-            // InternalTableDSL.g:20958:2: ( rule__XVariableDeclaration__Alternatives_2 )
+            // InternalTableDSL.g:20336:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
+            // InternalTableDSL.g:20337:2: ( rule__XVariableDeclaration__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getAlternatives_2()); 
             }
-            // InternalTableDSL.g:20959:2: ( rule__XVariableDeclaration__Alternatives_2 )
-            // InternalTableDSL.g:20959:3: rule__XVariableDeclaration__Alternatives_2
+            // InternalTableDSL.g:20338:2: ( rule__XVariableDeclaration__Alternatives_2 )
+            // InternalTableDSL.g:20338:3: rule__XVariableDeclaration__Alternatives_2
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Alternatives_2();
@@ -69032,14 +67074,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__3"
-    // InternalTableDSL.g:20967:1: rule__XVariableDeclaration__Group__3 : rule__XVariableDeclaration__Group__3__Impl ;
+    // InternalTableDSL.g:20346:1: rule__XVariableDeclaration__Group__3 : rule__XVariableDeclaration__Group__3__Impl ;
     public final void rule__XVariableDeclaration__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20971:1: ( rule__XVariableDeclaration__Group__3__Impl )
-            // InternalTableDSL.g:20972:2: rule__XVariableDeclaration__Group__3__Impl
+            // InternalTableDSL.g:20350:1: ( rule__XVariableDeclaration__Group__3__Impl )
+            // InternalTableDSL.g:20351:2: rule__XVariableDeclaration__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__3__Impl();
@@ -69065,31 +67107,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__3__Impl"
-    // InternalTableDSL.g:20978:1: rule__XVariableDeclaration__Group__3__Impl : ( ( rule__XVariableDeclaration__Group_3__0 )? ) ;
+    // InternalTableDSL.g:20357:1: rule__XVariableDeclaration__Group__3__Impl : ( ( rule__XVariableDeclaration__Group_3__0 )? ) ;
     public final void rule__XVariableDeclaration__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20982:1: ( ( ( rule__XVariableDeclaration__Group_3__0 )? ) )
-            // InternalTableDSL.g:20983:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
+            // InternalTableDSL.g:20361:1: ( ( ( rule__XVariableDeclaration__Group_3__0 )? ) )
+            // InternalTableDSL.g:20362:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
             {
-            // InternalTableDSL.g:20983:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
-            // InternalTableDSL.g:20984:2: ( rule__XVariableDeclaration__Group_3__0 )?
+            // InternalTableDSL.g:20362:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
+            // InternalTableDSL.g:20363:2: ( rule__XVariableDeclaration__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup_3()); 
             }
-            // InternalTableDSL.g:20985:2: ( rule__XVariableDeclaration__Group_3__0 )?
-            int alt143=2;
-            int LA143_0 = input.LA(1);
+            // InternalTableDSL.g:20364:2: ( rule__XVariableDeclaration__Group_3__0 )?
+            int alt141=2;
+            int LA141_0 = input.LA(1);
 
-            if ( (LA143_0==15) ) {
-                alt143=1;
+            if ( (LA141_0==15) ) {
+                alt141=1;
             }
-            switch (alt143) {
+            switch (alt141) {
                 case 1 :
-                    // InternalTableDSL.g:20985:3: rule__XVariableDeclaration__Group_3__0
+                    // InternalTableDSL.g:20364:3: rule__XVariableDeclaration__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__Group_3__0();
@@ -69127,14 +67169,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0__0"
-    // InternalTableDSL.g:20994:1: rule__XVariableDeclaration__Group_2_0__0 : rule__XVariableDeclaration__Group_2_0__0__Impl ;
+    // InternalTableDSL.g:20373:1: rule__XVariableDeclaration__Group_2_0__0 : rule__XVariableDeclaration__Group_2_0__0__Impl ;
     public final void rule__XVariableDeclaration__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:20998:1: ( rule__XVariableDeclaration__Group_2_0__0__Impl )
-            // InternalTableDSL.g:20999:2: rule__XVariableDeclaration__Group_2_0__0__Impl
+            // InternalTableDSL.g:20377:1: ( rule__XVariableDeclaration__Group_2_0__0__Impl )
+            // InternalTableDSL.g:20378:2: rule__XVariableDeclaration__Group_2_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0__0__Impl();
@@ -69160,23 +67202,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0__0__Impl"
-    // InternalTableDSL.g:21005:1: rule__XVariableDeclaration__Group_2_0__0__Impl : ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) ;
+    // InternalTableDSL.g:20384:1: rule__XVariableDeclaration__Group_2_0__0__Impl : ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) ;
     public final void rule__XVariableDeclaration__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21009:1: ( ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) )
-            // InternalTableDSL.g:21010:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
+            // InternalTableDSL.g:20388:1: ( ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) )
+            // InternalTableDSL.g:20389:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
             {
-            // InternalTableDSL.g:21010:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
-            // InternalTableDSL.g:21011:2: ( rule__XVariableDeclaration__Group_2_0_0__0 )
+            // InternalTableDSL.g:20389:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
+            // InternalTableDSL.g:20390:2: ( rule__XVariableDeclaration__Group_2_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup_2_0_0()); 
             }
-            // InternalTableDSL.g:21012:2: ( rule__XVariableDeclaration__Group_2_0_0__0 )
-            // InternalTableDSL.g:21012:3: rule__XVariableDeclaration__Group_2_0_0__0
+            // InternalTableDSL.g:20391:2: ( rule__XVariableDeclaration__Group_2_0_0__0 )
+            // InternalTableDSL.g:20391:3: rule__XVariableDeclaration__Group_2_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0_0__0();
@@ -69211,14 +67253,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__0"
-    // InternalTableDSL.g:21021:1: rule__XVariableDeclaration__Group_2_0_0__0 : rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 ;
+    // InternalTableDSL.g:20400:1: rule__XVariableDeclaration__Group_2_0_0__0 : rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 ;
     public final void rule__XVariableDeclaration__Group_2_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21025:1: ( rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 )
-            // InternalTableDSL.g:21026:2: rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1
+            // InternalTableDSL.g:20404:1: ( rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 )
+            // InternalTableDSL.g:20405:2: rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1
             {
             pushFollow(FOLLOW_7);
             rule__XVariableDeclaration__Group_2_0_0__0__Impl();
@@ -69249,23 +67291,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__0__Impl"
-    // InternalTableDSL.g:21033:1: rule__XVariableDeclaration__Group_2_0_0__0__Impl : ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) ;
+    // InternalTableDSL.g:20412:1: rule__XVariableDeclaration__Group_2_0_0__0__Impl : ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) ;
     public final void rule__XVariableDeclaration__Group_2_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21037:1: ( ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) )
-            // InternalTableDSL.g:21038:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
+            // InternalTableDSL.g:20416:1: ( ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) )
+            // InternalTableDSL.g:20417:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
             {
-            // InternalTableDSL.g:21038:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
-            // InternalTableDSL.g:21039:2: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
+            // InternalTableDSL.g:20417:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
+            // InternalTableDSL.g:20418:2: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getTypeAssignment_2_0_0_0()); 
             }
-            // InternalTableDSL.g:21040:2: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
-            // InternalTableDSL.g:21040:3: rule__XVariableDeclaration__TypeAssignment_2_0_0_0
+            // InternalTableDSL.g:20419:2: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
+            // InternalTableDSL.g:20419:3: rule__XVariableDeclaration__TypeAssignment_2_0_0_0
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__TypeAssignment_2_0_0_0();
@@ -69300,14 +67342,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__1"
-    // InternalTableDSL.g:21048:1: rule__XVariableDeclaration__Group_2_0_0__1 : rule__XVariableDeclaration__Group_2_0_0__1__Impl ;
+    // InternalTableDSL.g:20427:1: rule__XVariableDeclaration__Group_2_0_0__1 : rule__XVariableDeclaration__Group_2_0_0__1__Impl ;
     public final void rule__XVariableDeclaration__Group_2_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21052:1: ( rule__XVariableDeclaration__Group_2_0_0__1__Impl )
-            // InternalTableDSL.g:21053:2: rule__XVariableDeclaration__Group_2_0_0__1__Impl
+            // InternalTableDSL.g:20431:1: ( rule__XVariableDeclaration__Group_2_0_0__1__Impl )
+            // InternalTableDSL.g:20432:2: rule__XVariableDeclaration__Group_2_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0_0__1__Impl();
@@ -69333,23 +67375,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__1__Impl"
-    // InternalTableDSL.g:21059:1: rule__XVariableDeclaration__Group_2_0_0__1__Impl : ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) ;
+    // InternalTableDSL.g:20438:1: rule__XVariableDeclaration__Group_2_0_0__1__Impl : ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) ;
     public final void rule__XVariableDeclaration__Group_2_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21063:1: ( ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) )
-            // InternalTableDSL.g:21064:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
+            // InternalTableDSL.g:20442:1: ( ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) )
+            // InternalTableDSL.g:20443:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
             {
-            // InternalTableDSL.g:21064:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
-            // InternalTableDSL.g:21065:2: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
+            // InternalTableDSL.g:20443:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
+            // InternalTableDSL.g:20444:2: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameAssignment_2_0_0_1()); 
             }
-            // InternalTableDSL.g:21066:2: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
-            // InternalTableDSL.g:21066:3: rule__XVariableDeclaration__NameAssignment_2_0_0_1
+            // InternalTableDSL.g:20445:2: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
+            // InternalTableDSL.g:20445:3: rule__XVariableDeclaration__NameAssignment_2_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__NameAssignment_2_0_0_1();
@@ -69384,16 +67426,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__0"
-    // InternalTableDSL.g:21075:1: rule__XVariableDeclaration__Group_3__0 : rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 ;
+    // InternalTableDSL.g:20454:1: rule__XVariableDeclaration__Group_3__0 : rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 ;
     public final void rule__XVariableDeclaration__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21079:1: ( rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 )
-            // InternalTableDSL.g:21080:2: rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1
+            // InternalTableDSL.g:20458:1: ( rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 )
+            // InternalTableDSL.g:20459:2: rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XVariableDeclaration__Group_3__0__Impl();
 
             state._fsp--;
@@ -69422,17 +67464,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__0__Impl"
-    // InternalTableDSL.g:21087:1: rule__XVariableDeclaration__Group_3__0__Impl : ( '=' ) ;
+    // InternalTableDSL.g:20466:1: rule__XVariableDeclaration__Group_3__0__Impl : ( '=' ) ;
     public final void rule__XVariableDeclaration__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21091:1: ( ( '=' ) )
-            // InternalTableDSL.g:21092:1: ( '=' )
+            // InternalTableDSL.g:20470:1: ( ( '=' ) )
+            // InternalTableDSL.g:20471:1: ( '=' )
             {
-            // InternalTableDSL.g:21092:1: ( '=' )
-            // InternalTableDSL.g:21093:2: '='
+            // InternalTableDSL.g:20471:1: ( '=' )
+            // InternalTableDSL.g:20472:2: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0()); 
@@ -69463,14 +67505,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__1"
-    // InternalTableDSL.g:21102:1: rule__XVariableDeclaration__Group_3__1 : rule__XVariableDeclaration__Group_3__1__Impl ;
+    // InternalTableDSL.g:20481:1: rule__XVariableDeclaration__Group_3__1 : rule__XVariableDeclaration__Group_3__1__Impl ;
     public final void rule__XVariableDeclaration__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21106:1: ( rule__XVariableDeclaration__Group_3__1__Impl )
-            // InternalTableDSL.g:21107:2: rule__XVariableDeclaration__Group_3__1__Impl
+            // InternalTableDSL.g:20485:1: ( rule__XVariableDeclaration__Group_3__1__Impl )
+            // InternalTableDSL.g:20486:2: rule__XVariableDeclaration__Group_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_3__1__Impl();
@@ -69496,23 +67538,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__1__Impl"
-    // InternalTableDSL.g:21113:1: rule__XVariableDeclaration__Group_3__1__Impl : ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) ;
+    // InternalTableDSL.g:20492:1: rule__XVariableDeclaration__Group_3__1__Impl : ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) ;
     public final void rule__XVariableDeclaration__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21117:1: ( ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) )
-            // InternalTableDSL.g:21118:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
+            // InternalTableDSL.g:20496:1: ( ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) )
+            // InternalTableDSL.g:20497:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
             {
-            // InternalTableDSL.g:21118:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
-            // InternalTableDSL.g:21119:2: ( rule__XVariableDeclaration__RightAssignment_3_1 )
+            // InternalTableDSL.g:20497:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
+            // InternalTableDSL.g:20498:2: ( rule__XVariableDeclaration__RightAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getRightAssignment_3_1()); 
             }
-            // InternalTableDSL.g:21120:2: ( rule__XVariableDeclaration__RightAssignment_3_1 )
-            // InternalTableDSL.g:21120:3: rule__XVariableDeclaration__RightAssignment_3_1
+            // InternalTableDSL.g:20499:2: ( rule__XVariableDeclaration__RightAssignment_3_1 )
+            // InternalTableDSL.g:20499:3: rule__XVariableDeclaration__RightAssignment_3_1
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__RightAssignment_3_1();
@@ -69547,16 +67589,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__0"
-    // InternalTableDSL.g:21129:1: rule__JvmFormalParameter__Group__0 : rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 ;
+    // InternalTableDSL.g:20508:1: rule__JvmFormalParameter__Group__0 : rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 ;
     public final void rule__JvmFormalParameter__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21133:1: ( rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 )
-            // InternalTableDSL.g:21134:2: rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1
+            // InternalTableDSL.g:20512:1: ( rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 )
+            // InternalTableDSL.g:20513:2: rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__JvmFormalParameter__Group__0__Impl();
 
             state._fsp--;
@@ -69585,38 +67627,38 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__0__Impl"
-    // InternalTableDSL.g:21141:1: rule__JvmFormalParameter__Group__0__Impl : ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) ;
+    // InternalTableDSL.g:20520:1: rule__JvmFormalParameter__Group__0__Impl : ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) ;
     public final void rule__JvmFormalParameter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21145:1: ( ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) )
-            // InternalTableDSL.g:21146:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
+            // InternalTableDSL.g:20524:1: ( ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) )
+            // InternalTableDSL.g:20525:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
             {
-            // InternalTableDSL.g:21146:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
-            // InternalTableDSL.g:21147:2: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
+            // InternalTableDSL.g:20525:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
+            // InternalTableDSL.g:20526:2: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getParameterTypeAssignment_0()); 
             }
-            // InternalTableDSL.g:21148:2: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
-            int alt144=2;
-            int LA144_0 = input.LA(1);
+            // InternalTableDSL.g:20527:2: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
+            int alt142=2;
+            int LA142_0 = input.LA(1);
 
-            if ( (LA144_0==RULE_ID) ) {
-                int LA144_1 = input.LA(2);
+            if ( (LA142_0==RULE_ID) ) {
+                int LA142_1 = input.LA(2);
 
-                if ( (LA144_1==RULE_ID||LA144_1==32||LA144_1==46||LA144_1==140) ) {
-                    alt144=1;
+                if ( (LA142_1==RULE_ID||LA142_1==32||LA142_1==46||LA142_1==140) ) {
+                    alt142=1;
                 }
             }
-            else if ( (LA144_0==36||LA144_0==135) ) {
-                alt144=1;
+            else if ( (LA142_0==36||LA142_0==135) ) {
+                alt142=1;
             }
-            switch (alt144) {
+            switch (alt142) {
                 case 1 :
-                    // InternalTableDSL.g:21148:3: rule__JvmFormalParameter__ParameterTypeAssignment_0
+                    // InternalTableDSL.g:20527:3: rule__JvmFormalParameter__ParameterTypeAssignment_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__JvmFormalParameter__ParameterTypeAssignment_0();
@@ -69654,14 +67696,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__1"
-    // InternalTableDSL.g:21156:1: rule__JvmFormalParameter__Group__1 : rule__JvmFormalParameter__Group__1__Impl ;
+    // InternalTableDSL.g:20535:1: rule__JvmFormalParameter__Group__1 : rule__JvmFormalParameter__Group__1__Impl ;
     public final void rule__JvmFormalParameter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21160:1: ( rule__JvmFormalParameter__Group__1__Impl )
-            // InternalTableDSL.g:21161:2: rule__JvmFormalParameter__Group__1__Impl
+            // InternalTableDSL.g:20539:1: ( rule__JvmFormalParameter__Group__1__Impl )
+            // InternalTableDSL.g:20540:2: rule__JvmFormalParameter__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__Group__1__Impl();
@@ -69687,23 +67729,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__1__Impl"
-    // InternalTableDSL.g:21167:1: rule__JvmFormalParameter__Group__1__Impl : ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) ;
+    // InternalTableDSL.g:20546:1: rule__JvmFormalParameter__Group__1__Impl : ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) ;
     public final void rule__JvmFormalParameter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21171:1: ( ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) )
-            // InternalTableDSL.g:21172:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
+            // InternalTableDSL.g:20550:1: ( ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) )
+            // InternalTableDSL.g:20551:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
             {
-            // InternalTableDSL.g:21172:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
-            // InternalTableDSL.g:21173:2: ( rule__JvmFormalParameter__NameAssignment_1 )
+            // InternalTableDSL.g:20551:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
+            // InternalTableDSL.g:20552:2: ( rule__JvmFormalParameter__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getNameAssignment_1()); 
             }
-            // InternalTableDSL.g:21174:2: ( rule__JvmFormalParameter__NameAssignment_1 )
-            // InternalTableDSL.g:21174:3: rule__JvmFormalParameter__NameAssignment_1
+            // InternalTableDSL.g:20553:2: ( rule__JvmFormalParameter__NameAssignment_1 )
+            // InternalTableDSL.g:20553:3: rule__JvmFormalParameter__NameAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__NameAssignment_1();
@@ -69738,14 +67780,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__0"
-    // InternalTableDSL.g:21183:1: rule__FullJvmFormalParameter__Group__0 : rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 ;
+    // InternalTableDSL.g:20562:1: rule__FullJvmFormalParameter__Group__0 : rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 ;
     public final void rule__FullJvmFormalParameter__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21187:1: ( rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 )
-            // InternalTableDSL.g:21188:2: rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1
+            // InternalTableDSL.g:20566:1: ( rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 )
+            // InternalTableDSL.g:20567:2: rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1
             {
             pushFollow(FOLLOW_7);
             rule__FullJvmFormalParameter__Group__0__Impl();
@@ -69776,23 +67818,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__0__Impl"
-    // InternalTableDSL.g:21195:1: rule__FullJvmFormalParameter__Group__0__Impl : ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) ;
+    // InternalTableDSL.g:20574:1: rule__FullJvmFormalParameter__Group__0__Impl : ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) ;
     public final void rule__FullJvmFormalParameter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21199:1: ( ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) )
-            // InternalTableDSL.g:21200:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
+            // InternalTableDSL.g:20578:1: ( ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) )
+            // InternalTableDSL.g:20579:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
             {
-            // InternalTableDSL.g:21200:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
-            // InternalTableDSL.g:21201:2: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
+            // InternalTableDSL.g:20579:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
+            // InternalTableDSL.g:20580:2: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeAssignment_0()); 
             }
-            // InternalTableDSL.g:21202:2: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
-            // InternalTableDSL.g:21202:3: rule__FullJvmFormalParameter__ParameterTypeAssignment_0
+            // InternalTableDSL.g:20581:2: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
+            // InternalTableDSL.g:20581:3: rule__FullJvmFormalParameter__ParameterTypeAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__ParameterTypeAssignment_0();
@@ -69827,14 +67869,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__1"
-    // InternalTableDSL.g:21210:1: rule__FullJvmFormalParameter__Group__1 : rule__FullJvmFormalParameter__Group__1__Impl ;
+    // InternalTableDSL.g:20589:1: rule__FullJvmFormalParameter__Group__1 : rule__FullJvmFormalParameter__Group__1__Impl ;
     public final void rule__FullJvmFormalParameter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21214:1: ( rule__FullJvmFormalParameter__Group__1__Impl )
-            // InternalTableDSL.g:21215:2: rule__FullJvmFormalParameter__Group__1__Impl
+            // InternalTableDSL.g:20593:1: ( rule__FullJvmFormalParameter__Group__1__Impl )
+            // InternalTableDSL.g:20594:2: rule__FullJvmFormalParameter__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__Group__1__Impl();
@@ -69860,23 +67902,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__1__Impl"
-    // InternalTableDSL.g:21221:1: rule__FullJvmFormalParameter__Group__1__Impl : ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) ;
+    // InternalTableDSL.g:20600:1: rule__FullJvmFormalParameter__Group__1__Impl : ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) ;
     public final void rule__FullJvmFormalParameter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21225:1: ( ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) )
-            // InternalTableDSL.g:21226:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
+            // InternalTableDSL.g:20604:1: ( ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) )
+            // InternalTableDSL.g:20605:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
             {
-            // InternalTableDSL.g:21226:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
-            // InternalTableDSL.g:21227:2: ( rule__FullJvmFormalParameter__NameAssignment_1 )
+            // InternalTableDSL.g:20605:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
+            // InternalTableDSL.g:20606:2: ( rule__FullJvmFormalParameter__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getNameAssignment_1()); 
             }
-            // InternalTableDSL.g:21228:2: ( rule__FullJvmFormalParameter__NameAssignment_1 )
-            // InternalTableDSL.g:21228:3: rule__FullJvmFormalParameter__NameAssignment_1
+            // InternalTableDSL.g:20607:2: ( rule__FullJvmFormalParameter__NameAssignment_1 )
+            // InternalTableDSL.g:20607:3: rule__FullJvmFormalParameter__NameAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__NameAssignment_1();
@@ -69911,16 +67953,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group__0"
-    // InternalTableDSL.g:21237:1: rule__XFeatureCall__Group__0 : rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 ;
+    // InternalTableDSL.g:20616:1: rule__XFeatureCall__Group__0 : rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 ;
     public final void rule__XFeatureCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21241:1: ( rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 )
-            // InternalTableDSL.g:21242:2: rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1
+            // InternalTableDSL.g:20620:1: ( rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 )
+            // InternalTableDSL.g:20621:2: rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1
             {
-            pushFollow(FOLLOW_135);
+            pushFollow(FOLLOW_134);
             rule__XFeatureCall__Group__0__Impl();
 
             state._fsp--;
@@ -69949,23 +67991,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group__0__Impl"
-    // InternalTableDSL.g:21249:1: rule__XFeatureCall__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:20628:1: rule__XFeatureCall__Group__0__Impl : ( () ) ;
     public final void rule__XFeatureCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21253:1: ( ( () ) )
-            // InternalTableDSL.g:21254:1: ( () )
+            // InternalTableDSL.g:20632:1: ( ( () ) )
+            // InternalTableDSL.g:20633:1: ( () )
             {
-            // InternalTableDSL.g:21254:1: ( () )
-            // InternalTableDSL.g:21255:2: ()
+            // InternalTableDSL.g:20633:1: ( () )
+            // InternalTableDSL.g:20634:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getXFeatureCallAction_0()); 
             }
-            // InternalTableDSL.g:21256:2: ()
-            // InternalTableDSL.g:21256:3: 
+            // InternalTableDSL.g:20635:2: ()
+            // InternalTableDSL.g:20635:3: 
             {
             }
 
@@ -69990,16 +68032,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group__1"
-    // InternalTableDSL.g:21264:1: rule__XFeatureCall__Group__1 : rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 ;
+    // InternalTableDSL.g:20643:1: rule__XFeatureCall__Group__1 : rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 ;
     public final void rule__XFeatureCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21268:1: ( rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 )
-            // InternalTableDSL.g:21269:2: rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2
+            // InternalTableDSL.g:20647:1: ( rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 )
+            // InternalTableDSL.g:20648:2: rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2
             {
-            pushFollow(FOLLOW_135);
+            pushFollow(FOLLOW_134);
             rule__XFeatureCall__Group__1__Impl();
 
             state._fsp--;
@@ -70028,31 +68070,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group__1__Impl"
-    // InternalTableDSL.g:21276:1: rule__XFeatureCall__Group__1__Impl : ( ( rule__XFeatureCall__Group_1__0 )? ) ;
+    // InternalTableDSL.g:20655:1: rule__XFeatureCall__Group__1__Impl : ( ( rule__XFeatureCall__Group_1__0 )? ) ;
     public final void rule__XFeatureCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21280:1: ( ( ( rule__XFeatureCall__Group_1__0 )? ) )
-            // InternalTableDSL.g:21281:1: ( ( rule__XFeatureCall__Group_1__0 )? )
+            // InternalTableDSL.g:20659:1: ( ( ( rule__XFeatureCall__Group_1__0 )? ) )
+            // InternalTableDSL.g:20660:1: ( ( rule__XFeatureCall__Group_1__0 )? )
             {
-            // InternalTableDSL.g:21281:1: ( ( rule__XFeatureCall__Group_1__0 )? )
-            // InternalTableDSL.g:21282:2: ( rule__XFeatureCall__Group_1__0 )?
+            // InternalTableDSL.g:20660:1: ( ( rule__XFeatureCall__Group_1__0 )? )
+            // InternalTableDSL.g:20661:2: ( rule__XFeatureCall__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_1()); 
             }
-            // InternalTableDSL.g:21283:2: ( rule__XFeatureCall__Group_1__0 )?
-            int alt145=2;
-            int LA145_0 = input.LA(1);
+            // InternalTableDSL.g:20662:2: ( rule__XFeatureCall__Group_1__0 )?
+            int alt143=2;
+            int LA143_0 = input.LA(1);
 
-            if ( (LA145_0==32) ) {
-                alt145=1;
+            if ( (LA143_0==32) ) {
+                alt143=1;
             }
-            switch (alt145) {
+            switch (alt143) {
                 case 1 :
-                    // InternalTableDSL.g:21283:3: rule__XFeatureCall__Group_1__0
+                    // InternalTableDSL.g:20662:3: rule__XFeatureCall__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Group_1__0();
@@ -70090,16 +68132,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group__2"
-    // InternalTableDSL.g:21291:1: rule__XFeatureCall__Group__2 : rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 ;
+    // InternalTableDSL.g:20670:1: rule__XFeatureCall__Group__2 : rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 ;
     public final void rule__XFeatureCall__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21295:1: ( rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 )
-            // InternalTableDSL.g:21296:2: rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3
+            // InternalTableDSL.g:20674:1: ( rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 )
+            // InternalTableDSL.g:20675:2: rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3
             {
-            pushFollow(FOLLOW_136);
+            pushFollow(FOLLOW_135);
             rule__XFeatureCall__Group__2__Impl();
 
             state._fsp--;
@@ -70128,23 +68170,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group__2__Impl"
-    // InternalTableDSL.g:21303:1: rule__XFeatureCall__Group__2__Impl : ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) ;
+    // InternalTableDSL.g:20682:1: rule__XFeatureCall__Group__2__Impl : ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) ;
     public final void rule__XFeatureCall__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21307:1: ( ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) )
-            // InternalTableDSL.g:21308:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
+            // InternalTableDSL.g:20686:1: ( ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) )
+            // InternalTableDSL.g:20687:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
             {
-            // InternalTableDSL.g:21308:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
-            // InternalTableDSL.g:21309:2: ( rule__XFeatureCall__FeatureAssignment_2 )
+            // InternalTableDSL.g:20687:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
+            // InternalTableDSL.g:20688:2: ( rule__XFeatureCall__FeatureAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureAssignment_2()); 
             }
-            // InternalTableDSL.g:21310:2: ( rule__XFeatureCall__FeatureAssignment_2 )
-            // InternalTableDSL.g:21310:3: rule__XFeatureCall__FeatureAssignment_2
+            // InternalTableDSL.g:20689:2: ( rule__XFeatureCall__FeatureAssignment_2 )
+            // InternalTableDSL.g:20689:3: rule__XFeatureCall__FeatureAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__FeatureAssignment_2();
@@ -70179,16 +68221,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group__3"
-    // InternalTableDSL.g:21318:1: rule__XFeatureCall__Group__3 : rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 ;
+    // InternalTableDSL.g:20697:1: rule__XFeatureCall__Group__3 : rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 ;
     public final void rule__XFeatureCall__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21322:1: ( rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 )
-            // InternalTableDSL.g:21323:2: rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4
+            // InternalTableDSL.g:20701:1: ( rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 )
+            // InternalTableDSL.g:20702:2: rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4
             {
-            pushFollow(FOLLOW_136);
+            pushFollow(FOLLOW_135);
             rule__XFeatureCall__Group__3__Impl();
 
             state._fsp--;
@@ -70217,27 +68259,27 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group__3__Impl"
-    // InternalTableDSL.g:21330:1: rule__XFeatureCall__Group__3__Impl : ( ( rule__XFeatureCall__Group_3__0 )? ) ;
+    // InternalTableDSL.g:20709:1: rule__XFeatureCall__Group__3__Impl : ( ( rule__XFeatureCall__Group_3__0 )? ) ;
     public final void rule__XFeatureCall__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21334:1: ( ( ( rule__XFeatureCall__Group_3__0 )? ) )
-            // InternalTableDSL.g:21335:1: ( ( rule__XFeatureCall__Group_3__0 )? )
+            // InternalTableDSL.g:20713:1: ( ( ( rule__XFeatureCall__Group_3__0 )? ) )
+            // InternalTableDSL.g:20714:1: ( ( rule__XFeatureCall__Group_3__0 )? )
             {
-            // InternalTableDSL.g:21335:1: ( ( rule__XFeatureCall__Group_3__0 )? )
-            // InternalTableDSL.g:21336:2: ( rule__XFeatureCall__Group_3__0 )?
+            // InternalTableDSL.g:20714:1: ( ( rule__XFeatureCall__Group_3__0 )? )
+            // InternalTableDSL.g:20715:2: ( rule__XFeatureCall__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_3()); 
             }
-            // InternalTableDSL.g:21337:2: ( rule__XFeatureCall__Group_3__0 )?
-            int alt146=2;
-            alt146 = dfa146.predict(input);
-            switch (alt146) {
+            // InternalTableDSL.g:20716:2: ( rule__XFeatureCall__Group_3__0 )?
+            int alt144=2;
+            alt144 = dfa144.predict(input);
+            switch (alt144) {
                 case 1 :
-                    // InternalTableDSL.g:21337:3: rule__XFeatureCall__Group_3__0
+                    // InternalTableDSL.g:20716:3: rule__XFeatureCall__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Group_3__0();
@@ -70275,14 +68317,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group__4"
-    // InternalTableDSL.g:21345:1: rule__XFeatureCall__Group__4 : rule__XFeatureCall__Group__4__Impl ;
+    // InternalTableDSL.g:20724:1: rule__XFeatureCall__Group__4 : rule__XFeatureCall__Group__4__Impl ;
     public final void rule__XFeatureCall__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21349:1: ( rule__XFeatureCall__Group__4__Impl )
-            // InternalTableDSL.g:21350:2: rule__XFeatureCall__Group__4__Impl
+            // InternalTableDSL.g:20728:1: ( rule__XFeatureCall__Group__4__Impl )
+            // InternalTableDSL.g:20729:2: rule__XFeatureCall__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__4__Impl();
@@ -70308,27 +68350,27 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group__4__Impl"
-    // InternalTableDSL.g:21356:1: rule__XFeatureCall__Group__4__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) ;
+    // InternalTableDSL.g:20735:1: rule__XFeatureCall__Group__4__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) ;
     public final void rule__XFeatureCall__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21360:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) )
-            // InternalTableDSL.g:21361:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
+            // InternalTableDSL.g:20739:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) )
+            // InternalTableDSL.g:20740:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
             {
-            // InternalTableDSL.g:21361:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
-            // InternalTableDSL.g:21362:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
+            // InternalTableDSL.g:20740:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
+            // InternalTableDSL.g:20741:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_4()); 
             }
-            // InternalTableDSL.g:21363:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
-            int alt147=2;
-            alt147 = dfa147.predict(input);
-            switch (alt147) {
+            // InternalTableDSL.g:20742:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
+            int alt145=2;
+            alt145 = dfa145.predict(input);
+            switch (alt145) {
                 case 1 :
-                    // InternalTableDSL.g:21363:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
+                    // InternalTableDSL.g:20742:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
                     {
                     pushFollow(FOLLOW_2);
                     rule__XFeatureCall__FeatureCallArgumentsAssignment_4();
@@ -70366,16 +68408,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__0"
-    // InternalTableDSL.g:21372:1: rule__XFeatureCall__Group_1__0 : rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 ;
+    // InternalTableDSL.g:20751:1: rule__XFeatureCall__Group_1__0 : rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 ;
     public final void rule__XFeatureCall__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21376:1: ( rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 )
-            // InternalTableDSL.g:21377:2: rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1
+            // InternalTableDSL.g:20755:1: ( rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 )
+            // InternalTableDSL.g:20756:2: rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1
             {
-            pushFollow(FOLLOW_137);
+            pushFollow(FOLLOW_136);
             rule__XFeatureCall__Group_1__0__Impl();
 
             state._fsp--;
@@ -70404,17 +68446,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__0__Impl"
-    // InternalTableDSL.g:21384:1: rule__XFeatureCall__Group_1__0__Impl : ( '<' ) ;
+    // InternalTableDSL.g:20763:1: rule__XFeatureCall__Group_1__0__Impl : ( '<' ) ;
     public final void rule__XFeatureCall__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21388:1: ( ( '<' ) )
-            // InternalTableDSL.g:21389:1: ( '<' )
+            // InternalTableDSL.g:20767:1: ( ( '<' ) )
+            // InternalTableDSL.g:20768:1: ( '<' )
             {
-            // InternalTableDSL.g:21389:1: ( '<' )
-            // InternalTableDSL.g:21390:2: '<'
+            // InternalTableDSL.g:20768:1: ( '<' )
+            // InternalTableDSL.g:20769:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0()); 
@@ -70445,16 +68487,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__1"
-    // InternalTableDSL.g:21399:1: rule__XFeatureCall__Group_1__1 : rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 ;
+    // InternalTableDSL.g:20778:1: rule__XFeatureCall__Group_1__1 : rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 ;
     public final void rule__XFeatureCall__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21403:1: ( rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 )
-            // InternalTableDSL.g:21404:2: rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2
+            // InternalTableDSL.g:20782:1: ( rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 )
+            // InternalTableDSL.g:20783:2: rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2
             {
-            pushFollow(FOLLOW_138);
+            pushFollow(FOLLOW_137);
             rule__XFeatureCall__Group_1__1__Impl();
 
             state._fsp--;
@@ -70483,23 +68525,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__1__Impl"
-    // InternalTableDSL.g:21411:1: rule__XFeatureCall__Group_1__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) ;
+    // InternalTableDSL.g:20790:1: rule__XFeatureCall__Group_1__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) ;
     public final void rule__XFeatureCall__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21415:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) )
-            // InternalTableDSL.g:21416:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
+            // InternalTableDSL.g:20794:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) )
+            // InternalTableDSL.g:20795:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
             {
-            // InternalTableDSL.g:21416:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
-            // InternalTableDSL.g:21417:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
+            // InternalTableDSL.g:20795:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
+            // InternalTableDSL.g:20796:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsAssignment_1_1()); 
             }
-            // InternalTableDSL.g:21418:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
-            // InternalTableDSL.g:21418:3: rule__XFeatureCall__TypeArgumentsAssignment_1_1
+            // InternalTableDSL.g:20797:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
+            // InternalTableDSL.g:20797:3: rule__XFeatureCall__TypeArgumentsAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__TypeArgumentsAssignment_1_1();
@@ -70534,16 +68576,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__2"
-    // InternalTableDSL.g:21426:1: rule__XFeatureCall__Group_1__2 : rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 ;
+    // InternalTableDSL.g:20805:1: rule__XFeatureCall__Group_1__2 : rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 ;
     public final void rule__XFeatureCall__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21430:1: ( rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 )
-            // InternalTableDSL.g:21431:2: rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3
+            // InternalTableDSL.g:20809:1: ( rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 )
+            // InternalTableDSL.g:20810:2: rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3
             {
-            pushFollow(FOLLOW_138);
+            pushFollow(FOLLOW_137);
             rule__XFeatureCall__Group_1__2__Impl();
 
             state._fsp--;
@@ -70572,37 +68614,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__2__Impl"
-    // InternalTableDSL.g:21438:1: rule__XFeatureCall__Group_1__2__Impl : ( ( rule__XFeatureCall__Group_1_2__0 )* ) ;
+    // InternalTableDSL.g:20817:1: rule__XFeatureCall__Group_1__2__Impl : ( ( rule__XFeatureCall__Group_1_2__0 )* ) ;
     public final void rule__XFeatureCall__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21442:1: ( ( ( rule__XFeatureCall__Group_1_2__0 )* ) )
-            // InternalTableDSL.g:21443:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
+            // InternalTableDSL.g:20821:1: ( ( ( rule__XFeatureCall__Group_1_2__0 )* ) )
+            // InternalTableDSL.g:20822:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
             {
-            // InternalTableDSL.g:21443:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
-            // InternalTableDSL.g:21444:2: ( rule__XFeatureCall__Group_1_2__0 )*
+            // InternalTableDSL.g:20822:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
+            // InternalTableDSL.g:20823:2: ( rule__XFeatureCall__Group_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_1_2()); 
             }
-            // InternalTableDSL.g:21445:2: ( rule__XFeatureCall__Group_1_2__0 )*
-            loop148:
+            // InternalTableDSL.g:20824:2: ( rule__XFeatureCall__Group_1_2__0 )*
+            loop146:
             do {
-                int alt148=2;
-                int LA148_0 = input.LA(1);
+                int alt146=2;
+                int LA146_0 = input.LA(1);
 
-                if ( (LA148_0==137) ) {
-                    alt148=1;
+                if ( (LA146_0==137) ) {
+                    alt146=1;
                 }
 
 
-                switch (alt148) {
+                switch (alt146) {
             	case 1 :
-            	    // InternalTableDSL.g:21445:3: rule__XFeatureCall__Group_1_2__0
+            	    // InternalTableDSL.g:20824:3: rule__XFeatureCall__Group_1_2__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XFeatureCall__Group_1_2__0();
 
             	    state._fsp--;
@@ -70612,7 +68654,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop148;
+            	    break loop146;
                 }
             } while (true);
 
@@ -70641,14 +68683,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__3"
-    // InternalTableDSL.g:21453:1: rule__XFeatureCall__Group_1__3 : rule__XFeatureCall__Group_1__3__Impl ;
+    // InternalTableDSL.g:20832:1: rule__XFeatureCall__Group_1__3 : rule__XFeatureCall__Group_1__3__Impl ;
     public final void rule__XFeatureCall__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21457:1: ( rule__XFeatureCall__Group_1__3__Impl )
-            // InternalTableDSL.g:21458:2: rule__XFeatureCall__Group_1__3__Impl
+            // InternalTableDSL.g:20836:1: ( rule__XFeatureCall__Group_1__3__Impl )
+            // InternalTableDSL.g:20837:2: rule__XFeatureCall__Group_1__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1__3__Impl();
@@ -70674,17 +68716,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__3__Impl"
-    // InternalTableDSL.g:21464:1: rule__XFeatureCall__Group_1__3__Impl : ( '>' ) ;
+    // InternalTableDSL.g:20843:1: rule__XFeatureCall__Group_1__3__Impl : ( '>' ) ;
     public final void rule__XFeatureCall__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21468:1: ( ( '>' ) )
-            // InternalTableDSL.g:21469:1: ( '>' )
+            // InternalTableDSL.g:20847:1: ( ( '>' ) )
+            // InternalTableDSL.g:20848:1: ( '>' )
             {
-            // InternalTableDSL.g:21469:1: ( '>' )
-            // InternalTableDSL.g:21470:2: '>'
+            // InternalTableDSL.g:20848:1: ( '>' )
+            // InternalTableDSL.g:20849:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3()); 
@@ -70715,16 +68757,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__0"
-    // InternalTableDSL.g:21480:1: rule__XFeatureCall__Group_1_2__0 : rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 ;
+    // InternalTableDSL.g:20859:1: rule__XFeatureCall__Group_1_2__0 : rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 ;
     public final void rule__XFeatureCall__Group_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21484:1: ( rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 )
-            // InternalTableDSL.g:21485:2: rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1
+            // InternalTableDSL.g:20863:1: ( rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 )
+            // InternalTableDSL.g:20864:2: rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1
             {
-            pushFollow(FOLLOW_137);
+            pushFollow(FOLLOW_136);
             rule__XFeatureCall__Group_1_2__0__Impl();
 
             state._fsp--;
@@ -70753,17 +68795,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__0__Impl"
-    // InternalTableDSL.g:21492:1: rule__XFeatureCall__Group_1_2__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:20871:1: rule__XFeatureCall__Group_1_2__0__Impl : ( ',' ) ;
     public final void rule__XFeatureCall__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21496:1: ( ( ',' ) )
-            // InternalTableDSL.g:21497:1: ( ',' )
+            // InternalTableDSL.g:20875:1: ( ( ',' ) )
+            // InternalTableDSL.g:20876:1: ( ',' )
             {
-            // InternalTableDSL.g:21497:1: ( ',' )
-            // InternalTableDSL.g:21498:2: ','
+            // InternalTableDSL.g:20876:1: ( ',' )
+            // InternalTableDSL.g:20877:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0()); 
@@ -70794,14 +68836,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__1"
-    // InternalTableDSL.g:21507:1: rule__XFeatureCall__Group_1_2__1 : rule__XFeatureCall__Group_1_2__1__Impl ;
+    // InternalTableDSL.g:20886:1: rule__XFeatureCall__Group_1_2__1 : rule__XFeatureCall__Group_1_2__1__Impl ;
     public final void rule__XFeatureCall__Group_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21511:1: ( rule__XFeatureCall__Group_1_2__1__Impl )
-            // InternalTableDSL.g:21512:2: rule__XFeatureCall__Group_1_2__1__Impl
+            // InternalTableDSL.g:20890:1: ( rule__XFeatureCall__Group_1_2__1__Impl )
+            // InternalTableDSL.g:20891:2: rule__XFeatureCall__Group_1_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1_2__1__Impl();
@@ -70827,23 +68869,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__1__Impl"
-    // InternalTableDSL.g:21518:1: rule__XFeatureCall__Group_1_2__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) ;
+    // InternalTableDSL.g:20897:1: rule__XFeatureCall__Group_1_2__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) ;
     public final void rule__XFeatureCall__Group_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21522:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) )
-            // InternalTableDSL.g:21523:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
+            // InternalTableDSL.g:20901:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) )
+            // InternalTableDSL.g:20902:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
             {
-            // InternalTableDSL.g:21523:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
-            // InternalTableDSL.g:21524:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
+            // InternalTableDSL.g:20902:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
+            // InternalTableDSL.g:20903:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsAssignment_1_2_1()); 
             }
-            // InternalTableDSL.g:21525:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
-            // InternalTableDSL.g:21525:3: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1
+            // InternalTableDSL.g:20904:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
+            // InternalTableDSL.g:20904:3: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__TypeArgumentsAssignment_1_2_1();
@@ -70878,16 +68920,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__0"
-    // InternalTableDSL.g:21534:1: rule__XFeatureCall__Group_3__0 : rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 ;
+    // InternalTableDSL.g:20913:1: rule__XFeatureCall__Group_3__0 : rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 ;
     public final void rule__XFeatureCall__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21538:1: ( rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 )
-            // InternalTableDSL.g:21539:2: rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1
+            // InternalTableDSL.g:20917:1: ( rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 )
+            // InternalTableDSL.g:20918:2: rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1
             {
-            pushFollow(FOLLOW_139);
+            pushFollow(FOLLOW_138);
             rule__XFeatureCall__Group_3__0__Impl();
 
             state._fsp--;
@@ -70916,23 +68958,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__0__Impl"
-    // InternalTableDSL.g:21546:1: rule__XFeatureCall__Group_3__0__Impl : ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) ;
+    // InternalTableDSL.g:20925:1: rule__XFeatureCall__Group_3__0__Impl : ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) ;
     public final void rule__XFeatureCall__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21550:1: ( ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) )
-            // InternalTableDSL.g:21551:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
+            // InternalTableDSL.g:20929:1: ( ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) )
+            // InternalTableDSL.g:20930:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
             {
-            // InternalTableDSL.g:21551:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
-            // InternalTableDSL.g:21552:2: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
+            // InternalTableDSL.g:20930:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
+            // InternalTableDSL.g:20931:2: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallAssignment_3_0()); 
             }
-            // InternalTableDSL.g:21553:2: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
-            // InternalTableDSL.g:21553:3: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0
+            // InternalTableDSL.g:20932:2: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
+            // InternalTableDSL.g:20932:3: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__ExplicitOperationCallAssignment_3_0();
@@ -70967,16 +69009,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__1"
-    // InternalTableDSL.g:21561:1: rule__XFeatureCall__Group_3__1 : rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 ;
+    // InternalTableDSL.g:20940:1: rule__XFeatureCall__Group_3__1 : rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 ;
     public final void rule__XFeatureCall__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21565:1: ( rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 )
-            // InternalTableDSL.g:21566:2: rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2
+            // InternalTableDSL.g:20944:1: ( rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 )
+            // InternalTableDSL.g:20945:2: rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2
             {
-            pushFollow(FOLLOW_139);
+            pushFollow(FOLLOW_138);
             rule__XFeatureCall__Group_3__1__Impl();
 
             state._fsp--;
@@ -71005,31 +69047,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__1__Impl"
-    // InternalTableDSL.g:21573:1: rule__XFeatureCall__Group_3__1__Impl : ( ( rule__XFeatureCall__Alternatives_3_1 )? ) ;
+    // InternalTableDSL.g:20952:1: rule__XFeatureCall__Group_3__1__Impl : ( ( rule__XFeatureCall__Alternatives_3_1 )? ) ;
     public final void rule__XFeatureCall__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21577:1: ( ( ( rule__XFeatureCall__Alternatives_3_1 )? ) )
-            // InternalTableDSL.g:21578:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
+            // InternalTableDSL.g:20956:1: ( ( ( rule__XFeatureCall__Alternatives_3_1 )? ) )
+            // InternalTableDSL.g:20957:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
             {
-            // InternalTableDSL.g:21578:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
-            // InternalTableDSL.g:21579:2: ( rule__XFeatureCall__Alternatives_3_1 )?
+            // InternalTableDSL.g:20957:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
+            // InternalTableDSL.g:20958:2: ( rule__XFeatureCall__Alternatives_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getAlternatives_3_1()); 
             }
-            // InternalTableDSL.g:21580:2: ( rule__XFeatureCall__Alternatives_3_1 )?
-            int alt149=2;
-            int LA149_0 = input.LA(1);
+            // InternalTableDSL.g:20959:2: ( rule__XFeatureCall__Alternatives_3_1 )?
+            int alt147=2;
+            int LA147_0 = input.LA(1);
 
-            if ( ((LA149_0>=RULE_STRING && LA149_0<=RULE_DECIMAL)||(LA149_0>=19 && LA149_0<=20)||LA149_0==32||LA149_0==36||LA149_0==43||(LA149_0>=48 && LA149_0<=53)||LA149_0==75||LA149_0==135||(LA149_0>=139 && LA149_0<=140)||LA149_0==142||LA149_0==144||(LA149_0>=147 && LA149_0<=155)||LA149_0==157||LA149_0==182||LA149_0==184) ) {
-                alt149=1;
+            if ( ((LA147_0>=RULE_STRING && LA147_0<=RULE_DECIMAL)||(LA147_0>=19 && LA147_0<=20)||LA147_0==32||LA147_0==36||LA147_0==43||(LA147_0>=48 && LA147_0<=53)||LA147_0==75||LA147_0==135||(LA147_0>=139 && LA147_0<=140)||LA147_0==142||LA147_0==144||(LA147_0>=147 && LA147_0<=155)||LA147_0==157||LA147_0==179||LA147_0==181) ) {
+                alt147=1;
             }
-            switch (alt149) {
+            switch (alt147) {
                 case 1 :
-                    // InternalTableDSL.g:21580:3: rule__XFeatureCall__Alternatives_3_1
+                    // InternalTableDSL.g:20959:3: rule__XFeatureCall__Alternatives_3_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Alternatives_3_1();
@@ -71067,14 +69109,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__2"
-    // InternalTableDSL.g:21588:1: rule__XFeatureCall__Group_3__2 : rule__XFeatureCall__Group_3__2__Impl ;
+    // InternalTableDSL.g:20967:1: rule__XFeatureCall__Group_3__2 : rule__XFeatureCall__Group_3__2__Impl ;
     public final void rule__XFeatureCall__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21592:1: ( rule__XFeatureCall__Group_3__2__Impl )
-            // InternalTableDSL.g:21593:2: rule__XFeatureCall__Group_3__2__Impl
+            // InternalTableDSL.g:20971:1: ( rule__XFeatureCall__Group_3__2__Impl )
+            // InternalTableDSL.g:20972:2: rule__XFeatureCall__Group_3__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3__2__Impl();
@@ -71100,17 +69142,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__2__Impl"
-    // InternalTableDSL.g:21599:1: rule__XFeatureCall__Group_3__2__Impl : ( ')' ) ;
+    // InternalTableDSL.g:20978:1: rule__XFeatureCall__Group_3__2__Impl : ( ')' ) ;
     public final void rule__XFeatureCall__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21603:1: ( ( ')' ) )
-            // InternalTableDSL.g:21604:1: ( ')' )
+            // InternalTableDSL.g:20982:1: ( ( ')' ) )
+            // InternalTableDSL.g:20983:1: ( ')' )
             {
-            // InternalTableDSL.g:21604:1: ( ')' )
-            // InternalTableDSL.g:21605:2: ')'
+            // InternalTableDSL.g:20983:1: ( ')' )
+            // InternalTableDSL.g:20984:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2()); 
@@ -71141,16 +69183,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__0"
-    // InternalTableDSL.g:21615:1: rule__XFeatureCall__Group_3_1_1__0 : rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 ;
+    // InternalTableDSL.g:20994:1: rule__XFeatureCall__Group_3_1_1__0 : rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 ;
     public final void rule__XFeatureCall__Group_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21619:1: ( rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 )
-            // InternalTableDSL.g:21620:2: rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1
+            // InternalTableDSL.g:20998:1: ( rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 )
+            // InternalTableDSL.g:20999:2: rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_97);
             rule__XFeatureCall__Group_3_1_1__0__Impl();
 
             state._fsp--;
@@ -71179,23 +69221,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__0__Impl"
-    // InternalTableDSL.g:21627:1: rule__XFeatureCall__Group_3_1_1__0__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) ;
+    // InternalTableDSL.g:21006:1: rule__XFeatureCall__Group_3_1_1__0__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) ;
     public final void rule__XFeatureCall__Group_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21631:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) )
-            // InternalTableDSL.g:21632:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
+            // InternalTableDSL.g:21010:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) )
+            // InternalTableDSL.g:21011:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
             {
-            // InternalTableDSL.g:21632:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
-            // InternalTableDSL.g:21633:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
+            // InternalTableDSL.g:21011:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
+            // InternalTableDSL.g:21012:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_1_0()); 
             }
-            // InternalTableDSL.g:21634:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
-            // InternalTableDSL.g:21634:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0
+            // InternalTableDSL.g:21013:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
+            // InternalTableDSL.g:21013:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0();
@@ -71230,14 +69272,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__1"
-    // InternalTableDSL.g:21642:1: rule__XFeatureCall__Group_3_1_1__1 : rule__XFeatureCall__Group_3_1_1__1__Impl ;
+    // InternalTableDSL.g:21021:1: rule__XFeatureCall__Group_3_1_1__1 : rule__XFeatureCall__Group_3_1_1__1__Impl ;
     public final void rule__XFeatureCall__Group_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21646:1: ( rule__XFeatureCall__Group_3_1_1__1__Impl )
-            // InternalTableDSL.g:21647:2: rule__XFeatureCall__Group_3_1_1__1__Impl
+            // InternalTableDSL.g:21025:1: ( rule__XFeatureCall__Group_3_1_1__1__Impl )
+            // InternalTableDSL.g:21026:2: rule__XFeatureCall__Group_3_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1__1__Impl();
@@ -71263,37 +69305,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__1__Impl"
-    // InternalTableDSL.g:21653:1: rule__XFeatureCall__Group_3_1_1__1__Impl : ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) ;
+    // InternalTableDSL.g:21032:1: rule__XFeatureCall__Group_3_1_1__1__Impl : ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) ;
     public final void rule__XFeatureCall__Group_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21657:1: ( ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) )
-            // InternalTableDSL.g:21658:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
+            // InternalTableDSL.g:21036:1: ( ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) )
+            // InternalTableDSL.g:21037:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
             {
-            // InternalTableDSL.g:21658:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
-            // InternalTableDSL.g:21659:2: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
+            // InternalTableDSL.g:21037:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
+            // InternalTableDSL.g:21038:2: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_3_1_1_1()); 
             }
-            // InternalTableDSL.g:21660:2: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
-            loop150:
+            // InternalTableDSL.g:21039:2: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
+            loop148:
             do {
-                int alt150=2;
-                int LA150_0 = input.LA(1);
+                int alt148=2;
+                int LA148_0 = input.LA(1);
 
-                if ( (LA150_0==137) ) {
-                    alt150=1;
+                if ( (LA148_0==137) ) {
+                    alt148=1;
                 }
 
 
-                switch (alt150) {
+                switch (alt148) {
             	case 1 :
-            	    // InternalTableDSL.g:21660:3: rule__XFeatureCall__Group_3_1_1_1__0
+            	    // InternalTableDSL.g:21039:3: rule__XFeatureCall__Group_3_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XFeatureCall__Group_3_1_1_1__0();
 
             	    state._fsp--;
@@ -71303,7 +69345,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop150;
+            	    break loop148;
                 }
             } while (true);
 
@@ -71332,16 +69374,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__0"
-    // InternalTableDSL.g:21669:1: rule__XFeatureCall__Group_3_1_1_1__0 : rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 ;
+    // InternalTableDSL.g:21048:1: rule__XFeatureCall__Group_3_1_1_1__0 : rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 ;
     public final void rule__XFeatureCall__Group_3_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21673:1: ( rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 )
-            // InternalTableDSL.g:21674:2: rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1
+            // InternalTableDSL.g:21052:1: ( rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 )
+            // InternalTableDSL.g:21053:2: rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XFeatureCall__Group_3_1_1_1__0__Impl();
 
             state._fsp--;
@@ -71370,17 +69412,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__0__Impl"
-    // InternalTableDSL.g:21681:1: rule__XFeatureCall__Group_3_1_1_1__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:21060:1: rule__XFeatureCall__Group_3_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XFeatureCall__Group_3_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21685:1: ( ( ',' ) )
-            // InternalTableDSL.g:21686:1: ( ',' )
+            // InternalTableDSL.g:21064:1: ( ( ',' ) )
+            // InternalTableDSL.g:21065:1: ( ',' )
             {
-            // InternalTableDSL.g:21686:1: ( ',' )
-            // InternalTableDSL.g:21687:2: ','
+            // InternalTableDSL.g:21065:1: ( ',' )
+            // InternalTableDSL.g:21066:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0()); 
@@ -71411,14 +69453,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__1"
-    // InternalTableDSL.g:21696:1: rule__XFeatureCall__Group_3_1_1_1__1 : rule__XFeatureCall__Group_3_1_1_1__1__Impl ;
+    // InternalTableDSL.g:21075:1: rule__XFeatureCall__Group_3_1_1_1__1 : rule__XFeatureCall__Group_3_1_1_1__1__Impl ;
     public final void rule__XFeatureCall__Group_3_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21700:1: ( rule__XFeatureCall__Group_3_1_1_1__1__Impl )
-            // InternalTableDSL.g:21701:2: rule__XFeatureCall__Group_3_1_1_1__1__Impl
+            // InternalTableDSL.g:21079:1: ( rule__XFeatureCall__Group_3_1_1_1__1__Impl )
+            // InternalTableDSL.g:21080:2: rule__XFeatureCall__Group_3_1_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1_1__1__Impl();
@@ -71444,23 +69486,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__1__Impl"
-    // InternalTableDSL.g:21707:1: rule__XFeatureCall__Group_3_1_1_1__1__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) ;
+    // InternalTableDSL.g:21086:1: rule__XFeatureCall__Group_3_1_1_1__1__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) ;
     public final void rule__XFeatureCall__Group_3_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21711:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) )
-            // InternalTableDSL.g:21712:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
+            // InternalTableDSL.g:21090:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) )
+            // InternalTableDSL.g:21091:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
             {
-            // InternalTableDSL.g:21712:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
-            // InternalTableDSL.g:21713:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
+            // InternalTableDSL.g:21091:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
+            // InternalTableDSL.g:21092:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_1_1_1()); 
             }
-            // InternalTableDSL.g:21714:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
-            // InternalTableDSL.g:21714:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1
+            // InternalTableDSL.g:21093:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
+            // InternalTableDSL.g:21093:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1();
@@ -71495,16 +69537,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group__0"
-    // InternalTableDSL.g:21723:1: rule__XConstructorCall__Group__0 : rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 ;
+    // InternalTableDSL.g:21102:1: rule__XConstructorCall__Group__0 : rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 ;
     public final void rule__XConstructorCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21727:1: ( rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 )
-            // InternalTableDSL.g:21728:2: rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1
+            // InternalTableDSL.g:21106:1: ( rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 )
+            // InternalTableDSL.g:21107:2: rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1
             {
-            pushFollow(FOLLOW_162);
+            pushFollow(FOLLOW_161);
             rule__XConstructorCall__Group__0__Impl();
 
             state._fsp--;
@@ -71533,23 +69575,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group__0__Impl"
-    // InternalTableDSL.g:21735:1: rule__XConstructorCall__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:21114:1: rule__XConstructorCall__Group__0__Impl : ( () ) ;
     public final void rule__XConstructorCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21739:1: ( ( () ) )
-            // InternalTableDSL.g:21740:1: ( () )
+            // InternalTableDSL.g:21118:1: ( ( () ) )
+            // InternalTableDSL.g:21119:1: ( () )
             {
-            // InternalTableDSL.g:21740:1: ( () )
-            // InternalTableDSL.g:21741:2: ()
+            // InternalTableDSL.g:21119:1: ( () )
+            // InternalTableDSL.g:21120:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getXConstructorCallAction_0()); 
             }
-            // InternalTableDSL.g:21742:2: ()
-            // InternalTableDSL.g:21742:3: 
+            // InternalTableDSL.g:21121:2: ()
+            // InternalTableDSL.g:21121:3: 
             {
             }
 
@@ -71574,14 +69616,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group__1"
-    // InternalTableDSL.g:21750:1: rule__XConstructorCall__Group__1 : rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 ;
+    // InternalTableDSL.g:21129:1: rule__XConstructorCall__Group__1 : rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 ;
     public final void rule__XConstructorCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21754:1: ( rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 )
-            // InternalTableDSL.g:21755:2: rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2
+            // InternalTableDSL.g:21133:1: ( rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 )
+            // InternalTableDSL.g:21134:2: rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2
             {
             pushFollow(FOLLOW_7);
             rule__XConstructorCall__Group__1__Impl();
@@ -71612,17 +69654,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group__1__Impl"
-    // InternalTableDSL.g:21762:1: rule__XConstructorCall__Group__1__Impl : ( 'new' ) ;
+    // InternalTableDSL.g:21141:1: rule__XConstructorCall__Group__1__Impl : ( 'new' ) ;
     public final void rule__XConstructorCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21766:1: ( ( 'new' ) )
-            // InternalTableDSL.g:21767:1: ( 'new' )
+            // InternalTableDSL.g:21145:1: ( ( 'new' ) )
+            // InternalTableDSL.g:21146:1: ( 'new' )
             {
-            // InternalTableDSL.g:21767:1: ( 'new' )
-            // InternalTableDSL.g:21768:2: 'new'
+            // InternalTableDSL.g:21146:1: ( 'new' )
+            // InternalTableDSL.g:21147:2: 'new'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getNewKeyword_1()); 
@@ -71653,16 +69695,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group__2"
-    // InternalTableDSL.g:21777:1: rule__XConstructorCall__Group__2 : rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 ;
+    // InternalTableDSL.g:21156:1: rule__XConstructorCall__Group__2 : rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 ;
     public final void rule__XConstructorCall__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21781:1: ( rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 )
-            // InternalTableDSL.g:21782:2: rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3
+            // InternalTableDSL.g:21160:1: ( rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 )
+            // InternalTableDSL.g:21161:2: rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3
             {
-            pushFollow(FOLLOW_163);
+            pushFollow(FOLLOW_162);
             rule__XConstructorCall__Group__2__Impl();
 
             state._fsp--;
@@ -71691,23 +69733,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group__2__Impl"
-    // InternalTableDSL.g:21789:1: rule__XConstructorCall__Group__2__Impl : ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) ;
+    // InternalTableDSL.g:21168:1: rule__XConstructorCall__Group__2__Impl : ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) ;
     public final void rule__XConstructorCall__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21793:1: ( ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) )
-            // InternalTableDSL.g:21794:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
+            // InternalTableDSL.g:21172:1: ( ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) )
+            // InternalTableDSL.g:21173:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
             {
-            // InternalTableDSL.g:21794:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
-            // InternalTableDSL.g:21795:2: ( rule__XConstructorCall__ConstructorAssignment_2 )
+            // InternalTableDSL.g:21173:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
+            // InternalTableDSL.g:21174:2: ( rule__XConstructorCall__ConstructorAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorAssignment_2()); 
             }
-            // InternalTableDSL.g:21796:2: ( rule__XConstructorCall__ConstructorAssignment_2 )
-            // InternalTableDSL.g:21796:3: rule__XConstructorCall__ConstructorAssignment_2
+            // InternalTableDSL.g:21175:2: ( rule__XConstructorCall__ConstructorAssignment_2 )
+            // InternalTableDSL.g:21175:3: rule__XConstructorCall__ConstructorAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__ConstructorAssignment_2();
@@ -71742,16 +69784,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group__3"
-    // InternalTableDSL.g:21804:1: rule__XConstructorCall__Group__3 : rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 ;
+    // InternalTableDSL.g:21183:1: rule__XConstructorCall__Group__3 : rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 ;
     public final void rule__XConstructorCall__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21808:1: ( rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 )
-            // InternalTableDSL.g:21809:2: rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4
+            // InternalTableDSL.g:21187:1: ( rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 )
+            // InternalTableDSL.g:21188:2: rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4
             {
-            pushFollow(FOLLOW_163);
+            pushFollow(FOLLOW_162);
             rule__XConstructorCall__Group__3__Impl();
 
             state._fsp--;
@@ -71780,27 +69822,27 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group__3__Impl"
-    // InternalTableDSL.g:21816:1: rule__XConstructorCall__Group__3__Impl : ( ( rule__XConstructorCall__Group_3__0 )? ) ;
+    // InternalTableDSL.g:21195:1: rule__XConstructorCall__Group__3__Impl : ( ( rule__XConstructorCall__Group_3__0 )? ) ;
     public final void rule__XConstructorCall__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21820:1: ( ( ( rule__XConstructorCall__Group_3__0 )? ) )
-            // InternalTableDSL.g:21821:1: ( ( rule__XConstructorCall__Group_3__0 )? )
+            // InternalTableDSL.g:21199:1: ( ( ( rule__XConstructorCall__Group_3__0 )? ) )
+            // InternalTableDSL.g:21200:1: ( ( rule__XConstructorCall__Group_3__0 )? )
             {
-            // InternalTableDSL.g:21821:1: ( ( rule__XConstructorCall__Group_3__0 )? )
-            // InternalTableDSL.g:21822:2: ( rule__XConstructorCall__Group_3__0 )?
+            // InternalTableDSL.g:21200:1: ( ( rule__XConstructorCall__Group_3__0 )? )
+            // InternalTableDSL.g:21201:2: ( rule__XConstructorCall__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_3()); 
             }
-            // InternalTableDSL.g:21823:2: ( rule__XConstructorCall__Group_3__0 )?
-            int alt151=2;
-            alt151 = dfa151.predict(input);
-            switch (alt151) {
+            // InternalTableDSL.g:21202:2: ( rule__XConstructorCall__Group_3__0 )?
+            int alt149=2;
+            alt149 = dfa149.predict(input);
+            switch (alt149) {
                 case 1 :
-                    // InternalTableDSL.g:21823:3: rule__XConstructorCall__Group_3__0
+                    // InternalTableDSL.g:21202:3: rule__XConstructorCall__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Group_3__0();
@@ -71838,16 +69880,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group__4"
-    // InternalTableDSL.g:21831:1: rule__XConstructorCall__Group__4 : rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 ;
+    // InternalTableDSL.g:21210:1: rule__XConstructorCall__Group__4 : rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 ;
     public final void rule__XConstructorCall__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21835:1: ( rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 )
-            // InternalTableDSL.g:21836:2: rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5
+            // InternalTableDSL.g:21214:1: ( rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 )
+            // InternalTableDSL.g:21215:2: rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5
             {
-            pushFollow(FOLLOW_163);
+            pushFollow(FOLLOW_162);
             rule__XConstructorCall__Group__4__Impl();
 
             state._fsp--;
@@ -71876,27 +69918,27 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group__4__Impl"
-    // InternalTableDSL.g:21843:1: rule__XConstructorCall__Group__4__Impl : ( ( rule__XConstructorCall__Group_4__0 )? ) ;
+    // InternalTableDSL.g:21222:1: rule__XConstructorCall__Group__4__Impl : ( ( rule__XConstructorCall__Group_4__0 )? ) ;
     public final void rule__XConstructorCall__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21847:1: ( ( ( rule__XConstructorCall__Group_4__0 )? ) )
-            // InternalTableDSL.g:21848:1: ( ( rule__XConstructorCall__Group_4__0 )? )
+            // InternalTableDSL.g:21226:1: ( ( ( rule__XConstructorCall__Group_4__0 )? ) )
+            // InternalTableDSL.g:21227:1: ( ( rule__XConstructorCall__Group_4__0 )? )
             {
-            // InternalTableDSL.g:21848:1: ( ( rule__XConstructorCall__Group_4__0 )? )
-            // InternalTableDSL.g:21849:2: ( rule__XConstructorCall__Group_4__0 )?
+            // InternalTableDSL.g:21227:1: ( ( rule__XConstructorCall__Group_4__0 )? )
+            // InternalTableDSL.g:21228:2: ( rule__XConstructorCall__Group_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_4()); 
             }
-            // InternalTableDSL.g:21850:2: ( rule__XConstructorCall__Group_4__0 )?
-            int alt152=2;
-            alt152 = dfa152.predict(input);
-            switch (alt152) {
+            // InternalTableDSL.g:21229:2: ( rule__XConstructorCall__Group_4__0 )?
+            int alt150=2;
+            alt150 = dfa150.predict(input);
+            switch (alt150) {
                 case 1 :
-                    // InternalTableDSL.g:21850:3: rule__XConstructorCall__Group_4__0
+                    // InternalTableDSL.g:21229:3: rule__XConstructorCall__Group_4__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Group_4__0();
@@ -71934,14 +69976,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group__5"
-    // InternalTableDSL.g:21858:1: rule__XConstructorCall__Group__5 : rule__XConstructorCall__Group__5__Impl ;
+    // InternalTableDSL.g:21237:1: rule__XConstructorCall__Group__5 : rule__XConstructorCall__Group__5__Impl ;
     public final void rule__XConstructorCall__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21862:1: ( rule__XConstructorCall__Group__5__Impl )
-            // InternalTableDSL.g:21863:2: rule__XConstructorCall__Group__5__Impl
+            // InternalTableDSL.g:21241:1: ( rule__XConstructorCall__Group__5__Impl )
+            // InternalTableDSL.g:21242:2: rule__XConstructorCall__Group__5__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__5__Impl();
@@ -71967,27 +70009,27 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group__5__Impl"
-    // InternalTableDSL.g:21869:1: rule__XConstructorCall__Group__5__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) ;
+    // InternalTableDSL.g:21248:1: rule__XConstructorCall__Group__5__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) ;
     public final void rule__XConstructorCall__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21873:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) )
-            // InternalTableDSL.g:21874:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
+            // InternalTableDSL.g:21252:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) )
+            // InternalTableDSL.g:21253:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
             {
-            // InternalTableDSL.g:21874:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
-            // InternalTableDSL.g:21875:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
+            // InternalTableDSL.g:21253:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
+            // InternalTableDSL.g:21254:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_5()); 
             }
-            // InternalTableDSL.g:21876:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
-            int alt153=2;
-            alt153 = dfa153.predict(input);
-            switch (alt153) {
+            // InternalTableDSL.g:21255:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
+            int alt151=2;
+            alt151 = dfa151.predict(input);
+            switch (alt151) {
                 case 1 :
-                    // InternalTableDSL.g:21876:3: rule__XConstructorCall__ArgumentsAssignment_5
+                    // InternalTableDSL.g:21255:3: rule__XConstructorCall__ArgumentsAssignment_5
                     {
                     pushFollow(FOLLOW_2);
                     rule__XConstructorCall__ArgumentsAssignment_5();
@@ -72025,16 +70067,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__0"
-    // InternalTableDSL.g:21885:1: rule__XConstructorCall__Group_3__0 : rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 ;
+    // InternalTableDSL.g:21264:1: rule__XConstructorCall__Group_3__0 : rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 ;
     public final void rule__XConstructorCall__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21889:1: ( rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 )
-            // InternalTableDSL.g:21890:2: rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1
+            // InternalTableDSL.g:21268:1: ( rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 )
+            // InternalTableDSL.g:21269:2: rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1
             {
-            pushFollow(FOLLOW_137);
+            pushFollow(FOLLOW_136);
             rule__XConstructorCall__Group_3__0__Impl();
 
             state._fsp--;
@@ -72063,23 +70105,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__0__Impl"
-    // InternalTableDSL.g:21897:1: rule__XConstructorCall__Group_3__0__Impl : ( ( '<' ) ) ;
+    // InternalTableDSL.g:21276:1: rule__XConstructorCall__Group_3__0__Impl : ( ( '<' ) ) ;
     public final void rule__XConstructorCall__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21901:1: ( ( ( '<' ) ) )
-            // InternalTableDSL.g:21902:1: ( ( '<' ) )
+            // InternalTableDSL.g:21280:1: ( ( ( '<' ) ) )
+            // InternalTableDSL.g:21281:1: ( ( '<' ) )
             {
-            // InternalTableDSL.g:21902:1: ( ( '<' ) )
-            // InternalTableDSL.g:21903:2: ( '<' )
+            // InternalTableDSL.g:21281:1: ( ( '<' ) )
+            // InternalTableDSL.g:21282:2: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getLessThanSignKeyword_3_0()); 
             }
-            // InternalTableDSL.g:21904:2: ( '<' )
-            // InternalTableDSL.g:21904:3: '<'
+            // InternalTableDSL.g:21283:2: ( '<' )
+            // InternalTableDSL.g:21283:3: '<'
             {
             match(input,32,FOLLOW_2); if (state.failed) return ;
 
@@ -72110,16 +70152,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__1"
-    // InternalTableDSL.g:21912:1: rule__XConstructorCall__Group_3__1 : rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 ;
+    // InternalTableDSL.g:21291:1: rule__XConstructorCall__Group_3__1 : rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 ;
     public final void rule__XConstructorCall__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21916:1: ( rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 )
-            // InternalTableDSL.g:21917:2: rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2
+            // InternalTableDSL.g:21295:1: ( rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 )
+            // InternalTableDSL.g:21296:2: rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2
             {
-            pushFollow(FOLLOW_138);
+            pushFollow(FOLLOW_137);
             rule__XConstructorCall__Group_3__1__Impl();
 
             state._fsp--;
@@ -72148,23 +70190,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__1__Impl"
-    // InternalTableDSL.g:21924:1: rule__XConstructorCall__Group_3__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) ;
+    // InternalTableDSL.g:21303:1: rule__XConstructorCall__Group_3__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) ;
     public final void rule__XConstructorCall__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21928:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) )
-            // InternalTableDSL.g:21929:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
+            // InternalTableDSL.g:21307:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) )
+            // InternalTableDSL.g:21308:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
             {
-            // InternalTableDSL.g:21929:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
-            // InternalTableDSL.g:21930:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
+            // InternalTableDSL.g:21308:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
+            // InternalTableDSL.g:21309:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsAssignment_3_1()); 
             }
-            // InternalTableDSL.g:21931:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
-            // InternalTableDSL.g:21931:3: rule__XConstructorCall__TypeArgumentsAssignment_3_1
+            // InternalTableDSL.g:21310:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
+            // InternalTableDSL.g:21310:3: rule__XConstructorCall__TypeArgumentsAssignment_3_1
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__TypeArgumentsAssignment_3_1();
@@ -72199,16 +70241,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__2"
-    // InternalTableDSL.g:21939:1: rule__XConstructorCall__Group_3__2 : rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 ;
+    // InternalTableDSL.g:21318:1: rule__XConstructorCall__Group_3__2 : rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 ;
     public final void rule__XConstructorCall__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21943:1: ( rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 )
-            // InternalTableDSL.g:21944:2: rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3
+            // InternalTableDSL.g:21322:1: ( rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 )
+            // InternalTableDSL.g:21323:2: rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3
             {
-            pushFollow(FOLLOW_138);
+            pushFollow(FOLLOW_137);
             rule__XConstructorCall__Group_3__2__Impl();
 
             state._fsp--;
@@ -72237,37 +70279,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__2__Impl"
-    // InternalTableDSL.g:21951:1: rule__XConstructorCall__Group_3__2__Impl : ( ( rule__XConstructorCall__Group_3_2__0 )* ) ;
+    // InternalTableDSL.g:21330:1: rule__XConstructorCall__Group_3__2__Impl : ( ( rule__XConstructorCall__Group_3_2__0 )* ) ;
     public final void rule__XConstructorCall__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21955:1: ( ( ( rule__XConstructorCall__Group_3_2__0 )* ) )
-            // InternalTableDSL.g:21956:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
+            // InternalTableDSL.g:21334:1: ( ( ( rule__XConstructorCall__Group_3_2__0 )* ) )
+            // InternalTableDSL.g:21335:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
             {
-            // InternalTableDSL.g:21956:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
-            // InternalTableDSL.g:21957:2: ( rule__XConstructorCall__Group_3_2__0 )*
+            // InternalTableDSL.g:21335:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
+            // InternalTableDSL.g:21336:2: ( rule__XConstructorCall__Group_3_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_3_2()); 
             }
-            // InternalTableDSL.g:21958:2: ( rule__XConstructorCall__Group_3_2__0 )*
-            loop154:
+            // InternalTableDSL.g:21337:2: ( rule__XConstructorCall__Group_3_2__0 )*
+            loop152:
             do {
-                int alt154=2;
-                int LA154_0 = input.LA(1);
+                int alt152=2;
+                int LA152_0 = input.LA(1);
 
-                if ( (LA154_0==137) ) {
-                    alt154=1;
+                if ( (LA152_0==137) ) {
+                    alt152=1;
                 }
 
 
-                switch (alt154) {
+                switch (alt152) {
             	case 1 :
-            	    // InternalTableDSL.g:21958:3: rule__XConstructorCall__Group_3_2__0
+            	    // InternalTableDSL.g:21337:3: rule__XConstructorCall__Group_3_2__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XConstructorCall__Group_3_2__0();
 
             	    state._fsp--;
@@ -72277,7 +70319,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop154;
+            	    break loop152;
                 }
             } while (true);
 
@@ -72306,14 +70348,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__3"
-    // InternalTableDSL.g:21966:1: rule__XConstructorCall__Group_3__3 : rule__XConstructorCall__Group_3__3__Impl ;
+    // InternalTableDSL.g:21345:1: rule__XConstructorCall__Group_3__3 : rule__XConstructorCall__Group_3__3__Impl ;
     public final void rule__XConstructorCall__Group_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21970:1: ( rule__XConstructorCall__Group_3__3__Impl )
-            // InternalTableDSL.g:21971:2: rule__XConstructorCall__Group_3__3__Impl
+            // InternalTableDSL.g:21349:1: ( rule__XConstructorCall__Group_3__3__Impl )
+            // InternalTableDSL.g:21350:2: rule__XConstructorCall__Group_3__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3__3__Impl();
@@ -72339,17 +70381,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__3__Impl"
-    // InternalTableDSL.g:21977:1: rule__XConstructorCall__Group_3__3__Impl : ( '>' ) ;
+    // InternalTableDSL.g:21356:1: rule__XConstructorCall__Group_3__3__Impl : ( '>' ) ;
     public final void rule__XConstructorCall__Group_3__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21981:1: ( ( '>' ) )
-            // InternalTableDSL.g:21982:1: ( '>' )
+            // InternalTableDSL.g:21360:1: ( ( '>' ) )
+            // InternalTableDSL.g:21361:1: ( '>' )
             {
-            // InternalTableDSL.g:21982:1: ( '>' )
-            // InternalTableDSL.g:21983:2: '>'
+            // InternalTableDSL.g:21361:1: ( '>' )
+            // InternalTableDSL.g:21362:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3()); 
@@ -72380,16 +70422,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__0"
-    // InternalTableDSL.g:21993:1: rule__XConstructorCall__Group_3_2__0 : rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 ;
+    // InternalTableDSL.g:21372:1: rule__XConstructorCall__Group_3_2__0 : rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 ;
     public final void rule__XConstructorCall__Group_3_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:21997:1: ( rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 )
-            // InternalTableDSL.g:21998:2: rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1
+            // InternalTableDSL.g:21376:1: ( rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 )
+            // InternalTableDSL.g:21377:2: rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1
             {
-            pushFollow(FOLLOW_137);
+            pushFollow(FOLLOW_136);
             rule__XConstructorCall__Group_3_2__0__Impl();
 
             state._fsp--;
@@ -72418,17 +70460,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__0__Impl"
-    // InternalTableDSL.g:22005:1: rule__XConstructorCall__Group_3_2__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:21384:1: rule__XConstructorCall__Group_3_2__0__Impl : ( ',' ) ;
     public final void rule__XConstructorCall__Group_3_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22009:1: ( ( ',' ) )
-            // InternalTableDSL.g:22010:1: ( ',' )
+            // InternalTableDSL.g:21388:1: ( ( ',' ) )
+            // InternalTableDSL.g:21389:1: ( ',' )
             {
-            // InternalTableDSL.g:22010:1: ( ',' )
-            // InternalTableDSL.g:22011:2: ','
+            // InternalTableDSL.g:21389:1: ( ',' )
+            // InternalTableDSL.g:21390:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0()); 
@@ -72459,14 +70501,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__1"
-    // InternalTableDSL.g:22020:1: rule__XConstructorCall__Group_3_2__1 : rule__XConstructorCall__Group_3_2__1__Impl ;
+    // InternalTableDSL.g:21399:1: rule__XConstructorCall__Group_3_2__1 : rule__XConstructorCall__Group_3_2__1__Impl ;
     public final void rule__XConstructorCall__Group_3_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22024:1: ( rule__XConstructorCall__Group_3_2__1__Impl )
-            // InternalTableDSL.g:22025:2: rule__XConstructorCall__Group_3_2__1__Impl
+            // InternalTableDSL.g:21403:1: ( rule__XConstructorCall__Group_3_2__1__Impl )
+            // InternalTableDSL.g:21404:2: rule__XConstructorCall__Group_3_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3_2__1__Impl();
@@ -72492,23 +70534,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__1__Impl"
-    // InternalTableDSL.g:22031:1: rule__XConstructorCall__Group_3_2__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) ;
+    // InternalTableDSL.g:21410:1: rule__XConstructorCall__Group_3_2__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) ;
     public final void rule__XConstructorCall__Group_3_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22035:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) )
-            // InternalTableDSL.g:22036:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
+            // InternalTableDSL.g:21414:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) )
+            // InternalTableDSL.g:21415:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
             {
-            // InternalTableDSL.g:22036:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
-            // InternalTableDSL.g:22037:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
+            // InternalTableDSL.g:21415:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
+            // InternalTableDSL.g:21416:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsAssignment_3_2_1()); 
             }
-            // InternalTableDSL.g:22038:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
-            // InternalTableDSL.g:22038:3: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1
+            // InternalTableDSL.g:21417:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
+            // InternalTableDSL.g:21417:3: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__TypeArgumentsAssignment_3_2_1();
@@ -72543,16 +70585,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__0"
-    // InternalTableDSL.g:22047:1: rule__XConstructorCall__Group_4__0 : rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 ;
+    // InternalTableDSL.g:21426:1: rule__XConstructorCall__Group_4__0 : rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 ;
     public final void rule__XConstructorCall__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22051:1: ( rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 )
-            // InternalTableDSL.g:22052:2: rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1
+            // InternalTableDSL.g:21430:1: ( rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 )
+            // InternalTableDSL.g:21431:2: rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1
             {
-            pushFollow(FOLLOW_139);
+            pushFollow(FOLLOW_138);
             rule__XConstructorCall__Group_4__0__Impl();
 
             state._fsp--;
@@ -72581,23 +70623,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__0__Impl"
-    // InternalTableDSL.g:22059:1: rule__XConstructorCall__Group_4__0__Impl : ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) ;
+    // InternalTableDSL.g:21438:1: rule__XConstructorCall__Group_4__0__Impl : ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) ;
     public final void rule__XConstructorCall__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22063:1: ( ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) )
-            // InternalTableDSL.g:22064:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
+            // InternalTableDSL.g:21442:1: ( ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) )
+            // InternalTableDSL.g:21443:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
             {
-            // InternalTableDSL.g:22064:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
-            // InternalTableDSL.g:22065:2: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
+            // InternalTableDSL.g:21443:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
+            // InternalTableDSL.g:21444:2: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallAssignment_4_0()); 
             }
-            // InternalTableDSL.g:22066:2: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
-            // InternalTableDSL.g:22066:3: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0
+            // InternalTableDSL.g:21445:2: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
+            // InternalTableDSL.g:21445:3: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0();
@@ -72632,16 +70674,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__1"
-    // InternalTableDSL.g:22074:1: rule__XConstructorCall__Group_4__1 : rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 ;
+    // InternalTableDSL.g:21453:1: rule__XConstructorCall__Group_4__1 : rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 ;
     public final void rule__XConstructorCall__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22078:1: ( rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 )
-            // InternalTableDSL.g:22079:2: rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2
+            // InternalTableDSL.g:21457:1: ( rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 )
+            // InternalTableDSL.g:21458:2: rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2
             {
-            pushFollow(FOLLOW_139);
+            pushFollow(FOLLOW_138);
             rule__XConstructorCall__Group_4__1__Impl();
 
             state._fsp--;
@@ -72670,31 +70712,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__1__Impl"
-    // InternalTableDSL.g:22086:1: rule__XConstructorCall__Group_4__1__Impl : ( ( rule__XConstructorCall__Alternatives_4_1 )? ) ;
+    // InternalTableDSL.g:21465:1: rule__XConstructorCall__Group_4__1__Impl : ( ( rule__XConstructorCall__Alternatives_4_1 )? ) ;
     public final void rule__XConstructorCall__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22090:1: ( ( ( rule__XConstructorCall__Alternatives_4_1 )? ) )
-            // InternalTableDSL.g:22091:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
+            // InternalTableDSL.g:21469:1: ( ( ( rule__XConstructorCall__Alternatives_4_1 )? ) )
+            // InternalTableDSL.g:21470:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
             {
-            // InternalTableDSL.g:22091:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
-            // InternalTableDSL.g:22092:2: ( rule__XConstructorCall__Alternatives_4_1 )?
+            // InternalTableDSL.g:21470:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
+            // InternalTableDSL.g:21471:2: ( rule__XConstructorCall__Alternatives_4_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getAlternatives_4_1()); 
             }
-            // InternalTableDSL.g:22093:2: ( rule__XConstructorCall__Alternatives_4_1 )?
-            int alt155=2;
-            int LA155_0 = input.LA(1);
+            // InternalTableDSL.g:21472:2: ( rule__XConstructorCall__Alternatives_4_1 )?
+            int alt153=2;
+            int LA153_0 = input.LA(1);
 
-            if ( ((LA155_0>=RULE_STRING && LA155_0<=RULE_DECIMAL)||(LA155_0>=19 && LA155_0<=20)||LA155_0==32||LA155_0==36||LA155_0==43||(LA155_0>=48 && LA155_0<=53)||LA155_0==75||LA155_0==135||(LA155_0>=139 && LA155_0<=140)||LA155_0==142||LA155_0==144||(LA155_0>=147 && LA155_0<=155)||LA155_0==157||LA155_0==182||LA155_0==184) ) {
-                alt155=1;
+            if ( ((LA153_0>=RULE_STRING && LA153_0<=RULE_DECIMAL)||(LA153_0>=19 && LA153_0<=20)||LA153_0==32||LA153_0==36||LA153_0==43||(LA153_0>=48 && LA153_0<=53)||LA153_0==75||LA153_0==135||(LA153_0>=139 && LA153_0<=140)||LA153_0==142||LA153_0==144||(LA153_0>=147 && LA153_0<=155)||LA153_0==157||LA153_0==179||LA153_0==181) ) {
+                alt153=1;
             }
-            switch (alt155) {
+            switch (alt153) {
                 case 1 :
-                    // InternalTableDSL.g:22093:3: rule__XConstructorCall__Alternatives_4_1
+                    // InternalTableDSL.g:21472:3: rule__XConstructorCall__Alternatives_4_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Alternatives_4_1();
@@ -72732,14 +70774,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__2"
-    // InternalTableDSL.g:22101:1: rule__XConstructorCall__Group_4__2 : rule__XConstructorCall__Group_4__2__Impl ;
+    // InternalTableDSL.g:21480:1: rule__XConstructorCall__Group_4__2 : rule__XConstructorCall__Group_4__2__Impl ;
     public final void rule__XConstructorCall__Group_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22105:1: ( rule__XConstructorCall__Group_4__2__Impl )
-            // InternalTableDSL.g:22106:2: rule__XConstructorCall__Group_4__2__Impl
+            // InternalTableDSL.g:21484:1: ( rule__XConstructorCall__Group_4__2__Impl )
+            // InternalTableDSL.g:21485:2: rule__XConstructorCall__Group_4__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4__2__Impl();
@@ -72765,17 +70807,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__2__Impl"
-    // InternalTableDSL.g:22112:1: rule__XConstructorCall__Group_4__2__Impl : ( ')' ) ;
+    // InternalTableDSL.g:21491:1: rule__XConstructorCall__Group_4__2__Impl : ( ')' ) ;
     public final void rule__XConstructorCall__Group_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22116:1: ( ( ')' ) )
-            // InternalTableDSL.g:22117:1: ( ')' )
+            // InternalTableDSL.g:21495:1: ( ( ')' ) )
+            // InternalTableDSL.g:21496:1: ( ')' )
             {
-            // InternalTableDSL.g:22117:1: ( ')' )
-            // InternalTableDSL.g:22118:2: ')'
+            // InternalTableDSL.g:21496:1: ( ')' )
+            // InternalTableDSL.g:21497:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2()); 
@@ -72806,16 +70848,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__0"
-    // InternalTableDSL.g:22128:1: rule__XConstructorCall__Group_4_1_1__0 : rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 ;
+    // InternalTableDSL.g:21507:1: rule__XConstructorCall__Group_4_1_1__0 : rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 ;
     public final void rule__XConstructorCall__Group_4_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22132:1: ( rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 )
-            // InternalTableDSL.g:22133:2: rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1
+            // InternalTableDSL.g:21511:1: ( rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 )
+            // InternalTableDSL.g:21512:2: rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_97);
             rule__XConstructorCall__Group_4_1_1__0__Impl();
 
             state._fsp--;
@@ -72844,23 +70886,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__0__Impl"
-    // InternalTableDSL.g:22140:1: rule__XConstructorCall__Group_4_1_1__0__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) ;
+    // InternalTableDSL.g:21519:1: rule__XConstructorCall__Group_4_1_1__0__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) ;
     public final void rule__XConstructorCall__Group_4_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22144:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) )
-            // InternalTableDSL.g:22145:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
+            // InternalTableDSL.g:21523:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) )
+            // InternalTableDSL.g:21524:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
             {
-            // InternalTableDSL.g:22145:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
-            // InternalTableDSL.g:22146:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
+            // InternalTableDSL.g:21524:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
+            // InternalTableDSL.g:21525:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_1_0()); 
             }
-            // InternalTableDSL.g:22147:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
-            // InternalTableDSL.g:22147:3: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0
+            // InternalTableDSL.g:21526:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
+            // InternalTableDSL.g:21526:3: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__ArgumentsAssignment_4_1_1_0();
@@ -72895,14 +70937,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__1"
-    // InternalTableDSL.g:22155:1: rule__XConstructorCall__Group_4_1_1__1 : rule__XConstructorCall__Group_4_1_1__1__Impl ;
+    // InternalTableDSL.g:21534:1: rule__XConstructorCall__Group_4_1_1__1 : rule__XConstructorCall__Group_4_1_1__1__Impl ;
     public final void rule__XConstructorCall__Group_4_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22159:1: ( rule__XConstructorCall__Group_4_1_1__1__Impl )
-            // InternalTableDSL.g:22160:2: rule__XConstructorCall__Group_4_1_1__1__Impl
+            // InternalTableDSL.g:21538:1: ( rule__XConstructorCall__Group_4_1_1__1__Impl )
+            // InternalTableDSL.g:21539:2: rule__XConstructorCall__Group_4_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1__1__Impl();
@@ -72928,37 +70970,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__1__Impl"
-    // InternalTableDSL.g:22166:1: rule__XConstructorCall__Group_4_1_1__1__Impl : ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) ;
+    // InternalTableDSL.g:21545:1: rule__XConstructorCall__Group_4_1_1__1__Impl : ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) ;
     public final void rule__XConstructorCall__Group_4_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22170:1: ( ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) )
-            // InternalTableDSL.g:22171:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
+            // InternalTableDSL.g:21549:1: ( ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) )
+            // InternalTableDSL.g:21550:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
             {
-            // InternalTableDSL.g:22171:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
-            // InternalTableDSL.g:22172:2: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
+            // InternalTableDSL.g:21550:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
+            // InternalTableDSL.g:21551:2: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_4_1_1_1()); 
             }
-            // InternalTableDSL.g:22173:2: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
-            loop156:
+            // InternalTableDSL.g:21552:2: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
+            loop154:
             do {
-                int alt156=2;
-                int LA156_0 = input.LA(1);
+                int alt154=2;
+                int LA154_0 = input.LA(1);
 
-                if ( (LA156_0==137) ) {
-                    alt156=1;
+                if ( (LA154_0==137) ) {
+                    alt154=1;
                 }
 
 
-                switch (alt156) {
+                switch (alt154) {
             	case 1 :
-            	    // InternalTableDSL.g:22173:3: rule__XConstructorCall__Group_4_1_1_1__0
+            	    // InternalTableDSL.g:21552:3: rule__XConstructorCall__Group_4_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XConstructorCall__Group_4_1_1_1__0();
 
             	    state._fsp--;
@@ -72968,7 +71010,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop156;
+            	    break loop154;
                 }
             } while (true);
 
@@ -72997,16 +71039,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__0"
-    // InternalTableDSL.g:22182:1: rule__XConstructorCall__Group_4_1_1_1__0 : rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 ;
+    // InternalTableDSL.g:21561:1: rule__XConstructorCall__Group_4_1_1_1__0 : rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 ;
     public final void rule__XConstructorCall__Group_4_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22186:1: ( rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 )
-            // InternalTableDSL.g:22187:2: rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1
+            // InternalTableDSL.g:21565:1: ( rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 )
+            // InternalTableDSL.g:21566:2: rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XConstructorCall__Group_4_1_1_1__0__Impl();
 
             state._fsp--;
@@ -73035,17 +71077,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__0__Impl"
-    // InternalTableDSL.g:22194:1: rule__XConstructorCall__Group_4_1_1_1__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:21573:1: rule__XConstructorCall__Group_4_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XConstructorCall__Group_4_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22198:1: ( ( ',' ) )
-            // InternalTableDSL.g:22199:1: ( ',' )
+            // InternalTableDSL.g:21577:1: ( ( ',' ) )
+            // InternalTableDSL.g:21578:1: ( ',' )
             {
-            // InternalTableDSL.g:22199:1: ( ',' )
-            // InternalTableDSL.g:22200:2: ','
+            // InternalTableDSL.g:21578:1: ( ',' )
+            // InternalTableDSL.g:21579:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0()); 
@@ -73076,14 +71118,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__1"
-    // InternalTableDSL.g:22209:1: rule__XConstructorCall__Group_4_1_1_1__1 : rule__XConstructorCall__Group_4_1_1_1__1__Impl ;
+    // InternalTableDSL.g:21588:1: rule__XConstructorCall__Group_4_1_1_1__1 : rule__XConstructorCall__Group_4_1_1_1__1__Impl ;
     public final void rule__XConstructorCall__Group_4_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22213:1: ( rule__XConstructorCall__Group_4_1_1_1__1__Impl )
-            // InternalTableDSL.g:22214:2: rule__XConstructorCall__Group_4_1_1_1__1__Impl
+            // InternalTableDSL.g:21592:1: ( rule__XConstructorCall__Group_4_1_1_1__1__Impl )
+            // InternalTableDSL.g:21593:2: rule__XConstructorCall__Group_4_1_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1_1__1__Impl();
@@ -73109,23 +71151,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__1__Impl"
-    // InternalTableDSL.g:22220:1: rule__XConstructorCall__Group_4_1_1_1__1__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) ;
+    // InternalTableDSL.g:21599:1: rule__XConstructorCall__Group_4_1_1_1__1__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) ;
     public final void rule__XConstructorCall__Group_4_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22224:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) )
-            // InternalTableDSL.g:22225:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
+            // InternalTableDSL.g:21603:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) )
+            // InternalTableDSL.g:21604:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
             {
-            // InternalTableDSL.g:22225:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
-            // InternalTableDSL.g:22226:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
+            // InternalTableDSL.g:21604:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
+            // InternalTableDSL.g:21605:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_1_1_1()); 
             }
-            // InternalTableDSL.g:22227:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
-            // InternalTableDSL.g:22227:3: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1
+            // InternalTableDSL.g:21606:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
+            // InternalTableDSL.g:21606:3: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1();
@@ -73160,16 +71202,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__0"
-    // InternalTableDSL.g:22236:1: rule__XBooleanLiteral__Group__0 : rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 ;
+    // InternalTableDSL.g:21615:1: rule__XBooleanLiteral__Group__0 : rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 ;
     public final void rule__XBooleanLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22240:1: ( rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 )
-            // InternalTableDSL.g:22241:2: rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1
+            // InternalTableDSL.g:21619:1: ( rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 )
+            // InternalTableDSL.g:21620:2: rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1
             {
-            pushFollow(FOLLOW_164);
+            pushFollow(FOLLOW_163);
             rule__XBooleanLiteral__Group__0__Impl();
 
             state._fsp--;
@@ -73198,23 +71240,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__0__Impl"
-    // InternalTableDSL.g:22248:1: rule__XBooleanLiteral__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:21627:1: rule__XBooleanLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XBooleanLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22252:1: ( ( () ) )
-            // InternalTableDSL.g:22253:1: ( () )
+            // InternalTableDSL.g:21631:1: ( ( () ) )
+            // InternalTableDSL.g:21632:1: ( () )
             {
-            // InternalTableDSL.g:22253:1: ( () )
-            // InternalTableDSL.g:22254:2: ()
+            // InternalTableDSL.g:21632:1: ( () )
+            // InternalTableDSL.g:21633:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getXBooleanLiteralAction_0()); 
             }
-            // InternalTableDSL.g:22255:2: ()
-            // InternalTableDSL.g:22255:3: 
+            // InternalTableDSL.g:21634:2: ()
+            // InternalTableDSL.g:21634:3: 
             {
             }
 
@@ -73239,14 +71281,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__1"
-    // InternalTableDSL.g:22263:1: rule__XBooleanLiteral__Group__1 : rule__XBooleanLiteral__Group__1__Impl ;
+    // InternalTableDSL.g:21642:1: rule__XBooleanLiteral__Group__1 : rule__XBooleanLiteral__Group__1__Impl ;
     public final void rule__XBooleanLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22267:1: ( rule__XBooleanLiteral__Group__1__Impl )
-            // InternalTableDSL.g:22268:2: rule__XBooleanLiteral__Group__1__Impl
+            // InternalTableDSL.g:21646:1: ( rule__XBooleanLiteral__Group__1__Impl )
+            // InternalTableDSL.g:21647:2: rule__XBooleanLiteral__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Group__1__Impl();
@@ -73272,23 +71314,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__1__Impl"
-    // InternalTableDSL.g:22274:1: rule__XBooleanLiteral__Group__1__Impl : ( ( rule__XBooleanLiteral__Alternatives_1 ) ) ;
+    // InternalTableDSL.g:21653:1: rule__XBooleanLiteral__Group__1__Impl : ( ( rule__XBooleanLiteral__Alternatives_1 ) ) ;
     public final void rule__XBooleanLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22278:1: ( ( ( rule__XBooleanLiteral__Alternatives_1 ) ) )
-            // InternalTableDSL.g:22279:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
+            // InternalTableDSL.g:21657:1: ( ( ( rule__XBooleanLiteral__Alternatives_1 ) ) )
+            // InternalTableDSL.g:21658:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
             {
-            // InternalTableDSL.g:22279:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
-            // InternalTableDSL.g:22280:2: ( rule__XBooleanLiteral__Alternatives_1 )
+            // InternalTableDSL.g:21658:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
+            // InternalTableDSL.g:21659:2: ( rule__XBooleanLiteral__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getAlternatives_1()); 
             }
-            // InternalTableDSL.g:22281:2: ( rule__XBooleanLiteral__Alternatives_1 )
-            // InternalTableDSL.g:22281:3: rule__XBooleanLiteral__Alternatives_1
+            // InternalTableDSL.g:21660:2: ( rule__XBooleanLiteral__Alternatives_1 )
+            // InternalTableDSL.g:21660:3: rule__XBooleanLiteral__Alternatives_1
             {
             pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Alternatives_1();
@@ -73323,16 +71365,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XNullLiteral__Group__0"
-    // InternalTableDSL.g:22290:1: rule__XNullLiteral__Group__0 : rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 ;
+    // InternalTableDSL.g:21669:1: rule__XNullLiteral__Group__0 : rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 ;
     public final void rule__XNullLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22294:1: ( rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 )
-            // InternalTableDSL.g:22295:2: rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1
+            // InternalTableDSL.g:21673:1: ( rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 )
+            // InternalTableDSL.g:21674:2: rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1
             {
-            pushFollow(FOLLOW_165);
+            pushFollow(FOLLOW_164);
             rule__XNullLiteral__Group__0__Impl();
 
             state._fsp--;
@@ -73361,23 +71403,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XNullLiteral__Group__0__Impl"
-    // InternalTableDSL.g:22302:1: rule__XNullLiteral__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:21681:1: rule__XNullLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XNullLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22306:1: ( ( () ) )
-            // InternalTableDSL.g:22307:1: ( () )
+            // InternalTableDSL.g:21685:1: ( ( () ) )
+            // InternalTableDSL.g:21686:1: ( () )
             {
-            // InternalTableDSL.g:22307:1: ( () )
-            // InternalTableDSL.g:22308:2: ()
+            // InternalTableDSL.g:21686:1: ( () )
+            // InternalTableDSL.g:21687:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getXNullLiteralAction_0()); 
             }
-            // InternalTableDSL.g:22309:2: ()
-            // InternalTableDSL.g:22309:3: 
+            // InternalTableDSL.g:21688:2: ()
+            // InternalTableDSL.g:21688:3: 
             {
             }
 
@@ -73402,14 +71444,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XNullLiteral__Group__1"
-    // InternalTableDSL.g:22317:1: rule__XNullLiteral__Group__1 : rule__XNullLiteral__Group__1__Impl ;
+    // InternalTableDSL.g:21696:1: rule__XNullLiteral__Group__1 : rule__XNullLiteral__Group__1__Impl ;
     public final void rule__XNullLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22321:1: ( rule__XNullLiteral__Group__1__Impl )
-            // InternalTableDSL.g:22322:2: rule__XNullLiteral__Group__1__Impl
+            // InternalTableDSL.g:21700:1: ( rule__XNullLiteral__Group__1__Impl )
+            // InternalTableDSL.g:21701:2: rule__XNullLiteral__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XNullLiteral__Group__1__Impl();
@@ -73435,17 +71477,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XNullLiteral__Group__1__Impl"
-    // InternalTableDSL.g:22328:1: rule__XNullLiteral__Group__1__Impl : ( 'null' ) ;
+    // InternalTableDSL.g:21707:1: rule__XNullLiteral__Group__1__Impl : ( 'null' ) ;
     public final void rule__XNullLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22332:1: ( ( 'null' ) )
-            // InternalTableDSL.g:22333:1: ( 'null' )
+            // InternalTableDSL.g:21711:1: ( ( 'null' ) )
+            // InternalTableDSL.g:21712:1: ( 'null' )
             {
-            // InternalTableDSL.g:22333:1: ( 'null' )
-            // InternalTableDSL.g:22334:2: 'null'
+            // InternalTableDSL.g:21712:1: ( 'null' )
+            // InternalTableDSL.g:21713:2: 'null'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getNullKeyword_1()); 
@@ -73476,16 +71518,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__0"
-    // InternalTableDSL.g:22344:1: rule__XNumberLiteral__Group__0 : rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 ;
+    // InternalTableDSL.g:21723:1: rule__XNumberLiteral__Group__0 : rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 ;
     public final void rule__XNumberLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22348:1: ( rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 )
-            // InternalTableDSL.g:22349:2: rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1
+            // InternalTableDSL.g:21727:1: ( rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 )
+            // InternalTableDSL.g:21728:2: rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1
             {
-            pushFollow(FOLLOW_20);
+            pushFollow(FOLLOW_38);
             rule__XNumberLiteral__Group__0__Impl();
 
             state._fsp--;
@@ -73514,23 +71556,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__0__Impl"
-    // InternalTableDSL.g:22356:1: rule__XNumberLiteral__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:21735:1: rule__XNumberLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XNumberLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22360:1: ( ( () ) )
-            // InternalTableDSL.g:22361:1: ( () )
+            // InternalTableDSL.g:21739:1: ( ( () ) )
+            // InternalTableDSL.g:21740:1: ( () )
             {
-            // InternalTableDSL.g:22361:1: ( () )
-            // InternalTableDSL.g:22362:2: ()
+            // InternalTableDSL.g:21740:1: ( () )
+            // InternalTableDSL.g:21741:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getXNumberLiteralAction_0()); 
             }
-            // InternalTableDSL.g:22363:2: ()
-            // InternalTableDSL.g:22363:3: 
+            // InternalTableDSL.g:21742:2: ()
+            // InternalTableDSL.g:21742:3: 
             {
             }
 
@@ -73555,14 +71597,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__1"
-    // InternalTableDSL.g:22371:1: rule__XNumberLiteral__Group__1 : rule__XNumberLiteral__Group__1__Impl ;
+    // InternalTableDSL.g:21750:1: rule__XNumberLiteral__Group__1 : rule__XNumberLiteral__Group__1__Impl ;
     public final void rule__XNumberLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22375:1: ( rule__XNumberLiteral__Group__1__Impl )
-            // InternalTableDSL.g:22376:2: rule__XNumberLiteral__Group__1__Impl
+            // InternalTableDSL.g:21754:1: ( rule__XNumberLiteral__Group__1__Impl )
+            // InternalTableDSL.g:21755:2: rule__XNumberLiteral__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XNumberLiteral__Group__1__Impl();
@@ -73588,23 +71630,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__1__Impl"
-    // InternalTableDSL.g:22382:1: rule__XNumberLiteral__Group__1__Impl : ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) ;
+    // InternalTableDSL.g:21761:1: rule__XNumberLiteral__Group__1__Impl : ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) ;
     public final void rule__XNumberLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22386:1: ( ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) )
-            // InternalTableDSL.g:22387:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
+            // InternalTableDSL.g:21765:1: ( ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) )
+            // InternalTableDSL.g:21766:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
             {
-            // InternalTableDSL.g:22387:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
-            // InternalTableDSL.g:22388:2: ( rule__XNumberLiteral__ValueAssignment_1 )
+            // InternalTableDSL.g:21766:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
+            // InternalTableDSL.g:21767:2: ( rule__XNumberLiteral__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getValueAssignment_1()); 
             }
-            // InternalTableDSL.g:22389:2: ( rule__XNumberLiteral__ValueAssignment_1 )
-            // InternalTableDSL.g:22389:3: rule__XNumberLiteral__ValueAssignment_1
+            // InternalTableDSL.g:21768:2: ( rule__XNumberLiteral__ValueAssignment_1 )
+            // InternalTableDSL.g:21768:3: rule__XNumberLiteral__ValueAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__XNumberLiteral__ValueAssignment_1();
@@ -73639,14 +71681,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XStringLiteral__Group__0"
-    // InternalTableDSL.g:22398:1: rule__XStringLiteral__Group__0 : rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 ;
+    // InternalTableDSL.g:21777:1: rule__XStringLiteral__Group__0 : rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 ;
     public final void rule__XStringLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22402:1: ( rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 )
-            // InternalTableDSL.g:22403:2: rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1
+            // InternalTableDSL.g:21781:1: ( rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 )
+            // InternalTableDSL.g:21782:2: rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1
             {
             pushFollow(FOLLOW_14);
             rule__XStringLiteral__Group__0__Impl();
@@ -73677,23 +71719,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XStringLiteral__Group__0__Impl"
-    // InternalTableDSL.g:22410:1: rule__XStringLiteral__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:21789:1: rule__XStringLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XStringLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22414:1: ( ( () ) )
-            // InternalTableDSL.g:22415:1: ( () )
+            // InternalTableDSL.g:21793:1: ( ( () ) )
+            // InternalTableDSL.g:21794:1: ( () )
             {
-            // InternalTableDSL.g:22415:1: ( () )
-            // InternalTableDSL.g:22416:2: ()
+            // InternalTableDSL.g:21794:1: ( () )
+            // InternalTableDSL.g:21795:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getXStringLiteralAction_0()); 
             }
-            // InternalTableDSL.g:22417:2: ()
-            // InternalTableDSL.g:22417:3: 
+            // InternalTableDSL.g:21796:2: ()
+            // InternalTableDSL.g:21796:3: 
             {
             }
 
@@ -73718,14 +71760,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XStringLiteral__Group__1"
-    // InternalTableDSL.g:22425:1: rule__XStringLiteral__Group__1 : rule__XStringLiteral__Group__1__Impl ;
+    // InternalTableDSL.g:21804:1: rule__XStringLiteral__Group__1 : rule__XStringLiteral__Group__1__Impl ;
     public final void rule__XStringLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22429:1: ( rule__XStringLiteral__Group__1__Impl )
-            // InternalTableDSL.g:22430:2: rule__XStringLiteral__Group__1__Impl
+            // InternalTableDSL.g:21808:1: ( rule__XStringLiteral__Group__1__Impl )
+            // InternalTableDSL.g:21809:2: rule__XStringLiteral__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XStringLiteral__Group__1__Impl();
@@ -73751,23 +71793,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XStringLiteral__Group__1__Impl"
-    // InternalTableDSL.g:22436:1: rule__XStringLiteral__Group__1__Impl : ( ( rule__XStringLiteral__ValueAssignment_1 ) ) ;
+    // InternalTableDSL.g:21815:1: rule__XStringLiteral__Group__1__Impl : ( ( rule__XStringLiteral__ValueAssignment_1 ) ) ;
     public final void rule__XStringLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22440:1: ( ( ( rule__XStringLiteral__ValueAssignment_1 ) ) )
-            // InternalTableDSL.g:22441:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
+            // InternalTableDSL.g:21819:1: ( ( ( rule__XStringLiteral__ValueAssignment_1 ) ) )
+            // InternalTableDSL.g:21820:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
             {
-            // InternalTableDSL.g:22441:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
-            // InternalTableDSL.g:22442:2: ( rule__XStringLiteral__ValueAssignment_1 )
+            // InternalTableDSL.g:21820:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
+            // InternalTableDSL.g:21821:2: ( rule__XStringLiteral__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getValueAssignment_1()); 
             }
-            // InternalTableDSL.g:22443:2: ( rule__XStringLiteral__ValueAssignment_1 )
-            // InternalTableDSL.g:22443:3: rule__XStringLiteral__ValueAssignment_1
+            // InternalTableDSL.g:21822:2: ( rule__XStringLiteral__ValueAssignment_1 )
+            // InternalTableDSL.g:21822:3: rule__XStringLiteral__ValueAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__XStringLiteral__ValueAssignment_1();
@@ -73802,16 +71844,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__0"
-    // InternalTableDSL.g:22452:1: rule__XTypeLiteral__Group__0 : rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 ;
+    // InternalTableDSL.g:21831:1: rule__XTypeLiteral__Group__0 : rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 ;
     public final void rule__XTypeLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22456:1: ( rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 )
-            // InternalTableDSL.g:22457:2: rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1
+            // InternalTableDSL.g:21835:1: ( rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 )
+            // InternalTableDSL.g:21836:2: rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1
             {
-            pushFollow(FOLLOW_166);
+            pushFollow(FOLLOW_165);
             rule__XTypeLiteral__Group__0__Impl();
 
             state._fsp--;
@@ -73840,23 +71882,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__0__Impl"
-    // InternalTableDSL.g:22464:1: rule__XTypeLiteral__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:21843:1: rule__XTypeLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XTypeLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22468:1: ( ( () ) )
-            // InternalTableDSL.g:22469:1: ( () )
+            // InternalTableDSL.g:21847:1: ( ( () ) )
+            // InternalTableDSL.g:21848:1: ( () )
             {
-            // InternalTableDSL.g:22469:1: ( () )
-            // InternalTableDSL.g:22470:2: ()
+            // InternalTableDSL.g:21848:1: ( () )
+            // InternalTableDSL.g:21849:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getXTypeLiteralAction_0()); 
             }
-            // InternalTableDSL.g:22471:2: ()
-            // InternalTableDSL.g:22471:3: 
+            // InternalTableDSL.g:21850:2: ()
+            // InternalTableDSL.g:21850:3: 
             {
             }
 
@@ -73881,16 +71923,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__1"
-    // InternalTableDSL.g:22479:1: rule__XTypeLiteral__Group__1 : rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 ;
+    // InternalTableDSL.g:21858:1: rule__XTypeLiteral__Group__1 : rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 ;
     public final void rule__XTypeLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22483:1: ( rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 )
-            // InternalTableDSL.g:22484:2: rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2
+            // InternalTableDSL.g:21862:1: ( rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 )
+            // InternalTableDSL.g:21863:2: rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2
             {
-            pushFollow(FOLLOW_96);
+            pushFollow(FOLLOW_95);
             rule__XTypeLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -73919,17 +71961,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__1__Impl"
-    // InternalTableDSL.g:22491:1: rule__XTypeLiteral__Group__1__Impl : ( 'typeof' ) ;
+    // InternalTableDSL.g:21870:1: rule__XTypeLiteral__Group__1__Impl : ( 'typeof' ) ;
     public final void rule__XTypeLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22495:1: ( ( 'typeof' ) )
-            // InternalTableDSL.g:22496:1: ( 'typeof' )
+            // InternalTableDSL.g:21874:1: ( ( 'typeof' ) )
+            // InternalTableDSL.g:21875:1: ( 'typeof' )
             {
-            // InternalTableDSL.g:22496:1: ( 'typeof' )
-            // InternalTableDSL.g:22497:2: 'typeof'
+            // InternalTableDSL.g:21875:1: ( 'typeof' )
+            // InternalTableDSL.g:21876:2: 'typeof'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1()); 
@@ -73960,14 +72002,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__2"
-    // InternalTableDSL.g:22506:1: rule__XTypeLiteral__Group__2 : rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 ;
+    // InternalTableDSL.g:21885:1: rule__XTypeLiteral__Group__2 : rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 ;
     public final void rule__XTypeLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22510:1: ( rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 )
-            // InternalTableDSL.g:22511:2: rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3
+            // InternalTableDSL.g:21889:1: ( rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 )
+            // InternalTableDSL.g:21890:2: rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3
             {
             pushFollow(FOLLOW_7);
             rule__XTypeLiteral__Group__2__Impl();
@@ -73998,17 +72040,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__2__Impl"
-    // InternalTableDSL.g:22518:1: rule__XTypeLiteral__Group__2__Impl : ( '(' ) ;
+    // InternalTableDSL.g:21897:1: rule__XTypeLiteral__Group__2__Impl : ( '(' ) ;
     public final void rule__XTypeLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22522:1: ( ( '(' ) )
-            // InternalTableDSL.g:22523:1: ( '(' )
+            // InternalTableDSL.g:21901:1: ( ( '(' ) )
+            // InternalTableDSL.g:21902:1: ( '(' )
             {
-            // InternalTableDSL.g:22523:1: ( '(' )
-            // InternalTableDSL.g:22524:2: '('
+            // InternalTableDSL.g:21902:1: ( '(' )
+            // InternalTableDSL.g:21903:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2()); 
@@ -74039,16 +72081,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__3"
-    // InternalTableDSL.g:22533:1: rule__XTypeLiteral__Group__3 : rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 ;
+    // InternalTableDSL.g:21912:1: rule__XTypeLiteral__Group__3 : rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 ;
     public final void rule__XTypeLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22537:1: ( rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 )
-            // InternalTableDSL.g:22538:2: rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4
+            // InternalTableDSL.g:21916:1: ( rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 )
+            // InternalTableDSL.g:21917:2: rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4
             {
-            pushFollow(FOLLOW_167);
+            pushFollow(FOLLOW_166);
             rule__XTypeLiteral__Group__3__Impl();
 
             state._fsp--;
@@ -74077,23 +72119,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__3__Impl"
-    // InternalTableDSL.g:22545:1: rule__XTypeLiteral__Group__3__Impl : ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) ;
+    // InternalTableDSL.g:21924:1: rule__XTypeLiteral__Group__3__Impl : ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) ;
     public final void rule__XTypeLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22549:1: ( ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) )
-            // InternalTableDSL.g:22550:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
+            // InternalTableDSL.g:21928:1: ( ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) )
+            // InternalTableDSL.g:21929:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
             {
-            // InternalTableDSL.g:22550:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
-            // InternalTableDSL.g:22551:2: ( rule__XTypeLiteral__TypeAssignment_3 )
+            // InternalTableDSL.g:21929:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
+            // InternalTableDSL.g:21930:2: ( rule__XTypeLiteral__TypeAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeAssignment_3()); 
             }
-            // InternalTableDSL.g:22552:2: ( rule__XTypeLiteral__TypeAssignment_3 )
-            // InternalTableDSL.g:22552:3: rule__XTypeLiteral__TypeAssignment_3
+            // InternalTableDSL.g:21931:2: ( rule__XTypeLiteral__TypeAssignment_3 )
+            // InternalTableDSL.g:21931:3: rule__XTypeLiteral__TypeAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__XTypeLiteral__TypeAssignment_3();
@@ -74128,16 +72170,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__4"
-    // InternalTableDSL.g:22560:1: rule__XTypeLiteral__Group__4 : rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 ;
+    // InternalTableDSL.g:21939:1: rule__XTypeLiteral__Group__4 : rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 ;
     public final void rule__XTypeLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22564:1: ( rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 )
-            // InternalTableDSL.g:22565:2: rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5
+            // InternalTableDSL.g:21943:1: ( rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 )
+            // InternalTableDSL.g:21944:2: rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5
             {
-            pushFollow(FOLLOW_167);
+            pushFollow(FOLLOW_166);
             rule__XTypeLiteral__Group__4__Impl();
 
             state._fsp--;
@@ -74166,37 +72208,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__4__Impl"
-    // InternalTableDSL.g:22572:1: rule__XTypeLiteral__Group__4__Impl : ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) ;
+    // InternalTableDSL.g:21951:1: rule__XTypeLiteral__Group__4__Impl : ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) ;
     public final void rule__XTypeLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22576:1: ( ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) )
-            // InternalTableDSL.g:22577:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
+            // InternalTableDSL.g:21955:1: ( ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) )
+            // InternalTableDSL.g:21956:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
             {
-            // InternalTableDSL.g:22577:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
-            // InternalTableDSL.g:22578:2: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
+            // InternalTableDSL.g:21956:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
+            // InternalTableDSL.g:21957:2: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsAssignment_4()); 
             }
-            // InternalTableDSL.g:22579:2: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
-            loop157:
+            // InternalTableDSL.g:21958:2: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
+            loop155:
             do {
-                int alt157=2;
-                int LA157_0 = input.LA(1);
+                int alt155=2;
+                int LA155_0 = input.LA(1);
 
-                if ( (LA157_0==140) ) {
-                    alt157=1;
+                if ( (LA155_0==140) ) {
+                    alt155=1;
                 }
 
 
-                switch (alt157) {
+                switch (alt155) {
             	case 1 :
-            	    // InternalTableDSL.g:22579:3: rule__XTypeLiteral__ArrayDimensionsAssignment_4
+            	    // InternalTableDSL.g:21958:3: rule__XTypeLiteral__ArrayDimensionsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_168);
+            	    pushFollow(FOLLOW_167);
             	    rule__XTypeLiteral__ArrayDimensionsAssignment_4();
 
             	    state._fsp--;
@@ -74206,7 +72248,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop157;
+            	    break loop155;
                 }
             } while (true);
 
@@ -74235,14 +72277,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__5"
-    // InternalTableDSL.g:22587:1: rule__XTypeLiteral__Group__5 : rule__XTypeLiteral__Group__5__Impl ;
+    // InternalTableDSL.g:21966:1: rule__XTypeLiteral__Group__5 : rule__XTypeLiteral__Group__5__Impl ;
     public final void rule__XTypeLiteral__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22591:1: ( rule__XTypeLiteral__Group__5__Impl )
-            // InternalTableDSL.g:22592:2: rule__XTypeLiteral__Group__5__Impl
+            // InternalTableDSL.g:21970:1: ( rule__XTypeLiteral__Group__5__Impl )
+            // InternalTableDSL.g:21971:2: rule__XTypeLiteral__Group__5__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__5__Impl();
@@ -74268,17 +72310,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__5__Impl"
-    // InternalTableDSL.g:22598:1: rule__XTypeLiteral__Group__5__Impl : ( ')' ) ;
+    // InternalTableDSL.g:21977:1: rule__XTypeLiteral__Group__5__Impl : ( ')' ) ;
     public final void rule__XTypeLiteral__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22602:1: ( ( ')' ) )
-            // InternalTableDSL.g:22603:1: ( ')' )
+            // InternalTableDSL.g:21981:1: ( ( ')' ) )
+            // InternalTableDSL.g:21982:1: ( ')' )
             {
-            // InternalTableDSL.g:22603:1: ( ')' )
-            // InternalTableDSL.g:22604:2: ')'
+            // InternalTableDSL.g:21982:1: ( ')' )
+            // InternalTableDSL.g:21983:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5()); 
@@ -74309,16 +72351,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XThrowExpression__Group__0"
-    // InternalTableDSL.g:22614:1: rule__XThrowExpression__Group__0 : rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 ;
+    // InternalTableDSL.g:21993:1: rule__XThrowExpression__Group__0 : rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 ;
     public final void rule__XThrowExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22618:1: ( rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 )
-            // InternalTableDSL.g:22619:2: rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1
+            // InternalTableDSL.g:21997:1: ( rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 )
+            // InternalTableDSL.g:21998:2: rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1
             {
-            pushFollow(FOLLOW_169);
+            pushFollow(FOLLOW_168);
             rule__XThrowExpression__Group__0__Impl();
 
             state._fsp--;
@@ -74347,23 +72389,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XThrowExpression__Group__0__Impl"
-    // InternalTableDSL.g:22626:1: rule__XThrowExpression__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:22005:1: rule__XThrowExpression__Group__0__Impl : ( () ) ;
     public final void rule__XThrowExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22630:1: ( ( () ) )
-            // InternalTableDSL.g:22631:1: ( () )
+            // InternalTableDSL.g:22009:1: ( ( () ) )
+            // InternalTableDSL.g:22010:1: ( () )
             {
-            // InternalTableDSL.g:22631:1: ( () )
-            // InternalTableDSL.g:22632:2: ()
+            // InternalTableDSL.g:22010:1: ( () )
+            // InternalTableDSL.g:22011:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getXThrowExpressionAction_0()); 
             }
-            // InternalTableDSL.g:22633:2: ()
-            // InternalTableDSL.g:22633:3: 
+            // InternalTableDSL.g:22012:2: ()
+            // InternalTableDSL.g:22012:3: 
             {
             }
 
@@ -74388,16 +72430,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XThrowExpression__Group__1"
-    // InternalTableDSL.g:22641:1: rule__XThrowExpression__Group__1 : rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 ;
+    // InternalTableDSL.g:22020:1: rule__XThrowExpression__Group__1 : rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 ;
     public final void rule__XThrowExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22645:1: ( rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 )
-            // InternalTableDSL.g:22646:2: rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2
+            // InternalTableDSL.g:22024:1: ( rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 )
+            // InternalTableDSL.g:22025:2: rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XThrowExpression__Group__1__Impl();
 
             state._fsp--;
@@ -74426,17 +72468,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XThrowExpression__Group__1__Impl"
-    // InternalTableDSL.g:22653:1: rule__XThrowExpression__Group__1__Impl : ( 'throw' ) ;
+    // InternalTableDSL.g:22032:1: rule__XThrowExpression__Group__1__Impl : ( 'throw' ) ;
     public final void rule__XThrowExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22657:1: ( ( 'throw' ) )
-            // InternalTableDSL.g:22658:1: ( 'throw' )
+            // InternalTableDSL.g:22036:1: ( ( 'throw' ) )
+            // InternalTableDSL.g:22037:1: ( 'throw' )
             {
-            // InternalTableDSL.g:22658:1: ( 'throw' )
-            // InternalTableDSL.g:22659:2: 'throw'
+            // InternalTableDSL.g:22037:1: ( 'throw' )
+            // InternalTableDSL.g:22038:2: 'throw'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1()); 
@@ -74467,14 +72509,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XThrowExpression__Group__2"
-    // InternalTableDSL.g:22668:1: rule__XThrowExpression__Group__2 : rule__XThrowExpression__Group__2__Impl ;
+    // InternalTableDSL.g:22047:1: rule__XThrowExpression__Group__2 : rule__XThrowExpression__Group__2__Impl ;
     public final void rule__XThrowExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22672:1: ( rule__XThrowExpression__Group__2__Impl )
-            // InternalTableDSL.g:22673:2: rule__XThrowExpression__Group__2__Impl
+            // InternalTableDSL.g:22051:1: ( rule__XThrowExpression__Group__2__Impl )
+            // InternalTableDSL.g:22052:2: rule__XThrowExpression__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XThrowExpression__Group__2__Impl();
@@ -74500,23 +72542,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XThrowExpression__Group__2__Impl"
-    // InternalTableDSL.g:22679:1: rule__XThrowExpression__Group__2__Impl : ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) ;
+    // InternalTableDSL.g:22058:1: rule__XThrowExpression__Group__2__Impl : ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) ;
     public final void rule__XThrowExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22683:1: ( ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) )
-            // InternalTableDSL.g:22684:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
+            // InternalTableDSL.g:22062:1: ( ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) )
+            // InternalTableDSL.g:22063:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
             {
-            // InternalTableDSL.g:22684:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
-            // InternalTableDSL.g:22685:2: ( rule__XThrowExpression__ExpressionAssignment_2 )
+            // InternalTableDSL.g:22063:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
+            // InternalTableDSL.g:22064:2: ( rule__XThrowExpression__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getExpressionAssignment_2()); 
             }
-            // InternalTableDSL.g:22686:2: ( rule__XThrowExpression__ExpressionAssignment_2 )
-            // InternalTableDSL.g:22686:3: rule__XThrowExpression__ExpressionAssignment_2
+            // InternalTableDSL.g:22065:2: ( rule__XThrowExpression__ExpressionAssignment_2 )
+            // InternalTableDSL.g:22065:3: rule__XThrowExpression__ExpressionAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XThrowExpression__ExpressionAssignment_2();
@@ -74551,16 +72593,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XReturnExpression__Group__0"
-    // InternalTableDSL.g:22695:1: rule__XReturnExpression__Group__0 : rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 ;
+    // InternalTableDSL.g:22074:1: rule__XReturnExpression__Group__0 : rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 ;
     public final void rule__XReturnExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22699:1: ( rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 )
-            // InternalTableDSL.g:22700:2: rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1
+            // InternalTableDSL.g:22078:1: ( rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 )
+            // InternalTableDSL.g:22079:2: rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1
             {
-            pushFollow(FOLLOW_170);
+            pushFollow(FOLLOW_169);
             rule__XReturnExpression__Group__0__Impl();
 
             state._fsp--;
@@ -74589,23 +72631,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XReturnExpression__Group__0__Impl"
-    // InternalTableDSL.g:22707:1: rule__XReturnExpression__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:22086:1: rule__XReturnExpression__Group__0__Impl : ( () ) ;
     public final void rule__XReturnExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22711:1: ( ( () ) )
-            // InternalTableDSL.g:22712:1: ( () )
+            // InternalTableDSL.g:22090:1: ( ( () ) )
+            // InternalTableDSL.g:22091:1: ( () )
             {
-            // InternalTableDSL.g:22712:1: ( () )
-            // InternalTableDSL.g:22713:2: ()
+            // InternalTableDSL.g:22091:1: ( () )
+            // InternalTableDSL.g:22092:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getXReturnExpressionAction_0()); 
             }
-            // InternalTableDSL.g:22714:2: ()
-            // InternalTableDSL.g:22714:3: 
+            // InternalTableDSL.g:22093:2: ()
+            // InternalTableDSL.g:22093:3: 
             {
             }
 
@@ -74630,16 +72672,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XReturnExpression__Group__1"
-    // InternalTableDSL.g:22722:1: rule__XReturnExpression__Group__1 : rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 ;
+    // InternalTableDSL.g:22101:1: rule__XReturnExpression__Group__1 : rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 ;
     public final void rule__XReturnExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22726:1: ( rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 )
-            // InternalTableDSL.g:22727:2: rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2
+            // InternalTableDSL.g:22105:1: ( rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 )
+            // InternalTableDSL.g:22106:2: rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XReturnExpression__Group__1__Impl();
 
             state._fsp--;
@@ -74668,17 +72710,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XReturnExpression__Group__1__Impl"
-    // InternalTableDSL.g:22734:1: rule__XReturnExpression__Group__1__Impl : ( 'return' ) ;
+    // InternalTableDSL.g:22113:1: rule__XReturnExpression__Group__1__Impl : ( 'return' ) ;
     public final void rule__XReturnExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22738:1: ( ( 'return' ) )
-            // InternalTableDSL.g:22739:1: ( 'return' )
+            // InternalTableDSL.g:22117:1: ( ( 'return' ) )
+            // InternalTableDSL.g:22118:1: ( 'return' )
             {
-            // InternalTableDSL.g:22739:1: ( 'return' )
-            // InternalTableDSL.g:22740:2: 'return'
+            // InternalTableDSL.g:22118:1: ( 'return' )
+            // InternalTableDSL.g:22119:2: 'return'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1()); 
@@ -74709,14 +72751,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XReturnExpression__Group__2"
-    // InternalTableDSL.g:22749:1: rule__XReturnExpression__Group__2 : rule__XReturnExpression__Group__2__Impl ;
+    // InternalTableDSL.g:22128:1: rule__XReturnExpression__Group__2 : rule__XReturnExpression__Group__2__Impl ;
     public final void rule__XReturnExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22753:1: ( rule__XReturnExpression__Group__2__Impl )
-            // InternalTableDSL.g:22754:2: rule__XReturnExpression__Group__2__Impl
+            // InternalTableDSL.g:22132:1: ( rule__XReturnExpression__Group__2__Impl )
+            // InternalTableDSL.g:22133:2: rule__XReturnExpression__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XReturnExpression__Group__2__Impl();
@@ -74742,27 +72784,27 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XReturnExpression__Group__2__Impl"
-    // InternalTableDSL.g:22760:1: rule__XReturnExpression__Group__2__Impl : ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) ;
+    // InternalTableDSL.g:22139:1: rule__XReturnExpression__Group__2__Impl : ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) ;
     public final void rule__XReturnExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22764:1: ( ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) )
-            // InternalTableDSL.g:22765:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
+            // InternalTableDSL.g:22143:1: ( ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) )
+            // InternalTableDSL.g:22144:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
             {
-            // InternalTableDSL.g:22765:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
-            // InternalTableDSL.g:22766:2: ( rule__XReturnExpression__ExpressionAssignment_2 )?
+            // InternalTableDSL.g:22144:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
+            // InternalTableDSL.g:22145:2: ( rule__XReturnExpression__ExpressionAssignment_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getExpressionAssignment_2()); 
             }
-            // InternalTableDSL.g:22767:2: ( rule__XReturnExpression__ExpressionAssignment_2 )?
-            int alt158=2;
-            alt158 = dfa158.predict(input);
-            switch (alt158) {
+            // InternalTableDSL.g:22146:2: ( rule__XReturnExpression__ExpressionAssignment_2 )?
+            int alt156=2;
+            alt156 = dfa156.predict(input);
+            switch (alt156) {
                 case 1 :
-                    // InternalTableDSL.g:22767:3: rule__XReturnExpression__ExpressionAssignment_2
+                    // InternalTableDSL.g:22146:3: rule__XReturnExpression__ExpressionAssignment_2
                     {
                     pushFollow(FOLLOW_2);
                     rule__XReturnExpression__ExpressionAssignment_2();
@@ -74800,16 +72842,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__0"
-    // InternalTableDSL.g:22776:1: rule__XTryCatchFinallyExpression__Group__0 : rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 ;
+    // InternalTableDSL.g:22155:1: rule__XTryCatchFinallyExpression__Group__0 : rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 ;
     public final void rule__XTryCatchFinallyExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22780:1: ( rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 )
-            // InternalTableDSL.g:22781:2: rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1
+            // InternalTableDSL.g:22159:1: ( rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 )
+            // InternalTableDSL.g:22160:2: rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1
             {
-            pushFollow(FOLLOW_171);
+            pushFollow(FOLLOW_170);
             rule__XTryCatchFinallyExpression__Group__0__Impl();
 
             state._fsp--;
@@ -74838,23 +72880,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__0__Impl"
-    // InternalTableDSL.g:22788:1: rule__XTryCatchFinallyExpression__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:22167:1: rule__XTryCatchFinallyExpression__Group__0__Impl : ( () ) ;
     public final void rule__XTryCatchFinallyExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22792:1: ( ( () ) )
-            // InternalTableDSL.g:22793:1: ( () )
+            // InternalTableDSL.g:22171:1: ( ( () ) )
+            // InternalTableDSL.g:22172:1: ( () )
             {
-            // InternalTableDSL.g:22793:1: ( () )
-            // InternalTableDSL.g:22794:2: ()
+            // InternalTableDSL.g:22172:1: ( () )
+            // InternalTableDSL.g:22173:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getXTryCatchFinallyExpressionAction_0()); 
             }
-            // InternalTableDSL.g:22795:2: ()
-            // InternalTableDSL.g:22795:3: 
+            // InternalTableDSL.g:22174:2: ()
+            // InternalTableDSL.g:22174:3: 
             {
             }
 
@@ -74879,16 +72921,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__1"
-    // InternalTableDSL.g:22803:1: rule__XTryCatchFinallyExpression__Group__1 : rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 ;
+    // InternalTableDSL.g:22182:1: rule__XTryCatchFinallyExpression__Group__1 : rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 ;
     public final void rule__XTryCatchFinallyExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22807:1: ( rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 )
-            // InternalTableDSL.g:22808:2: rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2
+            // InternalTableDSL.g:22186:1: ( rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 )
+            // InternalTableDSL.g:22187:2: rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XTryCatchFinallyExpression__Group__1__Impl();
 
             state._fsp--;
@@ -74917,17 +72959,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__1__Impl"
-    // InternalTableDSL.g:22815:1: rule__XTryCatchFinallyExpression__Group__1__Impl : ( 'try' ) ;
+    // InternalTableDSL.g:22194:1: rule__XTryCatchFinallyExpression__Group__1__Impl : ( 'try' ) ;
     public final void rule__XTryCatchFinallyExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22819:1: ( ( 'try' ) )
-            // InternalTableDSL.g:22820:1: ( 'try' )
+            // InternalTableDSL.g:22198:1: ( ( 'try' ) )
+            // InternalTableDSL.g:22199:1: ( 'try' )
             {
-            // InternalTableDSL.g:22820:1: ( 'try' )
-            // InternalTableDSL.g:22821:2: 'try'
+            // InternalTableDSL.g:22199:1: ( 'try' )
+            // InternalTableDSL.g:22200:2: 'try'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1()); 
@@ -74958,16 +73000,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__2"
-    // InternalTableDSL.g:22830:1: rule__XTryCatchFinallyExpression__Group__2 : rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 ;
+    // InternalTableDSL.g:22209:1: rule__XTryCatchFinallyExpression__Group__2 : rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 ;
     public final void rule__XTryCatchFinallyExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22834:1: ( rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 )
-            // InternalTableDSL.g:22835:2: rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3
+            // InternalTableDSL.g:22213:1: ( rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 )
+            // InternalTableDSL.g:22214:2: rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3
             {
-            pushFollow(FOLLOW_172);
+            pushFollow(FOLLOW_171);
             rule__XTryCatchFinallyExpression__Group__2__Impl();
 
             state._fsp--;
@@ -74996,23 +73038,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__2__Impl"
-    // InternalTableDSL.g:22842:1: rule__XTryCatchFinallyExpression__Group__2__Impl : ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) ;
+    // InternalTableDSL.g:22221:1: rule__XTryCatchFinallyExpression__Group__2__Impl : ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22846:1: ( ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) )
-            // InternalTableDSL.g:22847:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
+            // InternalTableDSL.g:22225:1: ( ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) )
+            // InternalTableDSL.g:22226:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
             {
-            // InternalTableDSL.g:22847:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
-            // InternalTableDSL.g:22848:2: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
+            // InternalTableDSL.g:22226:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
+            // InternalTableDSL.g:22227:2: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionAssignment_2()); 
             }
-            // InternalTableDSL.g:22849:2: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
-            // InternalTableDSL.g:22849:3: rule__XTryCatchFinallyExpression__ExpressionAssignment_2
+            // InternalTableDSL.g:22228:2: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
+            // InternalTableDSL.g:22228:3: rule__XTryCatchFinallyExpression__ExpressionAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__ExpressionAssignment_2();
@@ -75047,14 +73089,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__3"
-    // InternalTableDSL.g:22857:1: rule__XTryCatchFinallyExpression__Group__3 : rule__XTryCatchFinallyExpression__Group__3__Impl ;
+    // InternalTableDSL.g:22236:1: rule__XTryCatchFinallyExpression__Group__3 : rule__XTryCatchFinallyExpression__Group__3__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22861:1: ( rule__XTryCatchFinallyExpression__Group__3__Impl )
-            // InternalTableDSL.g:22862:2: rule__XTryCatchFinallyExpression__Group__3__Impl
+            // InternalTableDSL.g:22240:1: ( rule__XTryCatchFinallyExpression__Group__3__Impl )
+            // InternalTableDSL.g:22241:2: rule__XTryCatchFinallyExpression__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__3__Impl();
@@ -75080,23 +73122,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__3__Impl"
-    // InternalTableDSL.g:22868:1: rule__XTryCatchFinallyExpression__Group__3__Impl : ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) ;
+    // InternalTableDSL.g:22247:1: rule__XTryCatchFinallyExpression__Group__3__Impl : ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22872:1: ( ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) )
-            // InternalTableDSL.g:22873:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
+            // InternalTableDSL.g:22251:1: ( ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) )
+            // InternalTableDSL.g:22252:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
             {
-            // InternalTableDSL.g:22873:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
-            // InternalTableDSL.g:22874:2: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
+            // InternalTableDSL.g:22252:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
+            // InternalTableDSL.g:22253:2: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getAlternatives_3()); 
             }
-            // InternalTableDSL.g:22875:2: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
-            // InternalTableDSL.g:22875:3: rule__XTryCatchFinallyExpression__Alternatives_3
+            // InternalTableDSL.g:22254:2: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
+            // InternalTableDSL.g:22254:3: rule__XTryCatchFinallyExpression__Alternatives_3
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Alternatives_3();
@@ -75131,16 +73173,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__0"
-    // InternalTableDSL.g:22884:1: rule__XTryCatchFinallyExpression__Group_3_0__0 : rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 ;
+    // InternalTableDSL.g:22263:1: rule__XTryCatchFinallyExpression__Group_3_0__0 : rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22888:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 )
-            // InternalTableDSL.g:22889:2: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1
+            // InternalTableDSL.g:22267:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 )
+            // InternalTableDSL.g:22268:2: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1
             {
-            pushFollow(FOLLOW_173);
+            pushFollow(FOLLOW_172);
             rule__XTryCatchFinallyExpression__Group_3_0__0__Impl();
 
             state._fsp--;
@@ -75169,28 +73211,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__0__Impl"
-    // InternalTableDSL.g:22896:1: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl : ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) ;
+    // InternalTableDSL.g:22275:1: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl : ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22900:1: ( ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) )
-            // InternalTableDSL.g:22901:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
+            // InternalTableDSL.g:22279:1: ( ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) )
+            // InternalTableDSL.g:22280:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
             {
-            // InternalTableDSL.g:22901:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
-            // InternalTableDSL.g:22902:2: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
+            // InternalTableDSL.g:22280:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
+            // InternalTableDSL.g:22281:2: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
             {
-            // InternalTableDSL.g:22902:2: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) )
-            // InternalTableDSL.g:22903:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+            // InternalTableDSL.g:22281:2: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) )
+            // InternalTableDSL.g:22282:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesAssignment_3_0_0()); 
             }
-            // InternalTableDSL.g:22904:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
-            // InternalTableDSL.g:22904:4: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+            // InternalTableDSL.g:22283:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+            // InternalTableDSL.g:22283:4: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
             {
-            pushFollow(FOLLOW_174);
+            pushFollow(FOLLOW_173);
             rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
             state._fsp--;
@@ -75204,34 +73246,34 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
             }
 
-            // InternalTableDSL.g:22907:2: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
-            // InternalTableDSL.g:22908:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
+            // InternalTableDSL.g:22286:2: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
+            // InternalTableDSL.g:22287:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesAssignment_3_0_0()); 
             }
-            // InternalTableDSL.g:22909:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
-            loop159:
+            // InternalTableDSL.g:22288:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
+            loop157:
             do {
-                int alt159=2;
-                int LA159_0 = input.LA(1);
+                int alt157=2;
+                int LA157_0 = input.LA(1);
 
-                if ( (LA159_0==158) ) {
-                    int LA159_2 = input.LA(2);
+                if ( (LA157_0==158) ) {
+                    int LA157_2 = input.LA(2);
 
-                    if ( (synpred237_InternalTableDSL()) ) {
-                        alt159=1;
+                    if ( (synpred235_InternalTableDSL()) ) {
+                        alt157=1;
                     }
 
 
                 }
 
 
-                switch (alt159) {
+                switch (alt157) {
             	case 1 :
-            	    // InternalTableDSL.g:22909:4: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+            	    // InternalTableDSL.g:22288:4: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
             	    {
-            	    pushFollow(FOLLOW_174);
+            	    pushFollow(FOLLOW_173);
             	    rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
             	    state._fsp--;
@@ -75241,7 +73283,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop159;
+            	    break loop157;
                 }
             } while (true);
 
@@ -75273,14 +73315,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__1"
-    // InternalTableDSL.g:22918:1: rule__XTryCatchFinallyExpression__Group_3_0__1 : rule__XTryCatchFinallyExpression__Group_3_0__1__Impl ;
+    // InternalTableDSL.g:22297:1: rule__XTryCatchFinallyExpression__Group_3_0__1 : rule__XTryCatchFinallyExpression__Group_3_0__1__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22922:1: ( rule__XTryCatchFinallyExpression__Group_3_0__1__Impl )
-            // InternalTableDSL.g:22923:2: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl
+            // InternalTableDSL.g:22301:1: ( rule__XTryCatchFinallyExpression__Group_3_0__1__Impl )
+            // InternalTableDSL.g:22302:2: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0__1__Impl();
@@ -75306,35 +73348,35 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__1__Impl"
-    // InternalTableDSL.g:22929:1: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl : ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) ;
+    // InternalTableDSL.g:22308:1: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl : ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22933:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) )
-            // InternalTableDSL.g:22934:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
+            // InternalTableDSL.g:22312:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) )
+            // InternalTableDSL.g:22313:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
             {
-            // InternalTableDSL.g:22934:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
-            // InternalTableDSL.g:22935:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
+            // InternalTableDSL.g:22313:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
+            // InternalTableDSL.g:22314:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup_3_0_1()); 
             }
-            // InternalTableDSL.g:22936:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
-            int alt160=2;
-            int LA160_0 = input.LA(1);
+            // InternalTableDSL.g:22315:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
+            int alt158=2;
+            int LA158_0 = input.LA(1);
 
-            if ( (LA160_0==156) ) {
-                int LA160_1 = input.LA(2);
+            if ( (LA158_0==156) ) {
+                int LA158_1 = input.LA(2);
 
-                if ( (synpred238_InternalTableDSL()) ) {
-                    alt160=1;
+                if ( (synpred236_InternalTableDSL()) ) {
+                    alt158=1;
                 }
             }
-            switch (alt160) {
+            switch (alt158) {
                 case 1 :
-                    // InternalTableDSL.g:22936:3: rule__XTryCatchFinallyExpression__Group_3_0_1__0
+                    // InternalTableDSL.g:22315:3: rule__XTryCatchFinallyExpression__Group_3_0_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XTryCatchFinallyExpression__Group_3_0_1__0();
@@ -75372,16 +73414,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__0"
-    // InternalTableDSL.g:22945:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0 : rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 ;
+    // InternalTableDSL.g:22324:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0 : rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22949:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 )
-            // InternalTableDSL.g:22950:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1
+            // InternalTableDSL.g:22328:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 )
+            // InternalTableDSL.g:22329:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl();
 
             state._fsp--;
@@ -75410,23 +73452,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl"
-    // InternalTableDSL.g:22957:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl : ( ( 'finally' ) ) ;
+    // InternalTableDSL.g:22336:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl : ( ( 'finally' ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22961:1: ( ( ( 'finally' ) ) )
-            // InternalTableDSL.g:22962:1: ( ( 'finally' ) )
+            // InternalTableDSL.g:22340:1: ( ( ( 'finally' ) ) )
+            // InternalTableDSL.g:22341:1: ( ( 'finally' ) )
             {
-            // InternalTableDSL.g:22962:1: ( ( 'finally' ) )
-            // InternalTableDSL.g:22963:2: ( 'finally' )
+            // InternalTableDSL.g:22341:1: ( ( 'finally' ) )
+            // InternalTableDSL.g:22342:2: ( 'finally' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_0_1_0()); 
             }
-            // InternalTableDSL.g:22964:2: ( 'finally' )
-            // InternalTableDSL.g:22964:3: 'finally'
+            // InternalTableDSL.g:22343:2: ( 'finally' )
+            // InternalTableDSL.g:22343:3: 'finally'
             {
             match(input,156,FOLLOW_2); if (state.failed) return ;
 
@@ -75457,14 +73499,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__1"
-    // InternalTableDSL.g:22972:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1 : rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl ;
+    // InternalTableDSL.g:22351:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1 : rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22976:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl )
-            // InternalTableDSL.g:22977:2: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl
+            // InternalTableDSL.g:22355:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl )
+            // InternalTableDSL.g:22356:2: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl();
@@ -75490,23 +73532,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl"
-    // InternalTableDSL.g:22983:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) ;
+    // InternalTableDSL.g:22362:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:22987:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) )
-            // InternalTableDSL.g:22988:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
+            // InternalTableDSL.g:22366:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) )
+            // InternalTableDSL.g:22367:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
             {
-            // InternalTableDSL.g:22988:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
-            // InternalTableDSL.g:22989:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
+            // InternalTableDSL.g:22367:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
+            // InternalTableDSL.g:22368:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionAssignment_3_0_1_1()); 
             }
-            // InternalTableDSL.g:22990:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
-            // InternalTableDSL.g:22990:3: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1
+            // InternalTableDSL.g:22369:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
+            // InternalTableDSL.g:22369:3: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1();
@@ -75541,16 +73583,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__0"
-    // InternalTableDSL.g:22999:1: rule__XTryCatchFinallyExpression__Group_3_1__0 : rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 ;
+    // InternalTableDSL.g:22378:1: rule__XTryCatchFinallyExpression__Group_3_1__0 : rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23003:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 )
-            // InternalTableDSL.g:23004:2: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1
+            // InternalTableDSL.g:22382:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 )
+            // InternalTableDSL.g:22383:2: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XTryCatchFinallyExpression__Group_3_1__0__Impl();
 
             state._fsp--;
@@ -75579,17 +73621,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__0__Impl"
-    // InternalTableDSL.g:23011:1: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl : ( 'finally' ) ;
+    // InternalTableDSL.g:22390:1: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl : ( 'finally' ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23015:1: ( ( 'finally' ) )
-            // InternalTableDSL.g:23016:1: ( 'finally' )
+            // InternalTableDSL.g:22394:1: ( ( 'finally' ) )
+            // InternalTableDSL.g:22395:1: ( 'finally' )
             {
-            // InternalTableDSL.g:23016:1: ( 'finally' )
-            // InternalTableDSL.g:23017:2: 'finally'
+            // InternalTableDSL.g:22395:1: ( 'finally' )
+            // InternalTableDSL.g:22396:2: 'finally'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0()); 
@@ -75620,14 +73662,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__1"
-    // InternalTableDSL.g:23026:1: rule__XTryCatchFinallyExpression__Group_3_1__1 : rule__XTryCatchFinallyExpression__Group_3_1__1__Impl ;
+    // InternalTableDSL.g:22405:1: rule__XTryCatchFinallyExpression__Group_3_1__1 : rule__XTryCatchFinallyExpression__Group_3_1__1__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23030:1: ( rule__XTryCatchFinallyExpression__Group_3_1__1__Impl )
-            // InternalTableDSL.g:23031:2: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl
+            // InternalTableDSL.g:22409:1: ( rule__XTryCatchFinallyExpression__Group_3_1__1__Impl )
+            // InternalTableDSL.g:22410:2: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_1__1__Impl();
@@ -75653,23 +73695,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__1__Impl"
-    // InternalTableDSL.g:23037:1: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) ;
+    // InternalTableDSL.g:22416:1: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23041:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) )
-            // InternalTableDSL.g:23042:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
+            // InternalTableDSL.g:22420:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) )
+            // InternalTableDSL.g:22421:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
             {
-            // InternalTableDSL.g:23042:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
-            // InternalTableDSL.g:23043:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
+            // InternalTableDSL.g:22421:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
+            // InternalTableDSL.g:22422:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionAssignment_3_1_1()); 
             }
-            // InternalTableDSL.g:23044:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
-            // InternalTableDSL.g:23044:3: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1
+            // InternalTableDSL.g:22423:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
+            // InternalTableDSL.g:22423:3: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1();
@@ -75704,16 +73746,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__0"
-    // InternalTableDSL.g:23053:1: rule__XSynchronizedExpression__Group__0 : rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 ;
+    // InternalTableDSL.g:22432:1: rule__XSynchronizedExpression__Group__0 : rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 ;
     public final void rule__XSynchronizedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23057:1: ( rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 )
-            // InternalTableDSL.g:23058:2: rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1
+            // InternalTableDSL.g:22436:1: ( rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 )
+            // InternalTableDSL.g:22437:2: rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XSynchronizedExpression__Group__0__Impl();
 
             state._fsp--;
@@ -75742,23 +73784,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__0__Impl"
-    // InternalTableDSL.g:23065:1: rule__XSynchronizedExpression__Group__0__Impl : ( ( rule__XSynchronizedExpression__Group_0__0 ) ) ;
+    // InternalTableDSL.g:22444:1: rule__XSynchronizedExpression__Group__0__Impl : ( ( rule__XSynchronizedExpression__Group_0__0 ) ) ;
     public final void rule__XSynchronizedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23069:1: ( ( ( rule__XSynchronizedExpression__Group_0__0 ) ) )
-            // InternalTableDSL.g:23070:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
+            // InternalTableDSL.g:22448:1: ( ( ( rule__XSynchronizedExpression__Group_0__0 ) ) )
+            // InternalTableDSL.g:22449:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
             {
-            // InternalTableDSL.g:23070:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
-            // InternalTableDSL.g:23071:2: ( rule__XSynchronizedExpression__Group_0__0 )
+            // InternalTableDSL.g:22449:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
+            // InternalTableDSL.g:22450:2: ( rule__XSynchronizedExpression__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup_0()); 
             }
-            // InternalTableDSL.g:23072:2: ( rule__XSynchronizedExpression__Group_0__0 )
-            // InternalTableDSL.g:23072:3: rule__XSynchronizedExpression__Group_0__0
+            // InternalTableDSL.g:22451:2: ( rule__XSynchronizedExpression__Group_0__0 )
+            // InternalTableDSL.g:22451:3: rule__XSynchronizedExpression__Group_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0__0();
@@ -75793,16 +73835,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__1"
-    // InternalTableDSL.g:23080:1: rule__XSynchronizedExpression__Group__1 : rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 ;
+    // InternalTableDSL.g:22459:1: rule__XSynchronizedExpression__Group__1 : rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 ;
     public final void rule__XSynchronizedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23084:1: ( rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 )
-            // InternalTableDSL.g:23085:2: rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2
+            // InternalTableDSL.g:22463:1: ( rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 )
+            // InternalTableDSL.g:22464:2: rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2
             {
-            pushFollow(FOLLOW_145);
+            pushFollow(FOLLOW_144);
             rule__XSynchronizedExpression__Group__1__Impl();
 
             state._fsp--;
@@ -75831,23 +73873,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__1__Impl"
-    // InternalTableDSL.g:23092:1: rule__XSynchronizedExpression__Group__1__Impl : ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) ;
+    // InternalTableDSL.g:22471:1: rule__XSynchronizedExpression__Group__1__Impl : ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) ;
     public final void rule__XSynchronizedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23096:1: ( ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) )
-            // InternalTableDSL.g:23097:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
+            // InternalTableDSL.g:22475:1: ( ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) )
+            // InternalTableDSL.g:22476:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
             {
-            // InternalTableDSL.g:23097:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
-            // InternalTableDSL.g:23098:2: ( rule__XSynchronizedExpression__ParamAssignment_1 )
+            // InternalTableDSL.g:22476:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
+            // InternalTableDSL.g:22477:2: ( rule__XSynchronizedExpression__ParamAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getParamAssignment_1()); 
             }
-            // InternalTableDSL.g:23099:2: ( rule__XSynchronizedExpression__ParamAssignment_1 )
-            // InternalTableDSL.g:23099:3: rule__XSynchronizedExpression__ParamAssignment_1
+            // InternalTableDSL.g:22478:2: ( rule__XSynchronizedExpression__ParamAssignment_1 )
+            // InternalTableDSL.g:22478:3: rule__XSynchronizedExpression__ParamAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__ParamAssignment_1();
@@ -75882,16 +73924,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__2"
-    // InternalTableDSL.g:23107:1: rule__XSynchronizedExpression__Group__2 : rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 ;
+    // InternalTableDSL.g:22486:1: rule__XSynchronizedExpression__Group__2 : rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 ;
     public final void rule__XSynchronizedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23111:1: ( rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 )
-            // InternalTableDSL.g:23112:2: rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3
+            // InternalTableDSL.g:22490:1: ( rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 )
+            // InternalTableDSL.g:22491:2: rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XSynchronizedExpression__Group__2__Impl();
 
             state._fsp--;
@@ -75920,17 +73962,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__2__Impl"
-    // InternalTableDSL.g:23119:1: rule__XSynchronizedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalTableDSL.g:22498:1: rule__XSynchronizedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XSynchronizedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23123:1: ( ( ')' ) )
-            // InternalTableDSL.g:23124:1: ( ')' )
+            // InternalTableDSL.g:22502:1: ( ( ')' ) )
+            // InternalTableDSL.g:22503:1: ( ')' )
             {
-            // InternalTableDSL.g:23124:1: ( ')' )
-            // InternalTableDSL.g:23125:2: ')'
+            // InternalTableDSL.g:22503:1: ( ')' )
+            // InternalTableDSL.g:22504:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2()); 
@@ -75961,14 +74003,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__3"
-    // InternalTableDSL.g:23134:1: rule__XSynchronizedExpression__Group__3 : rule__XSynchronizedExpression__Group__3__Impl ;
+    // InternalTableDSL.g:22513:1: rule__XSynchronizedExpression__Group__3 : rule__XSynchronizedExpression__Group__3__Impl ;
     public final void rule__XSynchronizedExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23138:1: ( rule__XSynchronizedExpression__Group__3__Impl )
-            // InternalTableDSL.g:23139:2: rule__XSynchronizedExpression__Group__3__Impl
+            // InternalTableDSL.g:22517:1: ( rule__XSynchronizedExpression__Group__3__Impl )
+            // InternalTableDSL.g:22518:2: rule__XSynchronizedExpression__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__3__Impl();
@@ -75994,23 +74036,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__3__Impl"
-    // InternalTableDSL.g:23145:1: rule__XSynchronizedExpression__Group__3__Impl : ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) ;
+    // InternalTableDSL.g:22524:1: rule__XSynchronizedExpression__Group__3__Impl : ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) ;
     public final void rule__XSynchronizedExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23149:1: ( ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) )
-            // InternalTableDSL.g:23150:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
+            // InternalTableDSL.g:22528:1: ( ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) )
+            // InternalTableDSL.g:22529:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
             {
-            // InternalTableDSL.g:23150:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
-            // InternalTableDSL.g:23151:2: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
+            // InternalTableDSL.g:22529:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
+            // InternalTableDSL.g:22530:2: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getExpressionAssignment_3()); 
             }
-            // InternalTableDSL.g:23152:2: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
-            // InternalTableDSL.g:23152:3: rule__XSynchronizedExpression__ExpressionAssignment_3
+            // InternalTableDSL.g:22531:2: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
+            // InternalTableDSL.g:22531:3: rule__XSynchronizedExpression__ExpressionAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__ExpressionAssignment_3();
@@ -76045,14 +74087,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0__0"
-    // InternalTableDSL.g:23161:1: rule__XSynchronizedExpression__Group_0__0 : rule__XSynchronizedExpression__Group_0__0__Impl ;
+    // InternalTableDSL.g:22540:1: rule__XSynchronizedExpression__Group_0__0 : rule__XSynchronizedExpression__Group_0__0__Impl ;
     public final void rule__XSynchronizedExpression__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23165:1: ( rule__XSynchronizedExpression__Group_0__0__Impl )
-            // InternalTableDSL.g:23166:2: rule__XSynchronizedExpression__Group_0__0__Impl
+            // InternalTableDSL.g:22544:1: ( rule__XSynchronizedExpression__Group_0__0__Impl )
+            // InternalTableDSL.g:22545:2: rule__XSynchronizedExpression__Group_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0__0__Impl();
@@ -76078,23 +74120,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0__0__Impl"
-    // InternalTableDSL.g:23172:1: rule__XSynchronizedExpression__Group_0__0__Impl : ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) ;
+    // InternalTableDSL.g:22551:1: rule__XSynchronizedExpression__Group_0__0__Impl : ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) ;
     public final void rule__XSynchronizedExpression__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23176:1: ( ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) )
-            // InternalTableDSL.g:23177:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
+            // InternalTableDSL.g:22555:1: ( ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) )
+            // InternalTableDSL.g:22556:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
             {
-            // InternalTableDSL.g:23177:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
-            // InternalTableDSL.g:23178:2: ( rule__XSynchronizedExpression__Group_0_0__0 )
+            // InternalTableDSL.g:22556:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
+            // InternalTableDSL.g:22557:2: ( rule__XSynchronizedExpression__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup_0_0()); 
             }
-            // InternalTableDSL.g:23179:2: ( rule__XSynchronizedExpression__Group_0_0__0 )
-            // InternalTableDSL.g:23179:3: rule__XSynchronizedExpression__Group_0_0__0
+            // InternalTableDSL.g:22558:2: ( rule__XSynchronizedExpression__Group_0_0__0 )
+            // InternalTableDSL.g:22558:3: rule__XSynchronizedExpression__Group_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__0();
@@ -76129,16 +74171,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__0"
-    // InternalTableDSL.g:23188:1: rule__XSynchronizedExpression__Group_0_0__0 : rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 ;
+    // InternalTableDSL.g:22567:1: rule__XSynchronizedExpression__Group_0_0__0 : rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 ;
     public final void rule__XSynchronizedExpression__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23192:1: ( rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 )
-            // InternalTableDSL.g:23193:2: rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1
+            // InternalTableDSL.g:22571:1: ( rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 )
+            // InternalTableDSL.g:22572:2: rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1
             {
-            pushFollow(FOLLOW_175);
+            pushFollow(FOLLOW_174);
             rule__XSynchronizedExpression__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -76167,23 +74209,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__0__Impl"
-    // InternalTableDSL.g:23200:1: rule__XSynchronizedExpression__Group_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:22579:1: rule__XSynchronizedExpression__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23204:1: ( ( () ) )
-            // InternalTableDSL.g:23205:1: ( () )
+            // InternalTableDSL.g:22583:1: ( ( () ) )
+            // InternalTableDSL.g:22584:1: ( () )
             {
-            // InternalTableDSL.g:23205:1: ( () )
-            // InternalTableDSL.g:23206:2: ()
+            // InternalTableDSL.g:22584:1: ( () )
+            // InternalTableDSL.g:22585:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getXSynchronizedExpressionAction_0_0_0()); 
             }
-            // InternalTableDSL.g:23207:2: ()
-            // InternalTableDSL.g:23207:3: 
+            // InternalTableDSL.g:22586:2: ()
+            // InternalTableDSL.g:22586:3: 
             {
             }
 
@@ -76208,16 +74250,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__1"
-    // InternalTableDSL.g:23215:1: rule__XSynchronizedExpression__Group_0_0__1 : rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 ;
+    // InternalTableDSL.g:22594:1: rule__XSynchronizedExpression__Group_0_0__1 : rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 ;
     public final void rule__XSynchronizedExpression__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23219:1: ( rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 )
-            // InternalTableDSL.g:23220:2: rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2
+            // InternalTableDSL.g:22598:1: ( rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 )
+            // InternalTableDSL.g:22599:2: rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2
             {
-            pushFollow(FOLLOW_96);
+            pushFollow(FOLLOW_95);
             rule__XSynchronizedExpression__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -76246,17 +74288,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__1__Impl"
-    // InternalTableDSL.g:23227:1: rule__XSynchronizedExpression__Group_0_0__1__Impl : ( 'synchronized' ) ;
+    // InternalTableDSL.g:22606:1: rule__XSynchronizedExpression__Group_0_0__1__Impl : ( 'synchronized' ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23231:1: ( ( 'synchronized' ) )
-            // InternalTableDSL.g:23232:1: ( 'synchronized' )
+            // InternalTableDSL.g:22610:1: ( ( 'synchronized' ) )
+            // InternalTableDSL.g:22611:1: ( 'synchronized' )
             {
-            // InternalTableDSL.g:23232:1: ( 'synchronized' )
-            // InternalTableDSL.g:23233:2: 'synchronized'
+            // InternalTableDSL.g:22611:1: ( 'synchronized' )
+            // InternalTableDSL.g:22612:2: 'synchronized'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1()); 
@@ -76287,14 +74329,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__2"
-    // InternalTableDSL.g:23242:1: rule__XSynchronizedExpression__Group_0_0__2 : rule__XSynchronizedExpression__Group_0_0__2__Impl ;
+    // InternalTableDSL.g:22621:1: rule__XSynchronizedExpression__Group_0_0__2 : rule__XSynchronizedExpression__Group_0_0__2__Impl ;
     public final void rule__XSynchronizedExpression__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23246:1: ( rule__XSynchronizedExpression__Group_0_0__2__Impl )
-            // InternalTableDSL.g:23247:2: rule__XSynchronizedExpression__Group_0_0__2__Impl
+            // InternalTableDSL.g:22625:1: ( rule__XSynchronizedExpression__Group_0_0__2__Impl )
+            // InternalTableDSL.g:22626:2: rule__XSynchronizedExpression__Group_0_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__2__Impl();
@@ -76320,17 +74362,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__2__Impl"
-    // InternalTableDSL.g:23253:1: rule__XSynchronizedExpression__Group_0_0__2__Impl : ( '(' ) ;
+    // InternalTableDSL.g:22632:1: rule__XSynchronizedExpression__Group_0_0__2__Impl : ( '(' ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23257:1: ( ( '(' ) )
-            // InternalTableDSL.g:23258:1: ( '(' )
+            // InternalTableDSL.g:22636:1: ( ( '(' ) )
+            // InternalTableDSL.g:22637:1: ( '(' )
             {
-            // InternalTableDSL.g:23258:1: ( '(' )
-            // InternalTableDSL.g:23259:2: '('
+            // InternalTableDSL.g:22637:1: ( '(' )
+            // InternalTableDSL.g:22638:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
@@ -76361,16 +74403,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCatchClause__Group__0"
-    // InternalTableDSL.g:23269:1: rule__XCatchClause__Group__0 : rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 ;
+    // InternalTableDSL.g:22648:1: rule__XCatchClause__Group__0 : rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 ;
     public final void rule__XCatchClause__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23273:1: ( rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 )
-            // InternalTableDSL.g:23274:2: rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1
+            // InternalTableDSL.g:22652:1: ( rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 )
+            // InternalTableDSL.g:22653:2: rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1
             {
-            pushFollow(FOLLOW_96);
+            pushFollow(FOLLOW_95);
             rule__XCatchClause__Group__0__Impl();
 
             state._fsp--;
@@ -76399,23 +74441,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCatchClause__Group__0__Impl"
-    // InternalTableDSL.g:23281:1: rule__XCatchClause__Group__0__Impl : ( ( 'catch' ) ) ;
+    // InternalTableDSL.g:22660:1: rule__XCatchClause__Group__0__Impl : ( ( 'catch' ) ) ;
     public final void rule__XCatchClause__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23285:1: ( ( ( 'catch' ) ) )
-            // InternalTableDSL.g:23286:1: ( ( 'catch' ) )
+            // InternalTableDSL.g:22664:1: ( ( ( 'catch' ) ) )
+            // InternalTableDSL.g:22665:1: ( ( 'catch' ) )
             {
-            // InternalTableDSL.g:23286:1: ( ( 'catch' ) )
-            // InternalTableDSL.g:23287:2: ( 'catch' )
+            // InternalTableDSL.g:22665:1: ( ( 'catch' ) )
+            // InternalTableDSL.g:22666:2: ( 'catch' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getCatchKeyword_0()); 
             }
-            // InternalTableDSL.g:23288:2: ( 'catch' )
-            // InternalTableDSL.g:23288:3: 'catch'
+            // InternalTableDSL.g:22667:2: ( 'catch' )
+            // InternalTableDSL.g:22667:3: 'catch'
             {
             match(input,158,FOLLOW_2); if (state.failed) return ;
 
@@ -76446,16 +74488,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCatchClause__Group__1"
-    // InternalTableDSL.g:23296:1: rule__XCatchClause__Group__1 : rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 ;
+    // InternalTableDSL.g:22675:1: rule__XCatchClause__Group__1 : rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 ;
     public final void rule__XCatchClause__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23300:1: ( rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 )
-            // InternalTableDSL.g:23301:2: rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2
+            // InternalTableDSL.g:22679:1: ( rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 )
+            // InternalTableDSL.g:22680:2: rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__XCatchClause__Group__1__Impl();
 
             state._fsp--;
@@ -76484,17 +74526,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCatchClause__Group__1__Impl"
-    // InternalTableDSL.g:23308:1: rule__XCatchClause__Group__1__Impl : ( '(' ) ;
+    // InternalTableDSL.g:22687:1: rule__XCatchClause__Group__1__Impl : ( '(' ) ;
     public final void rule__XCatchClause__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23312:1: ( ( '(' ) )
-            // InternalTableDSL.g:23313:1: ( '(' )
+            // InternalTableDSL.g:22691:1: ( ( '(' ) )
+            // InternalTableDSL.g:22692:1: ( '(' )
             {
-            // InternalTableDSL.g:23313:1: ( '(' )
-            // InternalTableDSL.g:23314:2: '('
+            // InternalTableDSL.g:22692:1: ( '(' )
+            // InternalTableDSL.g:22693:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1()); 
@@ -76525,16 +74567,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCatchClause__Group__2"
-    // InternalTableDSL.g:23323:1: rule__XCatchClause__Group__2 : rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 ;
+    // InternalTableDSL.g:22702:1: rule__XCatchClause__Group__2 : rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 ;
     public final void rule__XCatchClause__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23327:1: ( rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 )
-            // InternalTableDSL.g:23328:2: rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3
+            // InternalTableDSL.g:22706:1: ( rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 )
+            // InternalTableDSL.g:22707:2: rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3
             {
-            pushFollow(FOLLOW_145);
+            pushFollow(FOLLOW_144);
             rule__XCatchClause__Group__2__Impl();
 
             state._fsp--;
@@ -76563,23 +74605,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCatchClause__Group__2__Impl"
-    // InternalTableDSL.g:23335:1: rule__XCatchClause__Group__2__Impl : ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) ;
+    // InternalTableDSL.g:22714:1: rule__XCatchClause__Group__2__Impl : ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) ;
     public final void rule__XCatchClause__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23339:1: ( ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) )
-            // InternalTableDSL.g:23340:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
+            // InternalTableDSL.g:22718:1: ( ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) )
+            // InternalTableDSL.g:22719:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
             {
-            // InternalTableDSL.g:23340:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
-            // InternalTableDSL.g:23341:2: ( rule__XCatchClause__DeclaredParamAssignment_2 )
+            // InternalTableDSL.g:22719:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
+            // InternalTableDSL.g:22720:2: ( rule__XCatchClause__DeclaredParamAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getDeclaredParamAssignment_2()); 
             }
-            // InternalTableDSL.g:23342:2: ( rule__XCatchClause__DeclaredParamAssignment_2 )
-            // InternalTableDSL.g:23342:3: rule__XCatchClause__DeclaredParamAssignment_2
+            // InternalTableDSL.g:22721:2: ( rule__XCatchClause__DeclaredParamAssignment_2 )
+            // InternalTableDSL.g:22721:3: rule__XCatchClause__DeclaredParamAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XCatchClause__DeclaredParamAssignment_2();
@@ -76614,16 +74656,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCatchClause__Group__3"
-    // InternalTableDSL.g:23350:1: rule__XCatchClause__Group__3 : rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 ;
+    // InternalTableDSL.g:22729:1: rule__XCatchClause__Group__3 : rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 ;
     public final void rule__XCatchClause__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23354:1: ( rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 )
-            // InternalTableDSL.g:23355:2: rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4
+            // InternalTableDSL.g:22733:1: ( rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 )
+            // InternalTableDSL.g:22734:2: rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_99);
             rule__XCatchClause__Group__3__Impl();
 
             state._fsp--;
@@ -76652,17 +74694,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCatchClause__Group__3__Impl"
-    // InternalTableDSL.g:23362:1: rule__XCatchClause__Group__3__Impl : ( ')' ) ;
+    // InternalTableDSL.g:22741:1: rule__XCatchClause__Group__3__Impl : ( ')' ) ;
     public final void rule__XCatchClause__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23366:1: ( ( ')' ) )
-            // InternalTableDSL.g:23367:1: ( ')' )
+            // InternalTableDSL.g:22745:1: ( ( ')' ) )
+            // InternalTableDSL.g:22746:1: ( ')' )
             {
-            // InternalTableDSL.g:23367:1: ( ')' )
-            // InternalTableDSL.g:23368:2: ')'
+            // InternalTableDSL.g:22746:1: ( ')' )
+            // InternalTableDSL.g:22747:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3()); 
@@ -76693,14 +74735,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCatchClause__Group__4"
-    // InternalTableDSL.g:23377:1: rule__XCatchClause__Group__4 : rule__XCatchClause__Group__4__Impl ;
+    // InternalTableDSL.g:22756:1: rule__XCatchClause__Group__4 : rule__XCatchClause__Group__4__Impl ;
     public final void rule__XCatchClause__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23381:1: ( rule__XCatchClause__Group__4__Impl )
-            // InternalTableDSL.g:23382:2: rule__XCatchClause__Group__4__Impl
+            // InternalTableDSL.g:22760:1: ( rule__XCatchClause__Group__4__Impl )
+            // InternalTableDSL.g:22761:2: rule__XCatchClause__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__4__Impl();
@@ -76726,23 +74768,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCatchClause__Group__4__Impl"
-    // InternalTableDSL.g:23388:1: rule__XCatchClause__Group__4__Impl : ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) ;
+    // InternalTableDSL.g:22767:1: rule__XCatchClause__Group__4__Impl : ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) ;
     public final void rule__XCatchClause__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23392:1: ( ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) )
-            // InternalTableDSL.g:23393:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
+            // InternalTableDSL.g:22771:1: ( ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) )
+            // InternalTableDSL.g:22772:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
             {
-            // InternalTableDSL.g:23393:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
-            // InternalTableDSL.g:23394:2: ( rule__XCatchClause__ExpressionAssignment_4 )
+            // InternalTableDSL.g:22772:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
+            // InternalTableDSL.g:22773:2: ( rule__XCatchClause__ExpressionAssignment_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getExpressionAssignment_4()); 
             }
-            // InternalTableDSL.g:23395:2: ( rule__XCatchClause__ExpressionAssignment_4 )
-            // InternalTableDSL.g:23395:3: rule__XCatchClause__ExpressionAssignment_4
+            // InternalTableDSL.g:22774:2: ( rule__XCatchClause__ExpressionAssignment_4 )
+            // InternalTableDSL.g:22774:3: rule__XCatchClause__ExpressionAssignment_4
             {
             pushFollow(FOLLOW_2);
             rule__XCatchClause__ExpressionAssignment_4();
@@ -76777,16 +74819,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedName__Group__0"
-    // InternalTableDSL.g:23404:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
+    // InternalTableDSL.g:22783:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
     public final void rule__QualifiedName__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23408:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
-            // InternalTableDSL.g:23409:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
+            // InternalTableDSL.g:22787:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
+            // InternalTableDSL.g:22788:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
             {
-            pushFollow(FOLLOW_68);
+            pushFollow(FOLLOW_66);
             rule__QualifiedName__Group__0__Impl();
 
             state._fsp--;
@@ -76815,17 +74857,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedName__Group__0__Impl"
-    // InternalTableDSL.g:23416:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
+    // InternalTableDSL.g:22795:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23420:1: ( ( ruleValidID ) )
-            // InternalTableDSL.g:23421:1: ( ruleValidID )
+            // InternalTableDSL.g:22799:1: ( ( ruleValidID ) )
+            // InternalTableDSL.g:22800:1: ( ruleValidID )
             {
-            // InternalTableDSL.g:23421:1: ( ruleValidID )
-            // InternalTableDSL.g:23422:2: ruleValidID
+            // InternalTableDSL.g:22800:1: ( ruleValidID )
+            // InternalTableDSL.g:22801:2: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0()); 
@@ -76860,14 +74902,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedName__Group__1"
-    // InternalTableDSL.g:23431:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
+    // InternalTableDSL.g:22810:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
     public final void rule__QualifiedName__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23435:1: ( rule__QualifiedName__Group__1__Impl )
-            // InternalTableDSL.g:23436:2: rule__QualifiedName__Group__1__Impl
+            // InternalTableDSL.g:22814:1: ( rule__QualifiedName__Group__1__Impl )
+            // InternalTableDSL.g:22815:2: rule__QualifiedName__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Group__1__Impl();
@@ -76893,35 +74935,35 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedName__Group__1__Impl"
-    // InternalTableDSL.g:23442:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
+    // InternalTableDSL.g:22821:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
     public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23446:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
-            // InternalTableDSL.g:23447:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // InternalTableDSL.g:22825:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
+            // InternalTableDSL.g:22826:1: ( ( rule__QualifiedName__Group_1__0 )* )
             {
-            // InternalTableDSL.g:23447:1: ( ( rule__QualifiedName__Group_1__0 )* )
-            // InternalTableDSL.g:23448:2: ( rule__QualifiedName__Group_1__0 )*
+            // InternalTableDSL.g:22826:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // InternalTableDSL.g:22827:2: ( rule__QualifiedName__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getGroup_1()); 
             }
-            // InternalTableDSL.g:23449:2: ( rule__QualifiedName__Group_1__0 )*
-            loop161:
+            // InternalTableDSL.g:22828:2: ( rule__QualifiedName__Group_1__0 )*
+            loop159:
             do {
-                int alt161=2;
-                int LA161_0 = input.LA(1);
+                int alt159=2;
+                int LA159_0 = input.LA(1);
 
-                if ( (LA161_0==46) ) {
-                    int LA161_2 = input.LA(2);
+                if ( (LA159_0==46) ) {
+                    int LA159_2 = input.LA(2);
 
-                    if ( (LA161_2==RULE_ID) ) {
-                        int LA161_3 = input.LA(3);
+                    if ( (LA159_2==RULE_ID) ) {
+                        int LA159_3 = input.LA(3);
 
-                        if ( (synpred239_InternalTableDSL()) ) {
-                            alt161=1;
+                        if ( (synpred237_InternalTableDSL()) ) {
+                            alt159=1;
                         }
 
 
@@ -76931,11 +74973,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                 }
 
 
-                switch (alt161) {
+                switch (alt159) {
             	case 1 :
-            	    // InternalTableDSL.g:23449:3: rule__QualifiedName__Group_1__0
+            	    // InternalTableDSL.g:22828:3: rule__QualifiedName__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_176);
+            	    pushFollow(FOLLOW_175);
             	    rule__QualifiedName__Group_1__0();
 
             	    state._fsp--;
@@ -76945,7 +74987,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop161;
+            	    break loop159;
                 }
             } while (true);
 
@@ -76974,14 +75016,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0"
-    // InternalTableDSL.g:23458:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
+    // InternalTableDSL.g:22837:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
     public final void rule__QualifiedName__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23462:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
-            // InternalTableDSL.g:23463:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
+            // InternalTableDSL.g:22841:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
+            // InternalTableDSL.g:22842:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
             {
             pushFollow(FOLLOW_7);
             rule__QualifiedName__Group_1__0__Impl();
@@ -77012,23 +75054,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0__Impl"
-    // InternalTableDSL.g:23470:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
+    // InternalTableDSL.g:22849:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
     public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23474:1: ( ( ( '.' ) ) )
-            // InternalTableDSL.g:23475:1: ( ( '.' ) )
+            // InternalTableDSL.g:22853:1: ( ( ( '.' ) ) )
+            // InternalTableDSL.g:22854:1: ( ( '.' ) )
             {
-            // InternalTableDSL.g:23475:1: ( ( '.' ) )
-            // InternalTableDSL.g:23476:2: ( '.' )
+            // InternalTableDSL.g:22854:1: ( ( '.' ) )
+            // InternalTableDSL.g:22855:2: ( '.' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0()); 
             }
-            // InternalTableDSL.g:23477:2: ( '.' )
-            // InternalTableDSL.g:23477:3: '.'
+            // InternalTableDSL.g:22856:2: ( '.' )
+            // InternalTableDSL.g:22856:3: '.'
             {
             match(input,46,FOLLOW_2); if (state.failed) return ;
 
@@ -77059,14 +75101,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1"
-    // InternalTableDSL.g:23485:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
+    // InternalTableDSL.g:22864:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
     public final void rule__QualifiedName__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23489:1: ( rule__QualifiedName__Group_1__1__Impl )
-            // InternalTableDSL.g:23490:2: rule__QualifiedName__Group_1__1__Impl
+            // InternalTableDSL.g:22868:1: ( rule__QualifiedName__Group_1__1__Impl )
+            // InternalTableDSL.g:22869:2: rule__QualifiedName__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Group_1__1__Impl();
@@ -77092,17 +75134,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1__Impl"
-    // InternalTableDSL.g:23496:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
+    // InternalTableDSL.g:22875:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedName__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23500:1: ( ( ruleValidID ) )
-            // InternalTableDSL.g:23501:1: ( ruleValidID )
+            // InternalTableDSL.g:22879:1: ( ( ruleValidID ) )
+            // InternalTableDSL.g:22880:1: ( ruleValidID )
             {
-            // InternalTableDSL.g:23501:1: ( ruleValidID )
-            // InternalTableDSL.g:23502:2: ruleValidID
+            // InternalTableDSL.g:22880:1: ( ruleValidID )
+            // InternalTableDSL.g:22881:2: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1()); 
@@ -77137,16 +75179,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Number__Group_1__0"
-    // InternalTableDSL.g:23512:1: rule__Number__Group_1__0 : rule__Number__Group_1__0__Impl rule__Number__Group_1__1 ;
+    // InternalTableDSL.g:22891:1: rule__Number__Group_1__0 : rule__Number__Group_1__0__Impl rule__Number__Group_1__1 ;
     public final void rule__Number__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23516:1: ( rule__Number__Group_1__0__Impl rule__Number__Group_1__1 )
-            // InternalTableDSL.g:23517:2: rule__Number__Group_1__0__Impl rule__Number__Group_1__1
+            // InternalTableDSL.g:22895:1: ( rule__Number__Group_1__0__Impl rule__Number__Group_1__1 )
+            // InternalTableDSL.g:22896:2: rule__Number__Group_1__0__Impl rule__Number__Group_1__1
             {
-            pushFollow(FOLLOW_68);
+            pushFollow(FOLLOW_66);
             rule__Number__Group_1__0__Impl();
 
             state._fsp--;
@@ -77175,23 +75217,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Number__Group_1__0__Impl"
-    // InternalTableDSL.g:23524:1: rule__Number__Group_1__0__Impl : ( ( rule__Number__Alternatives_1_0 ) ) ;
+    // InternalTableDSL.g:22903:1: rule__Number__Group_1__0__Impl : ( ( rule__Number__Alternatives_1_0 ) ) ;
     public final void rule__Number__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23528:1: ( ( ( rule__Number__Alternatives_1_0 ) ) )
-            // InternalTableDSL.g:23529:1: ( ( rule__Number__Alternatives_1_0 ) )
+            // InternalTableDSL.g:22907:1: ( ( ( rule__Number__Alternatives_1_0 ) ) )
+            // InternalTableDSL.g:22908:1: ( ( rule__Number__Alternatives_1_0 ) )
             {
-            // InternalTableDSL.g:23529:1: ( ( rule__Number__Alternatives_1_0 ) )
-            // InternalTableDSL.g:23530:2: ( rule__Number__Alternatives_1_0 )
+            // InternalTableDSL.g:22908:1: ( ( rule__Number__Alternatives_1_0 ) )
+            // InternalTableDSL.g:22909:2: ( rule__Number__Alternatives_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives_1_0()); 
             }
-            // InternalTableDSL.g:23531:2: ( rule__Number__Alternatives_1_0 )
-            // InternalTableDSL.g:23531:3: rule__Number__Alternatives_1_0
+            // InternalTableDSL.g:22910:2: ( rule__Number__Alternatives_1_0 )
+            // InternalTableDSL.g:22910:3: rule__Number__Alternatives_1_0
             {
             pushFollow(FOLLOW_2);
             rule__Number__Alternatives_1_0();
@@ -77226,14 +75268,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Number__Group_1__1"
-    // InternalTableDSL.g:23539:1: rule__Number__Group_1__1 : rule__Number__Group_1__1__Impl ;
+    // InternalTableDSL.g:22918:1: rule__Number__Group_1__1 : rule__Number__Group_1__1__Impl ;
     public final void rule__Number__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23543:1: ( rule__Number__Group_1__1__Impl )
-            // InternalTableDSL.g:23544:2: rule__Number__Group_1__1__Impl
+            // InternalTableDSL.g:22922:1: ( rule__Number__Group_1__1__Impl )
+            // InternalTableDSL.g:22923:2: rule__Number__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Number__Group_1__1__Impl();
@@ -77259,35 +75301,35 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Number__Group_1__1__Impl"
-    // InternalTableDSL.g:23550:1: rule__Number__Group_1__1__Impl : ( ( rule__Number__Group_1_1__0 )? ) ;
+    // InternalTableDSL.g:22929:1: rule__Number__Group_1__1__Impl : ( ( rule__Number__Group_1_1__0 )? ) ;
     public final void rule__Number__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23554:1: ( ( ( rule__Number__Group_1_1__0 )? ) )
-            // InternalTableDSL.g:23555:1: ( ( rule__Number__Group_1_1__0 )? )
+            // InternalTableDSL.g:22933:1: ( ( ( rule__Number__Group_1_1__0 )? ) )
+            // InternalTableDSL.g:22934:1: ( ( rule__Number__Group_1_1__0 )? )
             {
-            // InternalTableDSL.g:23555:1: ( ( rule__Number__Group_1_1__0 )? )
-            // InternalTableDSL.g:23556:2: ( rule__Number__Group_1_1__0 )?
+            // InternalTableDSL.g:22934:1: ( ( rule__Number__Group_1_1__0 )? )
+            // InternalTableDSL.g:22935:2: ( rule__Number__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getGroup_1_1()); 
             }
-            // InternalTableDSL.g:23557:2: ( rule__Number__Group_1_1__0 )?
-            int alt162=2;
-            int LA162_0 = input.LA(1);
+            // InternalTableDSL.g:22936:2: ( rule__Number__Group_1_1__0 )?
+            int alt160=2;
+            int LA160_0 = input.LA(1);
 
-            if ( (LA162_0==46) ) {
-                int LA162_1 = input.LA(2);
+            if ( (LA160_0==46) ) {
+                int LA160_1 = input.LA(2);
 
-                if ( ((LA162_1>=RULE_INT && LA162_1<=RULE_DECIMAL)) ) {
-                    alt162=1;
+                if ( ((LA160_1>=RULE_INT && LA160_1<=RULE_DECIMAL)) ) {
+                    alt160=1;
                 }
             }
-            switch (alt162) {
+            switch (alt160) {
                 case 1 :
-                    // InternalTableDSL.g:23557:3: rule__Number__Group_1_1__0
+                    // InternalTableDSL.g:22936:3: rule__Number__Group_1_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Number__Group_1_1__0();
@@ -77325,16 +75367,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Number__Group_1_1__0"
-    // InternalTableDSL.g:23566:1: rule__Number__Group_1_1__0 : rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 ;
+    // InternalTableDSL.g:22945:1: rule__Number__Group_1_1__0 : rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 ;
     public final void rule__Number__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23570:1: ( rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 )
-            // InternalTableDSL.g:23571:2: rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1
+            // InternalTableDSL.g:22949:1: ( rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 )
+            // InternalTableDSL.g:22950:2: rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1
             {
-            pushFollow(FOLLOW_177);
+            pushFollow(FOLLOW_176);
             rule__Number__Group_1_1__0__Impl();
 
             state._fsp--;
@@ -77363,17 +75405,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Number__Group_1_1__0__Impl"
-    // InternalTableDSL.g:23578:1: rule__Number__Group_1_1__0__Impl : ( '.' ) ;
+    // InternalTableDSL.g:22957:1: rule__Number__Group_1_1__0__Impl : ( '.' ) ;
     public final void rule__Number__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23582:1: ( ( '.' ) )
-            // InternalTableDSL.g:23583:1: ( '.' )
+            // InternalTableDSL.g:22961:1: ( ( '.' ) )
+            // InternalTableDSL.g:22962:1: ( '.' )
             {
-            // InternalTableDSL.g:23583:1: ( '.' )
-            // InternalTableDSL.g:23584:2: '.'
+            // InternalTableDSL.g:22962:1: ( '.' )
+            // InternalTableDSL.g:22963:2: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0()); 
@@ -77404,14 +75446,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Number__Group_1_1__1"
-    // InternalTableDSL.g:23593:1: rule__Number__Group_1_1__1 : rule__Number__Group_1_1__1__Impl ;
+    // InternalTableDSL.g:22972:1: rule__Number__Group_1_1__1 : rule__Number__Group_1_1__1__Impl ;
     public final void rule__Number__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23597:1: ( rule__Number__Group_1_1__1__Impl )
-            // InternalTableDSL.g:23598:2: rule__Number__Group_1_1__1__Impl
+            // InternalTableDSL.g:22976:1: ( rule__Number__Group_1_1__1__Impl )
+            // InternalTableDSL.g:22977:2: rule__Number__Group_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Number__Group_1_1__1__Impl();
@@ -77437,23 +75479,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Number__Group_1_1__1__Impl"
-    // InternalTableDSL.g:23604:1: rule__Number__Group_1_1__1__Impl : ( ( rule__Number__Alternatives_1_1_1 ) ) ;
+    // InternalTableDSL.g:22983:1: rule__Number__Group_1_1__1__Impl : ( ( rule__Number__Alternatives_1_1_1 ) ) ;
     public final void rule__Number__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23608:1: ( ( ( rule__Number__Alternatives_1_1_1 ) ) )
-            // InternalTableDSL.g:23609:1: ( ( rule__Number__Alternatives_1_1_1 ) )
+            // InternalTableDSL.g:22987:1: ( ( ( rule__Number__Alternatives_1_1_1 ) ) )
+            // InternalTableDSL.g:22988:1: ( ( rule__Number__Alternatives_1_1_1 ) )
             {
-            // InternalTableDSL.g:23609:1: ( ( rule__Number__Alternatives_1_1_1 ) )
-            // InternalTableDSL.g:23610:2: ( rule__Number__Alternatives_1_1_1 )
+            // InternalTableDSL.g:22988:1: ( ( rule__Number__Alternatives_1_1_1 ) )
+            // InternalTableDSL.g:22989:2: ( rule__Number__Alternatives_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives_1_1_1()); 
             }
-            // InternalTableDSL.g:23611:2: ( rule__Number__Alternatives_1_1_1 )
-            // InternalTableDSL.g:23611:3: rule__Number__Alternatives_1_1_1
+            // InternalTableDSL.g:22990:2: ( rule__Number__Alternatives_1_1_1 )
+            // InternalTableDSL.g:22990:3: rule__Number__Alternatives_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Number__Alternatives_1_1_1();
@@ -77488,16 +75530,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__0"
-    // InternalTableDSL.g:23620:1: rule__JvmTypeReference__Group_0__0 : rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 ;
+    // InternalTableDSL.g:22999:1: rule__JvmTypeReference__Group_0__0 : rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 ;
     public final void rule__JvmTypeReference__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23624:1: ( rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 )
-            // InternalTableDSL.g:23625:2: rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1
+            // InternalTableDSL.g:23003:1: ( rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 )
+            // InternalTableDSL.g:23004:2: rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1
             {
-            pushFollow(FOLLOW_104);
+            pushFollow(FOLLOW_103);
             rule__JvmTypeReference__Group_0__0__Impl();
 
             state._fsp--;
@@ -77526,17 +75568,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__0__Impl"
-    // InternalTableDSL.g:23632:1: rule__JvmTypeReference__Group_0__0__Impl : ( ruleJvmParameterizedTypeReference ) ;
+    // InternalTableDSL.g:23011:1: rule__JvmTypeReference__Group_0__0__Impl : ( ruleJvmParameterizedTypeReference ) ;
     public final void rule__JvmTypeReference__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23636:1: ( ( ruleJvmParameterizedTypeReference ) )
-            // InternalTableDSL.g:23637:1: ( ruleJvmParameterizedTypeReference )
+            // InternalTableDSL.g:23015:1: ( ( ruleJvmParameterizedTypeReference ) )
+            // InternalTableDSL.g:23016:1: ( ruleJvmParameterizedTypeReference )
             {
-            // InternalTableDSL.g:23637:1: ( ruleJvmParameterizedTypeReference )
-            // InternalTableDSL.g:23638:2: ruleJvmParameterizedTypeReference
+            // InternalTableDSL.g:23016:1: ( ruleJvmParameterizedTypeReference )
+            // InternalTableDSL.g:23017:2: ruleJvmParameterizedTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getJvmParameterizedTypeReferenceParserRuleCall_0_0()); 
@@ -77571,14 +75613,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__1"
-    // InternalTableDSL.g:23647:1: rule__JvmTypeReference__Group_0__1 : rule__JvmTypeReference__Group_0__1__Impl ;
+    // InternalTableDSL.g:23026:1: rule__JvmTypeReference__Group_0__1 : rule__JvmTypeReference__Group_0__1__Impl ;
     public final void rule__JvmTypeReference__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23651:1: ( rule__JvmTypeReference__Group_0__1__Impl )
-            // InternalTableDSL.g:23652:2: rule__JvmTypeReference__Group_0__1__Impl
+            // InternalTableDSL.g:23030:1: ( rule__JvmTypeReference__Group_0__1__Impl )
+            // InternalTableDSL.g:23031:2: rule__JvmTypeReference__Group_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0__1__Impl();
@@ -77604,35 +75646,35 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__1__Impl"
-    // InternalTableDSL.g:23658:1: rule__JvmTypeReference__Group_0__1__Impl : ( ( rule__JvmTypeReference__Group_0_1__0 )* ) ;
+    // InternalTableDSL.g:23037:1: rule__JvmTypeReference__Group_0__1__Impl : ( ( rule__JvmTypeReference__Group_0_1__0 )* ) ;
     public final void rule__JvmTypeReference__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23662:1: ( ( ( rule__JvmTypeReference__Group_0_1__0 )* ) )
-            // InternalTableDSL.g:23663:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
+            // InternalTableDSL.g:23041:1: ( ( ( rule__JvmTypeReference__Group_0_1__0 )* ) )
+            // InternalTableDSL.g:23042:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
             {
-            // InternalTableDSL.g:23663:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
-            // InternalTableDSL.g:23664:2: ( rule__JvmTypeReference__Group_0_1__0 )*
+            // InternalTableDSL.g:23042:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
+            // InternalTableDSL.g:23043:2: ( rule__JvmTypeReference__Group_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0_1()); 
             }
-            // InternalTableDSL.g:23665:2: ( rule__JvmTypeReference__Group_0_1__0 )*
-            loop163:
+            // InternalTableDSL.g:23044:2: ( rule__JvmTypeReference__Group_0_1__0 )*
+            loop161:
             do {
-                int alt163=2;
-                int LA163_0 = input.LA(1);
+                int alt161=2;
+                int LA161_0 = input.LA(1);
 
-                if ( (LA163_0==140) ) {
-                    int LA163_2 = input.LA(2);
+                if ( (LA161_0==140) ) {
+                    int LA161_2 = input.LA(2);
 
-                    if ( (LA163_2==138) ) {
-                        int LA163_3 = input.LA(3);
+                    if ( (LA161_2==138) ) {
+                        int LA161_3 = input.LA(3);
 
-                        if ( (synpred241_InternalTableDSL()) ) {
-                            alt163=1;
+                        if ( (synpred239_InternalTableDSL()) ) {
+                            alt161=1;
                         }
 
 
@@ -77642,11 +75684,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                 }
 
 
-                switch (alt163) {
+                switch (alt161) {
             	case 1 :
-            	    // InternalTableDSL.g:23665:3: rule__JvmTypeReference__Group_0_1__0
+            	    // InternalTableDSL.g:23044:3: rule__JvmTypeReference__Group_0_1__0
             	    {
-            	    pushFollow(FOLLOW_168);
+            	    pushFollow(FOLLOW_167);
             	    rule__JvmTypeReference__Group_0_1__0();
 
             	    state._fsp--;
@@ -77656,7 +75698,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop163;
+            	    break loop161;
                 }
             } while (true);
 
@@ -77685,14 +75727,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1__0"
-    // InternalTableDSL.g:23674:1: rule__JvmTypeReference__Group_0_1__0 : rule__JvmTypeReference__Group_0_1__0__Impl ;
+    // InternalTableDSL.g:23053:1: rule__JvmTypeReference__Group_0_1__0 : rule__JvmTypeReference__Group_0_1__0__Impl ;
     public final void rule__JvmTypeReference__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23678:1: ( rule__JvmTypeReference__Group_0_1__0__Impl )
-            // InternalTableDSL.g:23679:2: rule__JvmTypeReference__Group_0_1__0__Impl
+            // InternalTableDSL.g:23057:1: ( rule__JvmTypeReference__Group_0_1__0__Impl )
+            // InternalTableDSL.g:23058:2: rule__JvmTypeReference__Group_0_1__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1__0__Impl();
@@ -77718,23 +75760,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1__0__Impl"
-    // InternalTableDSL.g:23685:1: rule__JvmTypeReference__Group_0_1__0__Impl : ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) ;
+    // InternalTableDSL.g:23064:1: rule__JvmTypeReference__Group_0_1__0__Impl : ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) ;
     public final void rule__JvmTypeReference__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23689:1: ( ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) )
-            // InternalTableDSL.g:23690:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
+            // InternalTableDSL.g:23068:1: ( ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) )
+            // InternalTableDSL.g:23069:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
             {
-            // InternalTableDSL.g:23690:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
-            // InternalTableDSL.g:23691:2: ( rule__JvmTypeReference__Group_0_1_0__0 )
+            // InternalTableDSL.g:23069:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
+            // InternalTableDSL.g:23070:2: ( rule__JvmTypeReference__Group_0_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0_1_0()); 
             }
-            // InternalTableDSL.g:23692:2: ( rule__JvmTypeReference__Group_0_1_0__0 )
-            // InternalTableDSL.g:23692:3: rule__JvmTypeReference__Group_0_1_0__0
+            // InternalTableDSL.g:23071:2: ( rule__JvmTypeReference__Group_0_1_0__0 )
+            // InternalTableDSL.g:23071:3: rule__JvmTypeReference__Group_0_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1_0__0();
@@ -77769,16 +75811,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__0"
-    // InternalTableDSL.g:23701:1: rule__JvmTypeReference__Group_0_1_0__0 : rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 ;
+    // InternalTableDSL.g:23080:1: rule__JvmTypeReference__Group_0_1_0__0 : rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 ;
     public final void rule__JvmTypeReference__Group_0_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23705:1: ( rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 )
-            // InternalTableDSL.g:23706:2: rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1
+            // InternalTableDSL.g:23084:1: ( rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 )
+            // InternalTableDSL.g:23085:2: rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1
             {
-            pushFollow(FOLLOW_104);
+            pushFollow(FOLLOW_103);
             rule__JvmTypeReference__Group_0_1_0__0__Impl();
 
             state._fsp--;
@@ -77807,23 +75849,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__0__Impl"
-    // InternalTableDSL.g:23713:1: rule__JvmTypeReference__Group_0_1_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:23092:1: rule__JvmTypeReference__Group_0_1_0__0__Impl : ( () ) ;
     public final void rule__JvmTypeReference__Group_0_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23717:1: ( ( () ) )
-            // InternalTableDSL.g:23718:1: ( () )
+            // InternalTableDSL.g:23096:1: ( ( () ) )
+            // InternalTableDSL.g:23097:1: ( () )
             {
-            // InternalTableDSL.g:23718:1: ( () )
-            // InternalTableDSL.g:23719:2: ()
+            // InternalTableDSL.g:23097:1: ( () )
+            // InternalTableDSL.g:23098:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getJvmGenericArrayTypeReferenceComponentTypeAction_0_1_0_0()); 
             }
-            // InternalTableDSL.g:23720:2: ()
-            // InternalTableDSL.g:23720:3: 
+            // InternalTableDSL.g:23099:2: ()
+            // InternalTableDSL.g:23099:3: 
             {
             }
 
@@ -77848,14 +75890,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__1"
-    // InternalTableDSL.g:23728:1: rule__JvmTypeReference__Group_0_1_0__1 : rule__JvmTypeReference__Group_0_1_0__1__Impl ;
+    // InternalTableDSL.g:23107:1: rule__JvmTypeReference__Group_0_1_0__1 : rule__JvmTypeReference__Group_0_1_0__1__Impl ;
     public final void rule__JvmTypeReference__Group_0_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23732:1: ( rule__JvmTypeReference__Group_0_1_0__1__Impl )
-            // InternalTableDSL.g:23733:2: rule__JvmTypeReference__Group_0_1_0__1__Impl
+            // InternalTableDSL.g:23111:1: ( rule__JvmTypeReference__Group_0_1_0__1__Impl )
+            // InternalTableDSL.g:23112:2: rule__JvmTypeReference__Group_0_1_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1_0__1__Impl();
@@ -77881,17 +75923,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__1__Impl"
-    // InternalTableDSL.g:23739:1: rule__JvmTypeReference__Group_0_1_0__1__Impl : ( ruleArrayBrackets ) ;
+    // InternalTableDSL.g:23118:1: rule__JvmTypeReference__Group_0_1_0__1__Impl : ( ruleArrayBrackets ) ;
     public final void rule__JvmTypeReference__Group_0_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23743:1: ( ( ruleArrayBrackets ) )
-            // InternalTableDSL.g:23744:1: ( ruleArrayBrackets )
+            // InternalTableDSL.g:23122:1: ( ( ruleArrayBrackets ) )
+            // InternalTableDSL.g:23123:1: ( ruleArrayBrackets )
             {
-            // InternalTableDSL.g:23744:1: ( ruleArrayBrackets )
-            // InternalTableDSL.g:23745:2: ruleArrayBrackets
+            // InternalTableDSL.g:23123:1: ( ruleArrayBrackets )
+            // InternalTableDSL.g:23124:2: ruleArrayBrackets
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getArrayBracketsParserRuleCall_0_1_0_1()); 
@@ -77926,16 +75968,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__0"
-    // InternalTableDSL.g:23755:1: rule__ArrayBrackets__Group__0 : rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 ;
+    // InternalTableDSL.g:23134:1: rule__ArrayBrackets__Group__0 : rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 ;
     public final void rule__ArrayBrackets__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23759:1: ( rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 )
-            // InternalTableDSL.g:23760:2: rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1
+            // InternalTableDSL.g:23138:1: ( rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 )
+            // InternalTableDSL.g:23139:2: rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1
             {
-            pushFollow(FOLLOW_142);
+            pushFollow(FOLLOW_141);
             rule__ArrayBrackets__Group__0__Impl();
 
             state._fsp--;
@@ -77964,17 +76006,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__0__Impl"
-    // InternalTableDSL.g:23767:1: rule__ArrayBrackets__Group__0__Impl : ( '[' ) ;
+    // InternalTableDSL.g:23146:1: rule__ArrayBrackets__Group__0__Impl : ( '[' ) ;
     public final void rule__ArrayBrackets__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23771:1: ( ( '[' ) )
-            // InternalTableDSL.g:23772:1: ( '[' )
+            // InternalTableDSL.g:23150:1: ( ( '[' ) )
+            // InternalTableDSL.g:23151:1: ( '[' )
             {
-            // InternalTableDSL.g:23772:1: ( '[' )
-            // InternalTableDSL.g:23773:2: '['
+            // InternalTableDSL.g:23151:1: ( '[' )
+            // InternalTableDSL.g:23152:2: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); 
@@ -78005,14 +76047,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__1"
-    // InternalTableDSL.g:23782:1: rule__ArrayBrackets__Group__1 : rule__ArrayBrackets__Group__1__Impl ;
+    // InternalTableDSL.g:23161:1: rule__ArrayBrackets__Group__1 : rule__ArrayBrackets__Group__1__Impl ;
     public final void rule__ArrayBrackets__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23786:1: ( rule__ArrayBrackets__Group__1__Impl )
-            // InternalTableDSL.g:23787:2: rule__ArrayBrackets__Group__1__Impl
+            // InternalTableDSL.g:23165:1: ( rule__ArrayBrackets__Group__1__Impl )
+            // InternalTableDSL.g:23166:2: rule__ArrayBrackets__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ArrayBrackets__Group__1__Impl();
@@ -78038,17 +76080,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__1__Impl"
-    // InternalTableDSL.g:23793:1: rule__ArrayBrackets__Group__1__Impl : ( ']' ) ;
+    // InternalTableDSL.g:23172:1: rule__ArrayBrackets__Group__1__Impl : ( ']' ) ;
     public final void rule__ArrayBrackets__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23797:1: ( ( ']' ) )
-            // InternalTableDSL.g:23798:1: ( ']' )
+            // InternalTableDSL.g:23176:1: ( ( ']' ) )
+            // InternalTableDSL.g:23177:1: ( ']' )
             {
-            // InternalTableDSL.g:23798:1: ( ']' )
-            // InternalTableDSL.g:23799:2: ']'
+            // InternalTableDSL.g:23177:1: ( ']' )
+            // InternalTableDSL.g:23178:2: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getRightSquareBracketKeyword_1()); 
@@ -78079,16 +76121,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__0"
-    // InternalTableDSL.g:23809:1: rule__XFunctionTypeRef__Group__0 : rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 ;
+    // InternalTableDSL.g:23188:1: rule__XFunctionTypeRef__Group__0 : rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 ;
     public final void rule__XFunctionTypeRef__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23813:1: ( rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 )
-            // InternalTableDSL.g:23814:2: rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1
+            // InternalTableDSL.g:23192:1: ( rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 )
+            // InternalTableDSL.g:23193:2: rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__XFunctionTypeRef__Group__0__Impl();
 
             state._fsp--;
@@ -78117,31 +76159,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__0__Impl"
-    // InternalTableDSL.g:23821:1: rule__XFunctionTypeRef__Group__0__Impl : ( ( rule__XFunctionTypeRef__Group_0__0 )? ) ;
+    // InternalTableDSL.g:23200:1: rule__XFunctionTypeRef__Group__0__Impl : ( ( rule__XFunctionTypeRef__Group_0__0 )? ) ;
     public final void rule__XFunctionTypeRef__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23825:1: ( ( ( rule__XFunctionTypeRef__Group_0__0 )? ) )
-            // InternalTableDSL.g:23826:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
+            // InternalTableDSL.g:23204:1: ( ( ( rule__XFunctionTypeRef__Group_0__0 )? ) )
+            // InternalTableDSL.g:23205:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
             {
-            // InternalTableDSL.g:23826:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
-            // InternalTableDSL.g:23827:2: ( rule__XFunctionTypeRef__Group_0__0 )?
+            // InternalTableDSL.g:23205:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
+            // InternalTableDSL.g:23206:2: ( rule__XFunctionTypeRef__Group_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0()); 
             }
-            // InternalTableDSL.g:23828:2: ( rule__XFunctionTypeRef__Group_0__0 )?
-            int alt164=2;
-            int LA164_0 = input.LA(1);
+            // InternalTableDSL.g:23207:2: ( rule__XFunctionTypeRef__Group_0__0 )?
+            int alt162=2;
+            int LA162_0 = input.LA(1);
 
-            if ( (LA164_0==135) ) {
-                alt164=1;
+            if ( (LA162_0==135) ) {
+                alt162=1;
             }
-            switch (alt164) {
+            switch (alt162) {
                 case 1 :
-                    // InternalTableDSL.g:23828:3: rule__XFunctionTypeRef__Group_0__0
+                    // InternalTableDSL.g:23207:3: rule__XFunctionTypeRef__Group_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XFunctionTypeRef__Group_0__0();
@@ -78179,16 +76221,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__1"
-    // InternalTableDSL.g:23836:1: rule__XFunctionTypeRef__Group__1 : rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 ;
+    // InternalTableDSL.g:23215:1: rule__XFunctionTypeRef__Group__1 : rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 ;
     public final void rule__XFunctionTypeRef__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23840:1: ( rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 )
-            // InternalTableDSL.g:23841:2: rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2
+            // InternalTableDSL.g:23219:1: ( rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 )
+            // InternalTableDSL.g:23220:2: rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__XFunctionTypeRef__Group__1__Impl();
 
             state._fsp--;
@@ -78217,17 +76259,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__1__Impl"
-    // InternalTableDSL.g:23848:1: rule__XFunctionTypeRef__Group__1__Impl : ( '=>' ) ;
+    // InternalTableDSL.g:23227:1: rule__XFunctionTypeRef__Group__1__Impl : ( '=>' ) ;
     public final void rule__XFunctionTypeRef__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23852:1: ( ( '=>' ) )
-            // InternalTableDSL.g:23853:1: ( '=>' )
+            // InternalTableDSL.g:23231:1: ( ( '=>' ) )
+            // InternalTableDSL.g:23232:1: ( '=>' )
             {
-            // InternalTableDSL.g:23853:1: ( '=>' )
-            // InternalTableDSL.g:23854:2: '=>'
+            // InternalTableDSL.g:23232:1: ( '=>' )
+            // InternalTableDSL.g:23233:2: '=>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1()); 
@@ -78258,14 +76300,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__2"
-    // InternalTableDSL.g:23863:1: rule__XFunctionTypeRef__Group__2 : rule__XFunctionTypeRef__Group__2__Impl ;
+    // InternalTableDSL.g:23242:1: rule__XFunctionTypeRef__Group__2 : rule__XFunctionTypeRef__Group__2__Impl ;
     public final void rule__XFunctionTypeRef__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23867:1: ( rule__XFunctionTypeRef__Group__2__Impl )
-            // InternalTableDSL.g:23868:2: rule__XFunctionTypeRef__Group__2__Impl
+            // InternalTableDSL.g:23246:1: ( rule__XFunctionTypeRef__Group__2__Impl )
+            // InternalTableDSL.g:23247:2: rule__XFunctionTypeRef__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group__2__Impl();
@@ -78291,23 +76333,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__2__Impl"
-    // InternalTableDSL.g:23874:1: rule__XFunctionTypeRef__Group__2__Impl : ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) ;
+    // InternalTableDSL.g:23253:1: rule__XFunctionTypeRef__Group__2__Impl : ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) ;
     public final void rule__XFunctionTypeRef__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23878:1: ( ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) )
-            // InternalTableDSL.g:23879:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
+            // InternalTableDSL.g:23257:1: ( ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) )
+            // InternalTableDSL.g:23258:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
             {
-            // InternalTableDSL.g:23879:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
-            // InternalTableDSL.g:23880:2: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
+            // InternalTableDSL.g:23258:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
+            // InternalTableDSL.g:23259:2: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeAssignment_2()); 
             }
-            // InternalTableDSL.g:23881:2: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
-            // InternalTableDSL.g:23881:3: rule__XFunctionTypeRef__ReturnTypeAssignment_2
+            // InternalTableDSL.g:23260:2: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
+            // InternalTableDSL.g:23260:3: rule__XFunctionTypeRef__ReturnTypeAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__ReturnTypeAssignment_2();
@@ -78342,16 +76384,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__0"
-    // InternalTableDSL.g:23890:1: rule__XFunctionTypeRef__Group_0__0 : rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 ;
+    // InternalTableDSL.g:23269:1: rule__XFunctionTypeRef__Group_0__0 : rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 ;
     public final void rule__XFunctionTypeRef__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23894:1: ( rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 )
-            // InternalTableDSL.g:23895:2: rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1
+            // InternalTableDSL.g:23273:1: ( rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 )
+            // InternalTableDSL.g:23274:2: rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1
             {
-            pushFollow(FOLLOW_178);
+            pushFollow(FOLLOW_177);
             rule__XFunctionTypeRef__Group_0__0__Impl();
 
             state._fsp--;
@@ -78380,17 +76422,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__0__Impl"
-    // InternalTableDSL.g:23902:1: rule__XFunctionTypeRef__Group_0__0__Impl : ( '(' ) ;
+    // InternalTableDSL.g:23281:1: rule__XFunctionTypeRef__Group_0__0__Impl : ( '(' ) ;
     public final void rule__XFunctionTypeRef__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23906:1: ( ( '(' ) )
-            // InternalTableDSL.g:23907:1: ( '(' )
+            // InternalTableDSL.g:23285:1: ( ( '(' ) )
+            // InternalTableDSL.g:23286:1: ( '(' )
             {
-            // InternalTableDSL.g:23907:1: ( '(' )
-            // InternalTableDSL.g:23908:2: '('
+            // InternalTableDSL.g:23286:1: ( '(' )
+            // InternalTableDSL.g:23287:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0()); 
@@ -78421,16 +76463,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__1"
-    // InternalTableDSL.g:23917:1: rule__XFunctionTypeRef__Group_0__1 : rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 ;
+    // InternalTableDSL.g:23296:1: rule__XFunctionTypeRef__Group_0__1 : rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 ;
     public final void rule__XFunctionTypeRef__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23921:1: ( rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 )
-            // InternalTableDSL.g:23922:2: rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2
+            // InternalTableDSL.g:23300:1: ( rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 )
+            // InternalTableDSL.g:23301:2: rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2
             {
-            pushFollow(FOLLOW_178);
+            pushFollow(FOLLOW_177);
             rule__XFunctionTypeRef__Group_0__1__Impl();
 
             state._fsp--;
@@ -78459,31 +76501,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__1__Impl"
-    // InternalTableDSL.g:23929:1: rule__XFunctionTypeRef__Group_0__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) ;
+    // InternalTableDSL.g:23308:1: rule__XFunctionTypeRef__Group_0__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) ;
     public final void rule__XFunctionTypeRef__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23933:1: ( ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) )
-            // InternalTableDSL.g:23934:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
+            // InternalTableDSL.g:23312:1: ( ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) )
+            // InternalTableDSL.g:23313:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
             {
-            // InternalTableDSL.g:23934:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
-            // InternalTableDSL.g:23935:2: ( rule__XFunctionTypeRef__Group_0_1__0 )?
+            // InternalTableDSL.g:23313:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
+            // InternalTableDSL.g:23314:2: ( rule__XFunctionTypeRef__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0_1()); 
             }
-            // InternalTableDSL.g:23936:2: ( rule__XFunctionTypeRef__Group_0_1__0 )?
-            int alt165=2;
-            int LA165_0 = input.LA(1);
+            // InternalTableDSL.g:23315:2: ( rule__XFunctionTypeRef__Group_0_1__0 )?
+            int alt163=2;
+            int LA163_0 = input.LA(1);
 
-            if ( (LA165_0==RULE_ID||LA165_0==36||LA165_0==135) ) {
-                alt165=1;
+            if ( (LA163_0==RULE_ID||LA163_0==36||LA163_0==135) ) {
+                alt163=1;
             }
-            switch (alt165) {
+            switch (alt163) {
                 case 1 :
-                    // InternalTableDSL.g:23936:3: rule__XFunctionTypeRef__Group_0_1__0
+                    // InternalTableDSL.g:23315:3: rule__XFunctionTypeRef__Group_0_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XFunctionTypeRef__Group_0_1__0();
@@ -78521,14 +76563,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__2"
-    // InternalTableDSL.g:23944:1: rule__XFunctionTypeRef__Group_0__2 : rule__XFunctionTypeRef__Group_0__2__Impl ;
+    // InternalTableDSL.g:23323:1: rule__XFunctionTypeRef__Group_0__2 : rule__XFunctionTypeRef__Group_0__2__Impl ;
     public final void rule__XFunctionTypeRef__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23948:1: ( rule__XFunctionTypeRef__Group_0__2__Impl )
-            // InternalTableDSL.g:23949:2: rule__XFunctionTypeRef__Group_0__2__Impl
+            // InternalTableDSL.g:23327:1: ( rule__XFunctionTypeRef__Group_0__2__Impl )
+            // InternalTableDSL.g:23328:2: rule__XFunctionTypeRef__Group_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0__2__Impl();
@@ -78554,17 +76596,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__2__Impl"
-    // InternalTableDSL.g:23955:1: rule__XFunctionTypeRef__Group_0__2__Impl : ( ')' ) ;
+    // InternalTableDSL.g:23334:1: rule__XFunctionTypeRef__Group_0__2__Impl : ( ')' ) ;
     public final void rule__XFunctionTypeRef__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23959:1: ( ( ')' ) )
-            // InternalTableDSL.g:23960:1: ( ')' )
+            // InternalTableDSL.g:23338:1: ( ( ')' ) )
+            // InternalTableDSL.g:23339:1: ( ')' )
             {
-            // InternalTableDSL.g:23960:1: ( ')' )
-            // InternalTableDSL.g:23961:2: ')'
+            // InternalTableDSL.g:23339:1: ( ')' )
+            // InternalTableDSL.g:23340:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2()); 
@@ -78595,16 +76637,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__0"
-    // InternalTableDSL.g:23971:1: rule__XFunctionTypeRef__Group_0_1__0 : rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 ;
+    // InternalTableDSL.g:23350:1: rule__XFunctionTypeRef__Group_0_1__0 : rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 ;
     public final void rule__XFunctionTypeRef__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23975:1: ( rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 )
-            // InternalTableDSL.g:23976:2: rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1
+            // InternalTableDSL.g:23354:1: ( rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 )
+            // InternalTableDSL.g:23355:2: rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_97);
             rule__XFunctionTypeRef__Group_0_1__0__Impl();
 
             state._fsp--;
@@ -78633,23 +76675,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__0__Impl"
-    // InternalTableDSL.g:23983:1: rule__XFunctionTypeRef__Group_0_1__0__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) ;
+    // InternalTableDSL.g:23362:1: rule__XFunctionTypeRef__Group_0_1__0__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) ;
     public final void rule__XFunctionTypeRef__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:23987:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) )
-            // InternalTableDSL.g:23988:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
+            // InternalTableDSL.g:23366:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) )
+            // InternalTableDSL.g:23367:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
             {
-            // InternalTableDSL.g:23988:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
-            // InternalTableDSL.g:23989:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
+            // InternalTableDSL.g:23367:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
+            // InternalTableDSL.g:23368:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesAssignment_0_1_0()); 
             }
-            // InternalTableDSL.g:23990:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
-            // InternalTableDSL.g:23990:3: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0
+            // InternalTableDSL.g:23369:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
+            // InternalTableDSL.g:23369:3: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0();
@@ -78684,14 +76726,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__1"
-    // InternalTableDSL.g:23998:1: rule__XFunctionTypeRef__Group_0_1__1 : rule__XFunctionTypeRef__Group_0_1__1__Impl ;
+    // InternalTableDSL.g:23377:1: rule__XFunctionTypeRef__Group_0_1__1 : rule__XFunctionTypeRef__Group_0_1__1__Impl ;
     public final void rule__XFunctionTypeRef__Group_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24002:1: ( rule__XFunctionTypeRef__Group_0_1__1__Impl )
-            // InternalTableDSL.g:24003:2: rule__XFunctionTypeRef__Group_0_1__1__Impl
+            // InternalTableDSL.g:23381:1: ( rule__XFunctionTypeRef__Group_0_1__1__Impl )
+            // InternalTableDSL.g:23382:2: rule__XFunctionTypeRef__Group_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1__1__Impl();
@@ -78717,37 +76759,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__1__Impl"
-    // InternalTableDSL.g:24009:1: rule__XFunctionTypeRef__Group_0_1__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) ;
+    // InternalTableDSL.g:23388:1: rule__XFunctionTypeRef__Group_0_1__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) ;
     public final void rule__XFunctionTypeRef__Group_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24013:1: ( ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) )
-            // InternalTableDSL.g:24014:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
+            // InternalTableDSL.g:23392:1: ( ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) )
+            // InternalTableDSL.g:23393:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
             {
-            // InternalTableDSL.g:24014:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
-            // InternalTableDSL.g:24015:2: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
+            // InternalTableDSL.g:23393:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
+            // InternalTableDSL.g:23394:2: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0_1_1()); 
             }
-            // InternalTableDSL.g:24016:2: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
-            loop166:
+            // InternalTableDSL.g:23395:2: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
+            loop164:
             do {
-                int alt166=2;
-                int LA166_0 = input.LA(1);
+                int alt164=2;
+                int LA164_0 = input.LA(1);
 
-                if ( (LA166_0==137) ) {
-                    alt166=1;
+                if ( (LA164_0==137) ) {
+                    alt164=1;
                 }
 
 
-                switch (alt166) {
+                switch (alt164) {
             	case 1 :
-            	    // InternalTableDSL.g:24016:3: rule__XFunctionTypeRef__Group_0_1_1__0
+            	    // InternalTableDSL.g:23395:3: rule__XFunctionTypeRef__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__XFunctionTypeRef__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -78757,7 +76799,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop166;
+            	    break loop164;
                 }
             } while (true);
 
@@ -78786,16 +76828,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__0"
-    // InternalTableDSL.g:24025:1: rule__XFunctionTypeRef__Group_0_1_1__0 : rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 ;
+    // InternalTableDSL.g:23404:1: rule__XFunctionTypeRef__Group_0_1_1__0 : rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24029:1: ( rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 )
-            // InternalTableDSL.g:24030:2: rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1
+            // InternalTableDSL.g:23408:1: ( rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 )
+            // InternalTableDSL.g:23409:2: rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__XFunctionTypeRef__Group_0_1_1__0__Impl();
 
             state._fsp--;
@@ -78824,17 +76866,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__0__Impl"
-    // InternalTableDSL.g:24037:1: rule__XFunctionTypeRef__Group_0_1_1__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:23416:1: rule__XFunctionTypeRef__Group_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24041:1: ( ( ',' ) )
-            // InternalTableDSL.g:24042:1: ( ',' )
+            // InternalTableDSL.g:23420:1: ( ( ',' ) )
+            // InternalTableDSL.g:23421:1: ( ',' )
             {
-            // InternalTableDSL.g:24042:1: ( ',' )
-            // InternalTableDSL.g:24043:2: ','
+            // InternalTableDSL.g:23421:1: ( ',' )
+            // InternalTableDSL.g:23422:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0()); 
@@ -78865,14 +76907,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__1"
-    // InternalTableDSL.g:24052:1: rule__XFunctionTypeRef__Group_0_1_1__1 : rule__XFunctionTypeRef__Group_0_1_1__1__Impl ;
+    // InternalTableDSL.g:23431:1: rule__XFunctionTypeRef__Group_0_1_1__1 : rule__XFunctionTypeRef__Group_0_1_1__1__Impl ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24056:1: ( rule__XFunctionTypeRef__Group_0_1_1__1__Impl )
-            // InternalTableDSL.g:24057:2: rule__XFunctionTypeRef__Group_0_1_1__1__Impl
+            // InternalTableDSL.g:23435:1: ( rule__XFunctionTypeRef__Group_0_1_1__1__Impl )
+            // InternalTableDSL.g:23436:2: rule__XFunctionTypeRef__Group_0_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1_1__1__Impl();
@@ -78898,23 +76940,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__1__Impl"
-    // InternalTableDSL.g:24063:1: rule__XFunctionTypeRef__Group_0_1_1__1__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) ;
+    // InternalTableDSL.g:23442:1: rule__XFunctionTypeRef__Group_0_1_1__1__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24067:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) )
-            // InternalTableDSL.g:24068:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
+            // InternalTableDSL.g:23446:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) )
+            // InternalTableDSL.g:23447:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
             {
-            // InternalTableDSL.g:24068:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
-            // InternalTableDSL.g:24069:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
+            // InternalTableDSL.g:23447:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
+            // InternalTableDSL.g:23448:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesAssignment_0_1_1_1()); 
             }
-            // InternalTableDSL.g:24070:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
-            // InternalTableDSL.g:24070:3: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1
+            // InternalTableDSL.g:23449:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
+            // InternalTableDSL.g:23449:3: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1();
@@ -78949,16 +76991,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__0"
-    // InternalTableDSL.g:24079:1: rule__JvmParameterizedTypeReference__Group__0 : rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 ;
+    // InternalTableDSL.g:23458:1: rule__JvmParameterizedTypeReference__Group__0 : rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 ;
     public final void rule__JvmParameterizedTypeReference__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24083:1: ( rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 )
-            // InternalTableDSL.g:24084:2: rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1
+            // InternalTableDSL.g:23462:1: ( rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 )
+            // InternalTableDSL.g:23463:2: rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1
             {
-            pushFollow(FOLLOW_107);
+            pushFollow(FOLLOW_106);
             rule__JvmParameterizedTypeReference__Group__0__Impl();
 
             state._fsp--;
@@ -78987,23 +77029,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__0__Impl"
-    // InternalTableDSL.g:24091:1: rule__JvmParameterizedTypeReference__Group__0__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) ;
+    // InternalTableDSL.g:23470:1: rule__JvmParameterizedTypeReference__Group__0__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24095:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) )
-            // InternalTableDSL.g:24096:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
+            // InternalTableDSL.g:23474:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) )
+            // InternalTableDSL.g:23475:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
             {
-            // InternalTableDSL.g:24096:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
-            // InternalTableDSL.g:24097:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
+            // InternalTableDSL.g:23475:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
+            // InternalTableDSL.g:23476:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeAssignment_0()); 
             }
-            // InternalTableDSL.g:24098:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
-            // InternalTableDSL.g:24098:3: rule__JvmParameterizedTypeReference__TypeAssignment_0
+            // InternalTableDSL.g:23477:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
+            // InternalTableDSL.g:23477:3: rule__JvmParameterizedTypeReference__TypeAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__TypeAssignment_0();
@@ -79038,14 +77080,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__1"
-    // InternalTableDSL.g:24106:1: rule__JvmParameterizedTypeReference__Group__1 : rule__JvmParameterizedTypeReference__Group__1__Impl ;
+    // InternalTableDSL.g:23485:1: rule__JvmParameterizedTypeReference__Group__1 : rule__JvmParameterizedTypeReference__Group__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24110:1: ( rule__JvmParameterizedTypeReference__Group__1__Impl )
-            // InternalTableDSL.g:24111:2: rule__JvmParameterizedTypeReference__Group__1__Impl
+            // InternalTableDSL.g:23489:1: ( rule__JvmParameterizedTypeReference__Group__1__Impl )
+            // InternalTableDSL.g:23490:2: rule__JvmParameterizedTypeReference__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group__1__Impl();
@@ -79071,27 +77113,27 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__1__Impl"
-    // InternalTableDSL.g:24117:1: rule__JvmParameterizedTypeReference__Group__1__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) ;
+    // InternalTableDSL.g:23496:1: rule__JvmParameterizedTypeReference__Group__1__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) ;
     public final void rule__JvmParameterizedTypeReference__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24121:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) )
-            // InternalTableDSL.g:24122:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
+            // InternalTableDSL.g:23500:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) )
+            // InternalTableDSL.g:23501:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
             {
-            // InternalTableDSL.g:24122:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
-            // InternalTableDSL.g:24123:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
+            // InternalTableDSL.g:23501:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
+            // InternalTableDSL.g:23502:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1()); 
             }
-            // InternalTableDSL.g:24124:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
-            int alt167=2;
-            alt167 = dfa167.predict(input);
-            switch (alt167) {
+            // InternalTableDSL.g:23503:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
+            int alt165=2;
+            alt165 = dfa165.predict(input);
+            switch (alt165) {
                 case 1 :
-                    // InternalTableDSL.g:24124:3: rule__JvmParameterizedTypeReference__Group_1__0
+                    // InternalTableDSL.g:23503:3: rule__JvmParameterizedTypeReference__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__JvmParameterizedTypeReference__Group_1__0();
@@ -79129,16 +77171,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__0"
-    // InternalTableDSL.g:24133:1: rule__JvmParameterizedTypeReference__Group_1__0 : rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 ;
+    // InternalTableDSL.g:23512:1: rule__JvmParameterizedTypeReference__Group_1__0 : rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24137:1: ( rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 )
-            // InternalTableDSL.g:24138:2: rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1
+            // InternalTableDSL.g:23516:1: ( rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 )
+            // InternalTableDSL.g:23517:2: rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1
             {
-            pushFollow(FOLLOW_137);
+            pushFollow(FOLLOW_136);
             rule__JvmParameterizedTypeReference__Group_1__0__Impl();
 
             state._fsp--;
@@ -79167,23 +77209,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__0__Impl"
-    // InternalTableDSL.g:24145:1: rule__JvmParameterizedTypeReference__Group_1__0__Impl : ( ( '<' ) ) ;
+    // InternalTableDSL.g:23524:1: rule__JvmParameterizedTypeReference__Group_1__0__Impl : ( ( '<' ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24149:1: ( ( ( '<' ) ) )
-            // InternalTableDSL.g:24150:1: ( ( '<' ) )
+            // InternalTableDSL.g:23528:1: ( ( ( '<' ) ) )
+            // InternalTableDSL.g:23529:1: ( ( '<' ) )
             {
-            // InternalTableDSL.g:24150:1: ( ( '<' ) )
-            // InternalTableDSL.g:24151:2: ( '<' )
+            // InternalTableDSL.g:23529:1: ( ( '<' ) )
+            // InternalTableDSL.g:23530:2: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_0()); 
             }
-            // InternalTableDSL.g:24152:2: ( '<' )
-            // InternalTableDSL.g:24152:3: '<'
+            // InternalTableDSL.g:23531:2: ( '<' )
+            // InternalTableDSL.g:23531:3: '<'
             {
             match(input,32,FOLLOW_2); if (state.failed) return ;
 
@@ -79214,16 +77256,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__1"
-    // InternalTableDSL.g:24160:1: rule__JvmParameterizedTypeReference__Group_1__1 : rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 ;
+    // InternalTableDSL.g:23539:1: rule__JvmParameterizedTypeReference__Group_1__1 : rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24164:1: ( rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 )
-            // InternalTableDSL.g:24165:2: rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2
+            // InternalTableDSL.g:23543:1: ( rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 )
+            // InternalTableDSL.g:23544:2: rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2
             {
-            pushFollow(FOLLOW_138);
+            pushFollow(FOLLOW_137);
             rule__JvmParameterizedTypeReference__Group_1__1__Impl();
 
             state._fsp--;
@@ -79252,23 +77294,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__1__Impl"
-    // InternalTableDSL.g:24172:1: rule__JvmParameterizedTypeReference__Group_1__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) ;
+    // InternalTableDSL.g:23551:1: rule__JvmParameterizedTypeReference__Group_1__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24176:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) )
-            // InternalTableDSL.g:24177:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
+            // InternalTableDSL.g:23555:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) )
+            // InternalTableDSL.g:23556:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
             {
-            // InternalTableDSL.g:24177:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
-            // InternalTableDSL.g:24178:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
+            // InternalTableDSL.g:23556:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
+            // InternalTableDSL.g:23557:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_1()); 
             }
-            // InternalTableDSL.g:24179:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
-            // InternalTableDSL.g:24179:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1
+            // InternalTableDSL.g:23558:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
+            // InternalTableDSL.g:23558:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1();
@@ -79303,16 +77345,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__2"
-    // InternalTableDSL.g:24187:1: rule__JvmParameterizedTypeReference__Group_1__2 : rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 ;
+    // InternalTableDSL.g:23566:1: rule__JvmParameterizedTypeReference__Group_1__2 : rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24191:1: ( rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 )
-            // InternalTableDSL.g:24192:2: rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3
+            // InternalTableDSL.g:23570:1: ( rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 )
+            // InternalTableDSL.g:23571:2: rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3
             {
-            pushFollow(FOLLOW_138);
+            pushFollow(FOLLOW_137);
             rule__JvmParameterizedTypeReference__Group_1__2__Impl();
 
             state._fsp--;
@@ -79341,37 +77383,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__2__Impl"
-    // InternalTableDSL.g:24199:1: rule__JvmParameterizedTypeReference__Group_1__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) ;
+    // InternalTableDSL.g:23578:1: rule__JvmParameterizedTypeReference__Group_1__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24203:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) )
-            // InternalTableDSL.g:24204:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
+            // InternalTableDSL.g:23582:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) )
+            // InternalTableDSL.g:23583:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
             {
-            // InternalTableDSL.g:24204:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
-            // InternalTableDSL.g:24205:2: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
+            // InternalTableDSL.g:23583:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
+            // InternalTableDSL.g:23584:2: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_2()); 
             }
-            // InternalTableDSL.g:24206:2: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
-            loop168:
+            // InternalTableDSL.g:23585:2: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
+            loop166:
             do {
-                int alt168=2;
-                int LA168_0 = input.LA(1);
+                int alt166=2;
+                int LA166_0 = input.LA(1);
 
-                if ( (LA168_0==137) ) {
-                    alt168=1;
+                if ( (LA166_0==137) ) {
+                    alt166=1;
                 }
 
 
-                switch (alt168) {
+                switch (alt166) {
             	case 1 :
-            	    // InternalTableDSL.g:24206:3: rule__JvmParameterizedTypeReference__Group_1_2__0
+            	    // InternalTableDSL.g:23585:3: rule__JvmParameterizedTypeReference__Group_1_2__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__JvmParameterizedTypeReference__Group_1_2__0();
 
             	    state._fsp--;
@@ -79381,7 +77423,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop168;
+            	    break loop166;
                 }
             } while (true);
 
@@ -79410,16 +77452,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__3"
-    // InternalTableDSL.g:24214:1: rule__JvmParameterizedTypeReference__Group_1__3 : rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 ;
+    // InternalTableDSL.g:23593:1: rule__JvmParameterizedTypeReference__Group_1__3 : rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24218:1: ( rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 )
-            // InternalTableDSL.g:24219:2: rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4
+            // InternalTableDSL.g:23597:1: ( rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 )
+            // InternalTableDSL.g:23598:2: rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4
             {
-            pushFollow(FOLLOW_68);
+            pushFollow(FOLLOW_66);
             rule__JvmParameterizedTypeReference__Group_1__3__Impl();
 
             state._fsp--;
@@ -79448,17 +77490,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__3__Impl"
-    // InternalTableDSL.g:24226:1: rule__JvmParameterizedTypeReference__Group_1__3__Impl : ( '>' ) ;
+    // InternalTableDSL.g:23605:1: rule__JvmParameterizedTypeReference__Group_1__3__Impl : ( '>' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24230:1: ( ( '>' ) )
-            // InternalTableDSL.g:24231:1: ( '>' )
+            // InternalTableDSL.g:23609:1: ( ( '>' ) )
+            // InternalTableDSL.g:23610:1: ( '>' )
             {
-            // InternalTableDSL.g:24231:1: ( '>' )
-            // InternalTableDSL.g:24232:2: '>'
+            // InternalTableDSL.g:23610:1: ( '>' )
+            // InternalTableDSL.g:23611:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3()); 
@@ -79489,14 +77531,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__4"
-    // InternalTableDSL.g:24241:1: rule__JvmParameterizedTypeReference__Group_1__4 : rule__JvmParameterizedTypeReference__Group_1__4__Impl ;
+    // InternalTableDSL.g:23620:1: rule__JvmParameterizedTypeReference__Group_1__4 : rule__JvmParameterizedTypeReference__Group_1__4__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24245:1: ( rule__JvmParameterizedTypeReference__Group_1__4__Impl )
-            // InternalTableDSL.g:24246:2: rule__JvmParameterizedTypeReference__Group_1__4__Impl
+            // InternalTableDSL.g:23624:1: ( rule__JvmParameterizedTypeReference__Group_1__4__Impl )
+            // InternalTableDSL.g:23625:2: rule__JvmParameterizedTypeReference__Group_1__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__4__Impl();
@@ -79522,35 +77564,35 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__4__Impl"
-    // InternalTableDSL.g:24252:1: rule__JvmParameterizedTypeReference__Group_1__4__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) ;
+    // InternalTableDSL.g:23631:1: rule__JvmParameterizedTypeReference__Group_1__4__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24256:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) )
-            // InternalTableDSL.g:24257:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
+            // InternalTableDSL.g:23635:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) )
+            // InternalTableDSL.g:23636:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
             {
-            // InternalTableDSL.g:24257:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
-            // InternalTableDSL.g:24258:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
+            // InternalTableDSL.g:23636:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
+            // InternalTableDSL.g:23637:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4()); 
             }
-            // InternalTableDSL.g:24259:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
-            loop169:
+            // InternalTableDSL.g:23638:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
+            loop167:
             do {
-                int alt169=2;
-                int LA169_0 = input.LA(1);
+                int alt167=2;
+                int LA167_0 = input.LA(1);
 
-                if ( (LA169_0==46) ) {
-                    int LA169_2 = input.LA(2);
+                if ( (LA167_0==46) ) {
+                    int LA167_2 = input.LA(2);
 
-                    if ( (LA169_2==RULE_ID) ) {
-                        int LA169_3 = input.LA(3);
+                    if ( (LA167_2==RULE_ID) ) {
+                        int LA167_3 = input.LA(3);
 
-                        if ( (synpred247_InternalTableDSL()) ) {
-                            alt169=1;
+                        if ( (synpred245_InternalTableDSL()) ) {
+                            alt167=1;
                         }
 
 
@@ -79560,11 +77602,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                 }
 
 
-                switch (alt169) {
+                switch (alt167) {
             	case 1 :
-            	    // InternalTableDSL.g:24259:3: rule__JvmParameterizedTypeReference__Group_1_4__0
+            	    // InternalTableDSL.g:23638:3: rule__JvmParameterizedTypeReference__Group_1_4__0
             	    {
-            	    pushFollow(FOLLOW_176);
+            	    pushFollow(FOLLOW_175);
             	    rule__JvmParameterizedTypeReference__Group_1_4__0();
 
             	    state._fsp--;
@@ -79574,7 +77616,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop169;
+            	    break loop167;
                 }
             } while (true);
 
@@ -79603,16 +77645,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__0"
-    // InternalTableDSL.g:24268:1: rule__JvmParameterizedTypeReference__Group_1_2__0 : rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 ;
+    // InternalTableDSL.g:23647:1: rule__JvmParameterizedTypeReference__Group_1_2__0 : rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24272:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 )
-            // InternalTableDSL.g:24273:2: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1
+            // InternalTableDSL.g:23651:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 )
+            // InternalTableDSL.g:23652:2: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1
             {
-            pushFollow(FOLLOW_137);
+            pushFollow(FOLLOW_136);
             rule__JvmParameterizedTypeReference__Group_1_2__0__Impl();
 
             state._fsp--;
@@ -79641,17 +77683,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__0__Impl"
-    // InternalTableDSL.g:24280:1: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:23659:1: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl : ( ',' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24284:1: ( ( ',' ) )
-            // InternalTableDSL.g:24285:1: ( ',' )
+            // InternalTableDSL.g:23663:1: ( ( ',' ) )
+            // InternalTableDSL.g:23664:1: ( ',' )
             {
-            // InternalTableDSL.g:24285:1: ( ',' )
-            // InternalTableDSL.g:24286:2: ','
+            // InternalTableDSL.g:23664:1: ( ',' )
+            // InternalTableDSL.g:23665:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0()); 
@@ -79682,14 +77724,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__1"
-    // InternalTableDSL.g:24295:1: rule__JvmParameterizedTypeReference__Group_1_2__1 : rule__JvmParameterizedTypeReference__Group_1_2__1__Impl ;
+    // InternalTableDSL.g:23674:1: rule__JvmParameterizedTypeReference__Group_1_2__1 : rule__JvmParameterizedTypeReference__Group_1_2__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24299:1: ( rule__JvmParameterizedTypeReference__Group_1_2__1__Impl )
-            // InternalTableDSL.g:24300:2: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl
+            // InternalTableDSL.g:23678:1: ( rule__JvmParameterizedTypeReference__Group_1_2__1__Impl )
+            // InternalTableDSL.g:23679:2: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_2__1__Impl();
@@ -79715,23 +77757,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__1__Impl"
-    // InternalTableDSL.g:24306:1: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) ;
+    // InternalTableDSL.g:23685:1: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24310:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) )
-            // InternalTableDSL.g:24311:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
+            // InternalTableDSL.g:23689:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) )
+            // InternalTableDSL.g:23690:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
             {
-            // InternalTableDSL.g:24311:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
-            // InternalTableDSL.g:24312:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
+            // InternalTableDSL.g:23690:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
+            // InternalTableDSL.g:23691:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_2_1()); 
             }
-            // InternalTableDSL.g:24313:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
-            // InternalTableDSL.g:24313:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
+            // InternalTableDSL.g:23692:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
+            // InternalTableDSL.g:23692:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1();
@@ -79766,14 +77808,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__0"
-    // InternalTableDSL.g:24322:1: rule__JvmParameterizedTypeReference__Group_1_4__0 : rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 ;
+    // InternalTableDSL.g:23701:1: rule__JvmParameterizedTypeReference__Group_1_4__0 : rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24326:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 )
-            // InternalTableDSL.g:24327:2: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1
+            // InternalTableDSL.g:23705:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 )
+            // InternalTableDSL.g:23706:2: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1
             {
             pushFollow(FOLLOW_7);
             rule__JvmParameterizedTypeReference__Group_1_4__0__Impl();
@@ -79804,23 +77846,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__0__Impl"
-    // InternalTableDSL.g:24334:1: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) ;
+    // InternalTableDSL.g:23713:1: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24338:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) )
-            // InternalTableDSL.g:24339:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
+            // InternalTableDSL.g:23717:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) )
+            // InternalTableDSL.g:23718:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
             {
-            // InternalTableDSL.g:24339:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
-            // InternalTableDSL.g:24340:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
+            // InternalTableDSL.g:23718:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
+            // InternalTableDSL.g:23719:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_0()); 
             }
-            // InternalTableDSL.g:24341:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
-            // InternalTableDSL.g:24341:3: rule__JvmParameterizedTypeReference__Group_1_4_0__0
+            // InternalTableDSL.g:23720:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
+            // InternalTableDSL.g:23720:3: rule__JvmParameterizedTypeReference__Group_1_4_0__0
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0__0();
@@ -79855,16 +77897,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__1"
-    // InternalTableDSL.g:24349:1: rule__JvmParameterizedTypeReference__Group_1_4__1 : rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 ;
+    // InternalTableDSL.g:23728:1: rule__JvmParameterizedTypeReference__Group_1_4__1 : rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24353:1: ( rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 )
-            // InternalTableDSL.g:24354:2: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2
+            // InternalTableDSL.g:23732:1: ( rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 )
+            // InternalTableDSL.g:23733:2: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2
             {
-            pushFollow(FOLLOW_107);
+            pushFollow(FOLLOW_106);
             rule__JvmParameterizedTypeReference__Group_1_4__1__Impl();
 
             state._fsp--;
@@ -79893,23 +77935,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__1__Impl"
-    // InternalTableDSL.g:24361:1: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) ;
+    // InternalTableDSL.g:23740:1: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24365:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) )
-            // InternalTableDSL.g:24366:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
+            // InternalTableDSL.g:23744:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) )
+            // InternalTableDSL.g:23745:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
             {
-            // InternalTableDSL.g:24366:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
-            // InternalTableDSL.g:24367:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
+            // InternalTableDSL.g:23745:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
+            // InternalTableDSL.g:23746:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeAssignment_1_4_1()); 
             }
-            // InternalTableDSL.g:24368:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
-            // InternalTableDSL.g:24368:3: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1
+            // InternalTableDSL.g:23747:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
+            // InternalTableDSL.g:23747:3: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1();
@@ -79944,14 +77986,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__2"
-    // InternalTableDSL.g:24376:1: rule__JvmParameterizedTypeReference__Group_1_4__2 : rule__JvmParameterizedTypeReference__Group_1_4__2__Impl ;
+    // InternalTableDSL.g:23755:1: rule__JvmParameterizedTypeReference__Group_1_4__2 : rule__JvmParameterizedTypeReference__Group_1_4__2__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24380:1: ( rule__JvmParameterizedTypeReference__Group_1_4__2__Impl )
-            // InternalTableDSL.g:24381:2: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl
+            // InternalTableDSL.g:23759:1: ( rule__JvmParameterizedTypeReference__Group_1_4__2__Impl )
+            // InternalTableDSL.g:23760:2: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4__2__Impl();
@@ -79977,27 +78019,27 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__2__Impl"
-    // InternalTableDSL.g:24387:1: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) ;
+    // InternalTableDSL.g:23766:1: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24391:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) )
-            // InternalTableDSL.g:24392:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
+            // InternalTableDSL.g:23770:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) )
+            // InternalTableDSL.g:23771:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
             {
-            // InternalTableDSL.g:24392:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
-            // InternalTableDSL.g:24393:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
+            // InternalTableDSL.g:23771:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
+            // InternalTableDSL.g:23772:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_2()); 
             }
-            // InternalTableDSL.g:24394:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
-            int alt170=2;
-            alt170 = dfa170.predict(input);
-            switch (alt170) {
+            // InternalTableDSL.g:23773:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
+            int alt168=2;
+            alt168 = dfa168.predict(input);
+            switch (alt168) {
                 case 1 :
-                    // InternalTableDSL.g:24394:3: rule__JvmParameterizedTypeReference__Group_1_4_2__0
+                    // InternalTableDSL.g:23773:3: rule__JvmParameterizedTypeReference__Group_1_4_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__JvmParameterizedTypeReference__Group_1_4_2__0();
@@ -80035,14 +78077,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0__0"
-    // InternalTableDSL.g:24403:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl ;
+    // InternalTableDSL.g:23782:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24407:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl )
-            // InternalTableDSL.g:24408:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl
+            // InternalTableDSL.g:23786:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl )
+            // InternalTableDSL.g:23787:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl();
@@ -80068,23 +78110,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl"
-    // InternalTableDSL.g:24414:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) ;
+    // InternalTableDSL.g:23793:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24418:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) )
-            // InternalTableDSL.g:24419:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
+            // InternalTableDSL.g:23797:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) )
+            // InternalTableDSL.g:23798:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
             {
-            // InternalTableDSL.g:24419:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
-            // InternalTableDSL.g:24420:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
+            // InternalTableDSL.g:23798:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
+            // InternalTableDSL.g:23799:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_0_0()); 
             }
-            // InternalTableDSL.g:24421:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
-            // InternalTableDSL.g:24421:3: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0
+            // InternalTableDSL.g:23800:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
+            // InternalTableDSL.g:23800:3: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__0();
@@ -80119,16 +78161,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__0"
-    // InternalTableDSL.g:24430:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 ;
+    // InternalTableDSL.g:23809:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24434:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 )
-            // InternalTableDSL.g:24435:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1
+            // InternalTableDSL.g:23813:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 )
+            // InternalTableDSL.g:23814:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1
             {
-            pushFollow(FOLLOW_68);
+            pushFollow(FOLLOW_66);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl();
 
             state._fsp--;
@@ -80157,23 +78199,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl"
-    // InternalTableDSL.g:24442:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl : ( () ) ;
+    // InternalTableDSL.g:23821:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl : ( () ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24446:1: ( ( () ) )
-            // InternalTableDSL.g:24447:1: ( () )
+            // InternalTableDSL.g:23825:1: ( ( () ) )
+            // InternalTableDSL.g:23826:1: ( () )
             {
-            // InternalTableDSL.g:24447:1: ( () )
-            // InternalTableDSL.g:24448:2: ()
+            // InternalTableDSL.g:23826:1: ( () )
+            // InternalTableDSL.g:23827:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getJvmInnerTypeReferenceOuterAction_1_4_0_0_0()); 
             }
-            // InternalTableDSL.g:24449:2: ()
-            // InternalTableDSL.g:24449:3: 
+            // InternalTableDSL.g:23828:2: ()
+            // InternalTableDSL.g:23828:3: 
             {
             }
 
@@ -80198,14 +78240,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__1"
-    // InternalTableDSL.g:24457:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl ;
+    // InternalTableDSL.g:23836:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24461:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl )
-            // InternalTableDSL.g:24462:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl
+            // InternalTableDSL.g:23840:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl )
+            // InternalTableDSL.g:23841:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl();
@@ -80231,17 +78273,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl"
-    // InternalTableDSL.g:24468:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl : ( '.' ) ;
+    // InternalTableDSL.g:23847:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl : ( '.' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24472:1: ( ( '.' ) )
-            // InternalTableDSL.g:24473:1: ( '.' )
+            // InternalTableDSL.g:23851:1: ( ( '.' ) )
+            // InternalTableDSL.g:23852:1: ( '.' )
             {
-            // InternalTableDSL.g:24473:1: ( '.' )
-            // InternalTableDSL.g:24474:2: '.'
+            // InternalTableDSL.g:23852:1: ( '.' )
+            // InternalTableDSL.g:23853:2: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1()); 
@@ -80272,16 +78314,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__0"
-    // InternalTableDSL.g:24484:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 ;
+    // InternalTableDSL.g:23863:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24488:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 )
-            // InternalTableDSL.g:24489:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1
+            // InternalTableDSL.g:23867:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 )
+            // InternalTableDSL.g:23868:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1
             {
-            pushFollow(FOLLOW_137);
+            pushFollow(FOLLOW_136);
             rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl();
 
             state._fsp--;
@@ -80310,23 +78352,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl"
-    // InternalTableDSL.g:24496:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl : ( ( '<' ) ) ;
+    // InternalTableDSL.g:23875:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl : ( ( '<' ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24500:1: ( ( ( '<' ) ) )
-            // InternalTableDSL.g:24501:1: ( ( '<' ) )
+            // InternalTableDSL.g:23879:1: ( ( ( '<' ) ) )
+            // InternalTableDSL.g:23880:1: ( ( '<' ) )
             {
-            // InternalTableDSL.g:24501:1: ( ( '<' ) )
-            // InternalTableDSL.g:24502:2: ( '<' )
+            // InternalTableDSL.g:23880:1: ( ( '<' ) )
+            // InternalTableDSL.g:23881:2: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_4_2_0()); 
             }
-            // InternalTableDSL.g:24503:2: ( '<' )
-            // InternalTableDSL.g:24503:3: '<'
+            // InternalTableDSL.g:23882:2: ( '<' )
+            // InternalTableDSL.g:23882:3: '<'
             {
             match(input,32,FOLLOW_2); if (state.failed) return ;
 
@@ -80357,16 +78399,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__1"
-    // InternalTableDSL.g:24511:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 ;
+    // InternalTableDSL.g:23890:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24515:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 )
-            // InternalTableDSL.g:24516:2: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2
+            // InternalTableDSL.g:23894:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 )
+            // InternalTableDSL.g:23895:2: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2
             {
-            pushFollow(FOLLOW_138);
+            pushFollow(FOLLOW_137);
             rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl();
 
             state._fsp--;
@@ -80395,23 +78437,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl"
-    // InternalTableDSL.g:24523:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) ;
+    // InternalTableDSL.g:23902:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24527:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) )
-            // InternalTableDSL.g:24528:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
+            // InternalTableDSL.g:23906:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) )
+            // InternalTableDSL.g:23907:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
             {
-            // InternalTableDSL.g:24528:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
-            // InternalTableDSL.g:24529:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
+            // InternalTableDSL.g:23907:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
+            // InternalTableDSL.g:23908:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_4_2_1()); 
             }
-            // InternalTableDSL.g:24530:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
-            // InternalTableDSL.g:24530:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1
+            // InternalTableDSL.g:23909:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
+            // InternalTableDSL.g:23909:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1();
@@ -80446,16 +78488,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__2"
-    // InternalTableDSL.g:24538:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2 : rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 ;
+    // InternalTableDSL.g:23917:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2 : rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24542:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 )
-            // InternalTableDSL.g:24543:2: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3
+            // InternalTableDSL.g:23921:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 )
+            // InternalTableDSL.g:23922:2: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3
             {
-            pushFollow(FOLLOW_138);
+            pushFollow(FOLLOW_137);
             rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl();
 
             state._fsp--;
@@ -80484,37 +78526,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl"
-    // InternalTableDSL.g:24550:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) ;
+    // InternalTableDSL.g:23929:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24554:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) )
-            // InternalTableDSL.g:24555:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
+            // InternalTableDSL.g:23933:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) )
+            // InternalTableDSL.g:23934:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
             {
-            // InternalTableDSL.g:24555:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
-            // InternalTableDSL.g:24556:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
+            // InternalTableDSL.g:23934:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
+            // InternalTableDSL.g:23935:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_2_2()); 
             }
-            // InternalTableDSL.g:24557:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
-            loop171:
+            // InternalTableDSL.g:23936:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
+            loop169:
             do {
-                int alt171=2;
-                int LA171_0 = input.LA(1);
+                int alt169=2;
+                int LA169_0 = input.LA(1);
 
-                if ( (LA171_0==137) ) {
-                    alt171=1;
+                if ( (LA169_0==137) ) {
+                    alt169=1;
                 }
 
 
-                switch (alt171) {
+                switch (alt169) {
             	case 1 :
-            	    // InternalTableDSL.g:24557:3: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0
+            	    // InternalTableDSL.g:23936:3: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0
             	    {
-            	    pushFollow(FOLLOW_99);
+            	    pushFollow(FOLLOW_98);
             	    rule__JvmParameterizedTypeReference__Group_1_4_2_2__0();
 
             	    state._fsp--;
@@ -80524,7 +78566,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop171;
+            	    break loop169;
                 }
             } while (true);
 
@@ -80553,14 +78595,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__3"
-    // InternalTableDSL.g:24565:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3 : rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl ;
+    // InternalTableDSL.g:23944:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3 : rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24569:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl )
-            // InternalTableDSL.g:24570:2: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl
+            // InternalTableDSL.g:23948:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl )
+            // InternalTableDSL.g:23949:2: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl();
@@ -80586,17 +78628,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl"
-    // InternalTableDSL.g:24576:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl : ( '>' ) ;
+    // InternalTableDSL.g:23955:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl : ( '>' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24580:1: ( ( '>' ) )
-            // InternalTableDSL.g:24581:1: ( '>' )
+            // InternalTableDSL.g:23959:1: ( ( '>' ) )
+            // InternalTableDSL.g:23960:1: ( '>' )
             {
-            // InternalTableDSL.g:24581:1: ( '>' )
-            // InternalTableDSL.g:24582:2: '>'
+            // InternalTableDSL.g:23960:1: ( '>' )
+            // InternalTableDSL.g:23961:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3()); 
@@ -80627,16 +78669,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__0"
-    // InternalTableDSL.g:24592:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 ;
+    // InternalTableDSL.g:23971:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24596:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 )
-            // InternalTableDSL.g:24597:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1
+            // InternalTableDSL.g:23975:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 )
+            // InternalTableDSL.g:23976:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1
             {
-            pushFollow(FOLLOW_137);
+            pushFollow(FOLLOW_136);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl();
 
             state._fsp--;
@@ -80665,17 +78707,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl"
-    // InternalTableDSL.g:24604:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl : ( ',' ) ;
+    // InternalTableDSL.g:23983:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl : ( ',' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24608:1: ( ( ',' ) )
-            // InternalTableDSL.g:24609:1: ( ',' )
+            // InternalTableDSL.g:23987:1: ( ( ',' ) )
+            // InternalTableDSL.g:23988:1: ( ',' )
             {
-            // InternalTableDSL.g:24609:1: ( ',' )
-            // InternalTableDSL.g:24610:2: ','
+            // InternalTableDSL.g:23988:1: ( ',' )
+            // InternalTableDSL.g:23989:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0()); 
@@ -80706,14 +78748,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__1"
-    // InternalTableDSL.g:24619:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl ;
+    // InternalTableDSL.g:23998:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24623:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl )
-            // InternalTableDSL.g:24624:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl
+            // InternalTableDSL.g:24002:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl )
+            // InternalTableDSL.g:24003:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl();
@@ -80739,23 +78781,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl"
-    // InternalTableDSL.g:24630:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) ;
+    // InternalTableDSL.g:24009:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24634:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) )
-            // InternalTableDSL.g:24635:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
+            // InternalTableDSL.g:24013:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) )
+            // InternalTableDSL.g:24014:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
             {
-            // InternalTableDSL.g:24635:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
-            // InternalTableDSL.g:24636:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
+            // InternalTableDSL.g:24014:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
+            // InternalTableDSL.g:24015:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_4_2_2_1()); 
             }
-            // InternalTableDSL.g:24637:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
-            // InternalTableDSL.g:24637:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1
+            // InternalTableDSL.g:24016:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
+            // InternalTableDSL.g:24016:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1();
@@ -80790,16 +78832,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__0"
-    // InternalTableDSL.g:24646:1: rule__JvmWildcardTypeReference__Group__0 : rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 ;
+    // InternalTableDSL.g:24025:1: rule__JvmWildcardTypeReference__Group__0 : rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 ;
     public final void rule__JvmWildcardTypeReference__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24650:1: ( rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 )
-            // InternalTableDSL.g:24651:2: rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1
+            // InternalTableDSL.g:24029:1: ( rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 )
+            // InternalTableDSL.g:24030:2: rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1
             {
-            pushFollow(FOLLOW_137);
+            pushFollow(FOLLOW_136);
             rule__JvmWildcardTypeReference__Group__0__Impl();
 
             state._fsp--;
@@ -80828,23 +78870,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__0__Impl"
-    // InternalTableDSL.g:24658:1: rule__JvmWildcardTypeReference__Group__0__Impl : ( () ) ;
+    // InternalTableDSL.g:24037:1: rule__JvmWildcardTypeReference__Group__0__Impl : ( () ) ;
     public final void rule__JvmWildcardTypeReference__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24662:1: ( ( () ) )
-            // InternalTableDSL.g:24663:1: ( () )
+            // InternalTableDSL.g:24041:1: ( ( () ) )
+            // InternalTableDSL.g:24042:1: ( () )
             {
-            // InternalTableDSL.g:24663:1: ( () )
-            // InternalTableDSL.g:24664:2: ()
+            // InternalTableDSL.g:24042:1: ( () )
+            // InternalTableDSL.g:24043:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getJvmWildcardTypeReferenceAction_0()); 
             }
-            // InternalTableDSL.g:24665:2: ()
-            // InternalTableDSL.g:24665:3: 
+            // InternalTableDSL.g:24044:2: ()
+            // InternalTableDSL.g:24044:3: 
             {
             }
 
@@ -80869,16 +78911,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__1"
-    // InternalTableDSL.g:24673:1: rule__JvmWildcardTypeReference__Group__1 : rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 ;
+    // InternalTableDSL.g:24052:1: rule__JvmWildcardTypeReference__Group__1 : rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 ;
     public final void rule__JvmWildcardTypeReference__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24677:1: ( rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 )
-            // InternalTableDSL.g:24678:2: rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2
+            // InternalTableDSL.g:24056:1: ( rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 )
+            // InternalTableDSL.g:24057:2: rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2
             {
-            pushFollow(FOLLOW_179);
+            pushFollow(FOLLOW_178);
             rule__JvmWildcardTypeReference__Group__1__Impl();
 
             state._fsp--;
@@ -80907,17 +78949,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__1__Impl"
-    // InternalTableDSL.g:24685:1: rule__JvmWildcardTypeReference__Group__1__Impl : ( '?' ) ;
+    // InternalTableDSL.g:24064:1: rule__JvmWildcardTypeReference__Group__1__Impl : ( '?' ) ;
     public final void rule__JvmWildcardTypeReference__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24689:1: ( ( '?' ) )
-            // InternalTableDSL.g:24690:1: ( '?' )
+            // InternalTableDSL.g:24068:1: ( ( '?' ) )
+            // InternalTableDSL.g:24069:1: ( '?' )
             {
-            // InternalTableDSL.g:24690:1: ( '?' )
-            // InternalTableDSL.g:24691:2: '?'
+            // InternalTableDSL.g:24069:1: ( '?' )
+            // InternalTableDSL.g:24070:2: '?'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1()); 
@@ -80948,14 +78990,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__2"
-    // InternalTableDSL.g:24700:1: rule__JvmWildcardTypeReference__Group__2 : rule__JvmWildcardTypeReference__Group__2__Impl ;
+    // InternalTableDSL.g:24079:1: rule__JvmWildcardTypeReference__Group__2 : rule__JvmWildcardTypeReference__Group__2__Impl ;
     public final void rule__JvmWildcardTypeReference__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24704:1: ( rule__JvmWildcardTypeReference__Group__2__Impl )
-            // InternalTableDSL.g:24705:2: rule__JvmWildcardTypeReference__Group__2__Impl
+            // InternalTableDSL.g:24083:1: ( rule__JvmWildcardTypeReference__Group__2__Impl )
+            // InternalTableDSL.g:24084:2: rule__JvmWildcardTypeReference__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group__2__Impl();
@@ -80981,31 +79023,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__2__Impl"
-    // InternalTableDSL.g:24711:1: rule__JvmWildcardTypeReference__Group__2__Impl : ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) ;
+    // InternalTableDSL.g:24090:1: rule__JvmWildcardTypeReference__Group__2__Impl : ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) ;
     public final void rule__JvmWildcardTypeReference__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24715:1: ( ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) )
-            // InternalTableDSL.g:24716:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
+            // InternalTableDSL.g:24094:1: ( ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) )
+            // InternalTableDSL.g:24095:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
             {
-            // InternalTableDSL.g:24716:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
-            // InternalTableDSL.g:24717:2: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
+            // InternalTableDSL.g:24095:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
+            // InternalTableDSL.g:24096:2: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getAlternatives_2()); 
             }
-            // InternalTableDSL.g:24718:2: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
-            int alt172=2;
-            int LA172_0 = input.LA(1);
+            // InternalTableDSL.g:24097:2: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
+            int alt170=2;
+            int LA170_0 = input.LA(1);
 
-            if ( (LA172_0==48||LA172_0==52) ) {
-                alt172=1;
+            if ( (LA170_0==48||LA170_0==52) ) {
+                alt170=1;
             }
-            switch (alt172) {
+            switch (alt170) {
                 case 1 :
-                    // InternalTableDSL.g:24718:3: rule__JvmWildcardTypeReference__Alternatives_2
+                    // InternalTableDSL.g:24097:3: rule__JvmWildcardTypeReference__Alternatives_2
                     {
                     pushFollow(FOLLOW_2);
                     rule__JvmWildcardTypeReference__Alternatives_2();
@@ -81043,16 +79085,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__0"
-    // InternalTableDSL.g:24727:1: rule__JvmWildcardTypeReference__Group_2_0__0 : rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 ;
+    // InternalTableDSL.g:24106:1: rule__JvmWildcardTypeReference__Group_2_0__0 : rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24731:1: ( rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 )
-            // InternalTableDSL.g:24732:2: rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1
+            // InternalTableDSL.g:24110:1: ( rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 )
+            // InternalTableDSL.g:24111:2: rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1
             {
-            pushFollow(FOLLOW_180);
+            pushFollow(FOLLOW_179);
             rule__JvmWildcardTypeReference__Group_2_0__0__Impl();
 
             state._fsp--;
@@ -81081,23 +79123,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__0__Impl"
-    // InternalTableDSL.g:24739:1: rule__JvmWildcardTypeReference__Group_2_0__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) ;
+    // InternalTableDSL.g:24118:1: rule__JvmWildcardTypeReference__Group_2_0__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24743:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) )
-            // InternalTableDSL.g:24744:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
+            // InternalTableDSL.g:24122:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) )
+            // InternalTableDSL.g:24123:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
             {
-            // InternalTableDSL.g:24744:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
-            // InternalTableDSL.g:24745:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
+            // InternalTableDSL.g:24123:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
+            // InternalTableDSL.g:24124:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_0_0()); 
             }
-            // InternalTableDSL.g:24746:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
-            // InternalTableDSL.g:24746:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0
+            // InternalTableDSL.g:24125:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
+            // InternalTableDSL.g:24125:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0
             {
             pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0();
@@ -81132,14 +79174,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__1"
-    // InternalTableDSL.g:24754:1: rule__JvmWildcardTypeReference__Group_2_0__1 : rule__JvmWildcardTypeReference__Group_2_0__1__Impl ;
+    // InternalTableDSL.g:24133:1: rule__JvmWildcardTypeReference__Group_2_0__1 : rule__JvmWildcardTypeReference__Group_2_0__1__Impl ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24758:1: ( rule__JvmWildcardTypeReference__Group_2_0__1__Impl )
-            // InternalTableDSL.g:24759:2: rule__JvmWildcardTypeReference__Group_2_0__1__Impl
+            // InternalTableDSL.g:24137:1: ( rule__JvmWildcardTypeReference__Group_2_0__1__Impl )
+            // InternalTableDSL.g:24138:2: rule__JvmWildcardTypeReference__Group_2_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_0__1__Impl();
@@ -81165,37 +79207,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__1__Impl"
-    // InternalTableDSL.g:24765:1: rule__JvmWildcardTypeReference__Group_2_0__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) ;
+    // InternalTableDSL.g:24144:1: rule__JvmWildcardTypeReference__Group_2_0__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24769:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) )
-            // InternalTableDSL.g:24770:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
+            // InternalTableDSL.g:24148:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) )
+            // InternalTableDSL.g:24149:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
             {
-            // InternalTableDSL.g:24770:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
-            // InternalTableDSL.g:24771:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
+            // InternalTableDSL.g:24149:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
+            // InternalTableDSL.g:24150:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_0_1()); 
             }
-            // InternalTableDSL.g:24772:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
-            loop173:
+            // InternalTableDSL.g:24151:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
+            loop171:
             do {
-                int alt173=2;
-                int LA173_0 = input.LA(1);
+                int alt171=2;
+                int LA171_0 = input.LA(1);
 
-                if ( (LA173_0==160) ) {
-                    alt173=1;
+                if ( (LA171_0==160) ) {
+                    alt171=1;
                 }
 
 
-                switch (alt173) {
+                switch (alt171) {
             	case 1 :
-            	    // InternalTableDSL.g:24772:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1
+            	    // InternalTableDSL.g:24151:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1
             	    {
-            	    pushFollow(FOLLOW_181);
+            	    pushFollow(FOLLOW_180);
             	    rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1();
 
             	    state._fsp--;
@@ -81205,7 +79247,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop173;
+            	    break loop171;
                 }
             } while (true);
 
@@ -81234,16 +79276,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__0"
-    // InternalTableDSL.g:24781:1: rule__JvmWildcardTypeReference__Group_2_1__0 : rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 ;
+    // InternalTableDSL.g:24160:1: rule__JvmWildcardTypeReference__Group_2_1__0 : rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24785:1: ( rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 )
-            // InternalTableDSL.g:24786:2: rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1
+            // InternalTableDSL.g:24164:1: ( rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 )
+            // InternalTableDSL.g:24165:2: rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1
             {
-            pushFollow(FOLLOW_180);
+            pushFollow(FOLLOW_179);
             rule__JvmWildcardTypeReference__Group_2_1__0__Impl();
 
             state._fsp--;
@@ -81272,23 +79314,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__0__Impl"
-    // InternalTableDSL.g:24793:1: rule__JvmWildcardTypeReference__Group_2_1__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) ;
+    // InternalTableDSL.g:24172:1: rule__JvmWildcardTypeReference__Group_2_1__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24797:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) )
-            // InternalTableDSL.g:24798:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
+            // InternalTableDSL.g:24176:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) )
+            // InternalTableDSL.g:24177:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
             {
-            // InternalTableDSL.g:24798:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
-            // InternalTableDSL.g:24799:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
+            // InternalTableDSL.g:24177:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
+            // InternalTableDSL.g:24178:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_1_0()); 
             }
-            // InternalTableDSL.g:24800:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
-            // InternalTableDSL.g:24800:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0
+            // InternalTableDSL.g:24179:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
+            // InternalTableDSL.g:24179:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0
             {
             pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0();
@@ -81323,14 +79365,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__1"
-    // InternalTableDSL.g:24808:1: rule__JvmWildcardTypeReference__Group_2_1__1 : rule__JvmWildcardTypeReference__Group_2_1__1__Impl ;
+    // InternalTableDSL.g:24187:1: rule__JvmWildcardTypeReference__Group_2_1__1 : rule__JvmWildcardTypeReference__Group_2_1__1__Impl ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24812:1: ( rule__JvmWildcardTypeReference__Group_2_1__1__Impl )
-            // InternalTableDSL.g:24813:2: rule__JvmWildcardTypeReference__Group_2_1__1__Impl
+            // InternalTableDSL.g:24191:1: ( rule__JvmWildcardTypeReference__Group_2_1__1__Impl )
+            // InternalTableDSL.g:24192:2: rule__JvmWildcardTypeReference__Group_2_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_1__1__Impl();
@@ -81356,37 +79398,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__1__Impl"
-    // InternalTableDSL.g:24819:1: rule__JvmWildcardTypeReference__Group_2_1__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) ;
+    // InternalTableDSL.g:24198:1: rule__JvmWildcardTypeReference__Group_2_1__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24823:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) )
-            // InternalTableDSL.g:24824:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
+            // InternalTableDSL.g:24202:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) )
+            // InternalTableDSL.g:24203:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
             {
-            // InternalTableDSL.g:24824:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
-            // InternalTableDSL.g:24825:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
+            // InternalTableDSL.g:24203:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
+            // InternalTableDSL.g:24204:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_1_1()); 
             }
-            // InternalTableDSL.g:24826:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
-            loop174:
+            // InternalTableDSL.g:24205:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
+            loop172:
             do {
-                int alt174=2;
-                int LA174_0 = input.LA(1);
+                int alt172=2;
+                int LA172_0 = input.LA(1);
 
-                if ( (LA174_0==160) ) {
-                    alt174=1;
+                if ( (LA172_0==160) ) {
+                    alt172=1;
                 }
 
 
-                switch (alt174) {
+                switch (alt172) {
             	case 1 :
-            	    // InternalTableDSL.g:24826:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1
+            	    // InternalTableDSL.g:24205:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1
             	    {
-            	    pushFollow(FOLLOW_181);
+            	    pushFollow(FOLLOW_180);
             	    rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1();
 
             	    state._fsp--;
@@ -81396,7 +79438,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             	    break;
 
             	default :
-            	    break loop174;
+            	    break loop172;
                 }
             } while (true);
 
@@ -81425,16 +79467,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__0"
-    // InternalTableDSL.g:24835:1: rule__JvmUpperBound__Group__0 : rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 ;
+    // InternalTableDSL.g:24214:1: rule__JvmUpperBound__Group__0 : rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 ;
     public final void rule__JvmUpperBound__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24839:1: ( rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 )
-            // InternalTableDSL.g:24840:2: rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1
+            // InternalTableDSL.g:24218:1: ( rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 )
+            // InternalTableDSL.g:24219:2: rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__JvmUpperBound__Group__0__Impl();
 
             state._fsp--;
@@ -81463,17 +79505,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__0__Impl"
-    // InternalTableDSL.g:24847:1: rule__JvmUpperBound__Group__0__Impl : ( 'extends' ) ;
+    // InternalTableDSL.g:24226:1: rule__JvmUpperBound__Group__0__Impl : ( 'extends' ) ;
     public final void rule__JvmUpperBound__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24851:1: ( ( 'extends' ) )
-            // InternalTableDSL.g:24852:1: ( 'extends' )
+            // InternalTableDSL.g:24230:1: ( ( 'extends' ) )
+            // InternalTableDSL.g:24231:1: ( 'extends' )
             {
-            // InternalTableDSL.g:24852:1: ( 'extends' )
-            // InternalTableDSL.g:24853:2: 'extends'
+            // InternalTableDSL.g:24231:1: ( 'extends' )
+            // InternalTableDSL.g:24232:2: 'extends'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0()); 
@@ -81504,14 +79546,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__1"
-    // InternalTableDSL.g:24862:1: rule__JvmUpperBound__Group__1 : rule__JvmUpperBound__Group__1__Impl ;
+    // InternalTableDSL.g:24241:1: rule__JvmUpperBound__Group__1 : rule__JvmUpperBound__Group__1__Impl ;
     public final void rule__JvmUpperBound__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24866:1: ( rule__JvmUpperBound__Group__1__Impl )
-            // InternalTableDSL.g:24867:2: rule__JvmUpperBound__Group__1__Impl
+            // InternalTableDSL.g:24245:1: ( rule__JvmUpperBound__Group__1__Impl )
+            // InternalTableDSL.g:24246:2: rule__JvmUpperBound__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmUpperBound__Group__1__Impl();
@@ -81537,23 +79579,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__1__Impl"
-    // InternalTableDSL.g:24873:1: rule__JvmUpperBound__Group__1__Impl : ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) ;
+    // InternalTableDSL.g:24252:1: rule__JvmUpperBound__Group__1__Impl : ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmUpperBound__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24877:1: ( ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) )
-            // InternalTableDSL.g:24878:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
+            // InternalTableDSL.g:24256:1: ( ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) )
+            // InternalTableDSL.g:24257:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
             {
-            // InternalTableDSL.g:24878:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
-            // InternalTableDSL.g:24879:2: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
+            // InternalTableDSL.g:24257:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
+            // InternalTableDSL.g:24258:2: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceAssignment_1()); 
             }
-            // InternalTableDSL.g:24880:2: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
-            // InternalTableDSL.g:24880:3: rule__JvmUpperBound__TypeReferenceAssignment_1
+            // InternalTableDSL.g:24259:2: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
+            // InternalTableDSL.g:24259:3: rule__JvmUpperBound__TypeReferenceAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmUpperBound__TypeReferenceAssignment_1();
@@ -81588,16 +79630,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__0"
-    // InternalTableDSL.g:24889:1: rule__JvmUpperBoundAnded__Group__0 : rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 ;
+    // InternalTableDSL.g:24268:1: rule__JvmUpperBoundAnded__Group__0 : rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 ;
     public final void rule__JvmUpperBoundAnded__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24893:1: ( rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 )
-            // InternalTableDSL.g:24894:2: rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1
+            // InternalTableDSL.g:24272:1: ( rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 )
+            // InternalTableDSL.g:24273:2: rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__JvmUpperBoundAnded__Group__0__Impl();
 
             state._fsp--;
@@ -81626,17 +79668,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__0__Impl"
-    // InternalTableDSL.g:24901:1: rule__JvmUpperBoundAnded__Group__0__Impl : ( '&' ) ;
+    // InternalTableDSL.g:24280:1: rule__JvmUpperBoundAnded__Group__0__Impl : ( '&' ) ;
     public final void rule__JvmUpperBoundAnded__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24905:1: ( ( '&' ) )
-            // InternalTableDSL.g:24906:1: ( '&' )
+            // InternalTableDSL.g:24284:1: ( ( '&' ) )
+            // InternalTableDSL.g:24285:1: ( '&' )
             {
-            // InternalTableDSL.g:24906:1: ( '&' )
-            // InternalTableDSL.g:24907:2: '&'
+            // InternalTableDSL.g:24285:1: ( '&' )
+            // InternalTableDSL.g:24286:2: '&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0()); 
@@ -81667,14 +79709,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__1"
-    // InternalTableDSL.g:24916:1: rule__JvmUpperBoundAnded__Group__1 : rule__JvmUpperBoundAnded__Group__1__Impl ;
+    // InternalTableDSL.g:24295:1: rule__JvmUpperBoundAnded__Group__1 : rule__JvmUpperBoundAnded__Group__1__Impl ;
     public final void rule__JvmUpperBoundAnded__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24920:1: ( rule__JvmUpperBoundAnded__Group__1__Impl )
-            // InternalTableDSL.g:24921:2: rule__JvmUpperBoundAnded__Group__1__Impl
+            // InternalTableDSL.g:24299:1: ( rule__JvmUpperBoundAnded__Group__1__Impl )
+            // InternalTableDSL.g:24300:2: rule__JvmUpperBoundAnded__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__Group__1__Impl();
@@ -81700,23 +79742,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__1__Impl"
-    // InternalTableDSL.g:24927:1: rule__JvmUpperBoundAnded__Group__1__Impl : ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) ;
+    // InternalTableDSL.g:24306:1: rule__JvmUpperBoundAnded__Group__1__Impl : ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmUpperBoundAnded__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24931:1: ( ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) )
-            // InternalTableDSL.g:24932:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalTableDSL.g:24310:1: ( ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) )
+            // InternalTableDSL.g:24311:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
             {
-            // InternalTableDSL.g:24932:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
-            // InternalTableDSL.g:24933:2: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
+            // InternalTableDSL.g:24311:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalTableDSL.g:24312:2: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceAssignment_1()); 
             }
-            // InternalTableDSL.g:24934:2: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
-            // InternalTableDSL.g:24934:3: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1
+            // InternalTableDSL.g:24313:2: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
+            // InternalTableDSL.g:24313:3: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__TypeReferenceAssignment_1();
@@ -81751,16 +79793,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__0"
-    // InternalTableDSL.g:24943:1: rule__JvmLowerBound__Group__0 : rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 ;
+    // InternalTableDSL.g:24322:1: rule__JvmLowerBound__Group__0 : rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 ;
     public final void rule__JvmLowerBound__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24947:1: ( rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 )
-            // InternalTableDSL.g:24948:2: rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1
+            // InternalTableDSL.g:24326:1: ( rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 )
+            // InternalTableDSL.g:24327:2: rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__JvmLowerBound__Group__0__Impl();
 
             state._fsp--;
@@ -81789,17 +79831,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__0__Impl"
-    // InternalTableDSL.g:24955:1: rule__JvmLowerBound__Group__0__Impl : ( 'super' ) ;
+    // InternalTableDSL.g:24334:1: rule__JvmLowerBound__Group__0__Impl : ( 'super' ) ;
     public final void rule__JvmLowerBound__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24959:1: ( ( 'super' ) )
-            // InternalTableDSL.g:24960:1: ( 'super' )
+            // InternalTableDSL.g:24338:1: ( ( 'super' ) )
+            // InternalTableDSL.g:24339:1: ( 'super' )
             {
-            // InternalTableDSL.g:24960:1: ( 'super' )
-            // InternalTableDSL.g:24961:2: 'super'
+            // InternalTableDSL.g:24339:1: ( 'super' )
+            // InternalTableDSL.g:24340:2: 'super'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0()); 
@@ -81830,14 +79872,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__1"
-    // InternalTableDSL.g:24970:1: rule__JvmLowerBound__Group__1 : rule__JvmLowerBound__Group__1__Impl ;
+    // InternalTableDSL.g:24349:1: rule__JvmLowerBound__Group__1 : rule__JvmLowerBound__Group__1__Impl ;
     public final void rule__JvmLowerBound__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24974:1: ( rule__JvmLowerBound__Group__1__Impl )
-            // InternalTableDSL.g:24975:2: rule__JvmLowerBound__Group__1__Impl
+            // InternalTableDSL.g:24353:1: ( rule__JvmLowerBound__Group__1__Impl )
+            // InternalTableDSL.g:24354:2: rule__JvmLowerBound__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmLowerBound__Group__1__Impl();
@@ -81863,23 +79905,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__1__Impl"
-    // InternalTableDSL.g:24981:1: rule__JvmLowerBound__Group__1__Impl : ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) ;
+    // InternalTableDSL.g:24360:1: rule__JvmLowerBound__Group__1__Impl : ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmLowerBound__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:24985:1: ( ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) )
-            // InternalTableDSL.g:24986:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
+            // InternalTableDSL.g:24364:1: ( ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) )
+            // InternalTableDSL.g:24365:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
             {
-            // InternalTableDSL.g:24986:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
-            // InternalTableDSL.g:24987:2: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
+            // InternalTableDSL.g:24365:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
+            // InternalTableDSL.g:24366:2: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceAssignment_1()); 
             }
-            // InternalTableDSL.g:24988:2: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
-            // InternalTableDSL.g:24988:3: rule__JvmLowerBound__TypeReferenceAssignment_1
+            // InternalTableDSL.g:24367:2: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
+            // InternalTableDSL.g:24367:3: rule__JvmLowerBound__TypeReferenceAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmLowerBound__TypeReferenceAssignment_1();
@@ -81914,16 +79956,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__0"
-    // InternalTableDSL.g:24997:1: rule__JvmLowerBoundAnded__Group__0 : rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 ;
+    // InternalTableDSL.g:24376:1: rule__JvmLowerBoundAnded__Group__0 : rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 ;
     public final void rule__JvmLowerBoundAnded__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25001:1: ( rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 )
-            // InternalTableDSL.g:25002:2: rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1
+            // InternalTableDSL.g:24380:1: ( rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 )
+            // InternalTableDSL.g:24381:2: rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1
             {
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             rule__JvmLowerBoundAnded__Group__0__Impl();
 
             state._fsp--;
@@ -81952,17 +79994,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__0__Impl"
-    // InternalTableDSL.g:25009:1: rule__JvmLowerBoundAnded__Group__0__Impl : ( '&' ) ;
+    // InternalTableDSL.g:24388:1: rule__JvmLowerBoundAnded__Group__0__Impl : ( '&' ) ;
     public final void rule__JvmLowerBoundAnded__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25013:1: ( ( '&' ) )
-            // InternalTableDSL.g:25014:1: ( '&' )
+            // InternalTableDSL.g:24392:1: ( ( '&' ) )
+            // InternalTableDSL.g:24393:1: ( '&' )
             {
-            // InternalTableDSL.g:25014:1: ( '&' )
-            // InternalTableDSL.g:25015:2: '&'
+            // InternalTableDSL.g:24393:1: ( '&' )
+            // InternalTableDSL.g:24394:2: '&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0()); 
@@ -81993,14 +80035,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__1"
-    // InternalTableDSL.g:25024:1: rule__JvmLowerBoundAnded__Group__1 : rule__JvmLowerBoundAnded__Group__1__Impl ;
+    // InternalTableDSL.g:24403:1: rule__JvmLowerBoundAnded__Group__1 : rule__JvmLowerBoundAnded__Group__1__Impl ;
     public final void rule__JvmLowerBoundAnded__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25028:1: ( rule__JvmLowerBoundAnded__Group__1__Impl )
-            // InternalTableDSL.g:25029:2: rule__JvmLowerBoundAnded__Group__1__Impl
+            // InternalTableDSL.g:24407:1: ( rule__JvmLowerBoundAnded__Group__1__Impl )
+            // InternalTableDSL.g:24408:2: rule__JvmLowerBoundAnded__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__Group__1__Impl();
@@ -82026,23 +80068,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__1__Impl"
-    // InternalTableDSL.g:25035:1: rule__JvmLowerBoundAnded__Group__1__Impl : ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) ;
+    // InternalTableDSL.g:24414:1: rule__JvmLowerBoundAnded__Group__1__Impl : ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmLowerBoundAnded__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25039:1: ( ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) )
-            // InternalTableDSL.g:25040:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalTableDSL.g:24418:1: ( ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) )
+            // InternalTableDSL.g:24419:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
             {
-            // InternalTableDSL.g:25040:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
-            // InternalTableDSL.g:25041:2: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
+            // InternalTableDSL.g:24419:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalTableDSL.g:24420:2: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceAssignment_1()); 
             }
-            // InternalTableDSL.g:25042:2: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
-            // InternalTableDSL.g:25042:3: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1
+            // InternalTableDSL.g:24421:2: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
+            // InternalTableDSL.g:24421:3: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__TypeReferenceAssignment_1();
@@ -82077,16 +80119,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__0"
-    // InternalTableDSL.g:25051:1: rule__QualifiedNameWithWildcard__Group__0 : rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 ;
+    // InternalTableDSL.g:24430:1: rule__QualifiedNameWithWildcard__Group__0 : rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 ;
     public final void rule__QualifiedNameWithWildcard__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25055:1: ( rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 )
-            // InternalTableDSL.g:25056:2: rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1
+            // InternalTableDSL.g:24434:1: ( rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 )
+            // InternalTableDSL.g:24435:2: rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1
             {
-            pushFollow(FOLLOW_68);
+            pushFollow(FOLLOW_66);
             rule__QualifiedNameWithWildcard__Group__0__Impl();
 
             state._fsp--;
@@ -82115,17 +80157,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__0__Impl"
-    // InternalTableDSL.g:25063:1: rule__QualifiedNameWithWildcard__Group__0__Impl : ( ruleQualifiedName ) ;
+    // InternalTableDSL.g:24442:1: rule__QualifiedNameWithWildcard__Group__0__Impl : ( ruleQualifiedName ) ;
     public final void rule__QualifiedNameWithWildcard__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25067:1: ( ( ruleQualifiedName ) )
-            // InternalTableDSL.g:25068:1: ( ruleQualifiedName )
+            // InternalTableDSL.g:24446:1: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:24447:1: ( ruleQualifiedName )
             {
-            // InternalTableDSL.g:25068:1: ( ruleQualifiedName )
-            // InternalTableDSL.g:25069:2: ruleQualifiedName
+            // InternalTableDSL.g:24447:1: ( ruleQualifiedName )
+            // InternalTableDSL.g:24448:2: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getQualifiedNameParserRuleCall_0()); 
@@ -82160,16 +80202,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__1"
-    // InternalTableDSL.g:25078:1: rule__QualifiedNameWithWildcard__Group__1 : rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 ;
+    // InternalTableDSL.g:24457:1: rule__QualifiedNameWithWildcard__Group__1 : rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 ;
     public final void rule__QualifiedNameWithWildcard__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25082:1: ( rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 )
-            // InternalTableDSL.g:25083:2: rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2
+            // InternalTableDSL.g:24461:1: ( rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 )
+            // InternalTableDSL.g:24462:2: rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2
             {
-            pushFollow(FOLLOW_182);
+            pushFollow(FOLLOW_181);
             rule__QualifiedNameWithWildcard__Group__1__Impl();
 
             state._fsp--;
@@ -82198,17 +80240,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__1__Impl"
-    // InternalTableDSL.g:25090:1: rule__QualifiedNameWithWildcard__Group__1__Impl : ( '.' ) ;
+    // InternalTableDSL.g:24469:1: rule__QualifiedNameWithWildcard__Group__1__Impl : ( '.' ) ;
     public final void rule__QualifiedNameWithWildcard__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25094:1: ( ( '.' ) )
-            // InternalTableDSL.g:25095:1: ( '.' )
+            // InternalTableDSL.g:24473:1: ( ( '.' ) )
+            // InternalTableDSL.g:24474:1: ( '.' )
             {
-            // InternalTableDSL.g:25095:1: ( '.' )
-            // InternalTableDSL.g:25096:2: '.'
+            // InternalTableDSL.g:24474:1: ( '.' )
+            // InternalTableDSL.g:24475:2: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1()); 
@@ -82239,14 +80281,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__2"
-    // InternalTableDSL.g:25105:1: rule__QualifiedNameWithWildcard__Group__2 : rule__QualifiedNameWithWildcard__Group__2__Impl ;
+    // InternalTableDSL.g:24484:1: rule__QualifiedNameWithWildcard__Group__2 : rule__QualifiedNameWithWildcard__Group__2__Impl ;
     public final void rule__QualifiedNameWithWildcard__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25109:1: ( rule__QualifiedNameWithWildcard__Group__2__Impl )
-            // InternalTableDSL.g:25110:2: rule__QualifiedNameWithWildcard__Group__2__Impl
+            // InternalTableDSL.g:24488:1: ( rule__QualifiedNameWithWildcard__Group__2__Impl )
+            // InternalTableDSL.g:24489:2: rule__QualifiedNameWithWildcard__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__2__Impl();
@@ -82272,17 +80314,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__2__Impl"
-    // InternalTableDSL.g:25116:1: rule__QualifiedNameWithWildcard__Group__2__Impl : ( '*' ) ;
+    // InternalTableDSL.g:24495:1: rule__QualifiedNameWithWildcard__Group__2__Impl : ( '*' ) ;
     public final void rule__QualifiedNameWithWildcard__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25120:1: ( ( '*' ) )
-            // InternalTableDSL.g:25121:1: ( '*' )
+            // InternalTableDSL.g:24499:1: ( ( '*' ) )
+            // InternalTableDSL.g:24500:1: ( '*' )
             {
-            // InternalTableDSL.g:25121:1: ( '*' )
-            // InternalTableDSL.g:25122:2: '*'
+            // InternalTableDSL.g:24500:1: ( '*' )
+            // InternalTableDSL.g:24501:2: '*'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getAsteriskKeyword_2()); 
@@ -82313,16 +80355,16 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__0"
-    // InternalTableDSL.g:25132:1: rule__QualifiedNameInStaticImport__Group__0 : rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1 ;
+    // InternalTableDSL.g:24511:1: rule__QualifiedNameInStaticImport__Group__0 : rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1 ;
     public final void rule__QualifiedNameInStaticImport__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25136:1: ( rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1 )
-            // InternalTableDSL.g:25137:2: rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1
+            // InternalTableDSL.g:24515:1: ( rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1 )
+            // InternalTableDSL.g:24516:2: rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1
             {
-            pushFollow(FOLLOW_68);
+            pushFollow(FOLLOW_66);
             rule__QualifiedNameInStaticImport__Group__0__Impl();
 
             state._fsp--;
@@ -82351,17 +80393,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__0__Impl"
-    // InternalTableDSL.g:25144:1: rule__QualifiedNameInStaticImport__Group__0__Impl : ( ruleValidID ) ;
+    // InternalTableDSL.g:24523:1: rule__QualifiedNameInStaticImport__Group__0__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedNameInStaticImport__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25148:1: ( ( ruleValidID ) )
-            // InternalTableDSL.g:25149:1: ( ruleValidID )
+            // InternalTableDSL.g:24527:1: ( ( ruleValidID ) )
+            // InternalTableDSL.g:24528:1: ( ruleValidID )
             {
-            // InternalTableDSL.g:25149:1: ( ruleValidID )
-            // InternalTableDSL.g:25150:2: ruleValidID
+            // InternalTableDSL.g:24528:1: ( ruleValidID )
+            // InternalTableDSL.g:24529:2: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportAccess().getValidIDParserRuleCall_0()); 
@@ -82396,14 +80438,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__1"
-    // InternalTableDSL.g:25159:1: rule__QualifiedNameInStaticImport__Group__1 : rule__QualifiedNameInStaticImport__Group__1__Impl ;
+    // InternalTableDSL.g:24538:1: rule__QualifiedNameInStaticImport__Group__1 : rule__QualifiedNameInStaticImport__Group__1__Impl ;
     public final void rule__QualifiedNameInStaticImport__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25163:1: ( rule__QualifiedNameInStaticImport__Group__1__Impl )
-            // InternalTableDSL.g:25164:2: rule__QualifiedNameInStaticImport__Group__1__Impl
+            // InternalTableDSL.g:24542:1: ( rule__QualifiedNameInStaticImport__Group__1__Impl )
+            // InternalTableDSL.g:24543:2: rule__QualifiedNameInStaticImport__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedNameInStaticImport__Group__1__Impl();
@@ -82429,17 +80471,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__1__Impl"
-    // InternalTableDSL.g:25170:1: rule__QualifiedNameInStaticImport__Group__1__Impl : ( '.' ) ;
+    // InternalTableDSL.g:24549:1: rule__QualifiedNameInStaticImport__Group__1__Impl : ( '.' ) ;
     public final void rule__QualifiedNameInStaticImport__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25174:1: ( ( '.' ) )
-            // InternalTableDSL.g:25175:1: ( '.' )
+            // InternalTableDSL.g:24553:1: ( ( '.' ) )
+            // InternalTableDSL.g:24554:1: ( '.' )
             {
-            // InternalTableDSL.g:25175:1: ( '.' )
-            // InternalTableDSL.g:25176:2: '.'
+            // InternalTableDSL.g:24554:1: ( '.' )
+            // InternalTableDSL.g:24555:2: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportAccess().getFullStopKeyword_1()); 
@@ -82470,39 +80512,36 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableSelection__UnorderedGroup_3"
-    // InternalTableDSL.g:25186:1: rule__TableSelection__UnorderedGroup_3 : ( rule__TableSelection__UnorderedGroup_3__0 )? ;
+    // InternalTableDSL.g:24565:1: rule__TableSelection__UnorderedGroup_3 : ( rule__TableSelection__UnorderedGroup_3__0 )? ;
     public final void rule__TableSelection__UnorderedGroup_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3());
         	
         try {
-            // InternalTableDSL.g:25191:1: ( ( rule__TableSelection__UnorderedGroup_3__0 )? )
-            // InternalTableDSL.g:25192:2: ( rule__TableSelection__UnorderedGroup_3__0 )?
+            // InternalTableDSL.g:24570:1: ( ( rule__TableSelection__UnorderedGroup_3__0 )? )
+            // InternalTableDSL.g:24571:2: ( rule__TableSelection__UnorderedGroup_3__0 )?
             {
-            // InternalTableDSL.g:25192:2: ( rule__TableSelection__UnorderedGroup_3__0 )?
-            int alt175=2;
-            int LA175_0 = input.LA(1);
+            // InternalTableDSL.g:24571:2: ( rule__TableSelection__UnorderedGroup_3__0 )?
+            int alt173=2;
+            int LA173_0 = input.LA(1);
 
-            if ( LA175_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
-                alt175=1;
+            if ( LA173_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
+                alt173=1;
             }
-            else if ( LA175_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
-                alt175=1;
-            }
-            else if ( LA175_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
-                alt175=1;
+            else if ( LA173_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
+                alt173=1;
             }
-            else if ( LA175_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
-                alt175=1;
+            else if ( LA173_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
+                alt173=1;
             }
-            else if ( LA175_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
-                alt175=1;
+            else if ( LA173_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
+                alt173=1;
             }
-            else if ( LA175_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5) ) {
-                alt175=1;
+            else if ( LA173_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
+                alt173=1;
             }
-            switch (alt175) {
+            switch (alt173) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableSelection__UnorderedGroup_3__0
                     {
@@ -82537,69 +80576,66 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableSelection__UnorderedGroup_3__Impl"
-    // InternalTableDSL.g:25200:1: rule__TableSelection__UnorderedGroup_3__Impl : ( ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_3 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_5__0 ) ) ) ) ) ;
+    // InternalTableDSL.g:24579:1: rule__TableSelection__UnorderedGroup_3__Impl : ( ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_4__0 ) ) ) ) ) ;
     public final void rule__TableSelection__UnorderedGroup_3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
         	
         try {
-            // InternalTableDSL.g:25205:1: ( ( ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_3 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_5__0 ) ) ) ) ) )
-            // InternalTableDSL.g:25206:3: ( ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_3 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_5__0 ) ) ) ) )
+            // InternalTableDSL.g:24584:1: ( ( ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_4__0 ) ) ) ) ) )
+            // InternalTableDSL.g:24585:3: ( ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_4__0 ) ) ) ) )
             {
-            // InternalTableDSL.g:25206:3: ( ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_3 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_5__0 ) ) ) ) )
-            int alt176=6;
-            int LA176_0 = input.LA(1);
+            // InternalTableDSL.g:24585:3: ( ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) ) ) ) | ({...}? => ( ( ( rule__TableSelection__Group_3_4__0 ) ) ) ) )
+            int alt174=5;
+            int LA174_0 = input.LA(1);
 
-            if ( LA176_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
-                alt176=1;
+            if ( LA174_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
+                alt174=1;
             }
-            else if ( LA176_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
-                alt176=2;
+            else if ( LA174_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
+                alt174=2;
             }
-            else if ( LA176_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
-                alt176=3;
+            else if ( LA174_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
+                alt174=3;
             }
-            else if ( LA176_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
-                alt176=4;
+            else if ( LA174_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
+                alt174=4;
             }
-            else if ( LA176_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
-                alt176=5;
-            }
-            else if ( LA176_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5) ) {
-                alt176=6;
+            else if ( LA174_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
+                alt174=5;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 176, 0, input);
+                    new NoViableAltException("", 174, 0, input);
 
                 throw nvae;
             }
-            switch (alt176) {
+            switch (alt174) {
                 case 1 :
-                    // InternalTableDSL.g:25207:3: ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) )
+                    // InternalTableDSL.g:24586:3: ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) )
                     {
-                    // InternalTableDSL.g:25207:3: ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) )
-                    // InternalTableDSL.g:25208:4: {...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) )
+                    // InternalTableDSL.g:24586:3: ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) )
+                    // InternalTableDSL.g:24587:4: {...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableSelection__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0)");
                     }
-                    // InternalTableDSL.g:25208:110: ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) )
-                    // InternalTableDSL.g:25209:5: ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) )
+                    // InternalTableDSL.g:24587:110: ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) )
+                    // InternalTableDSL.g:24588:5: ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0);
                     selected = true;
-                    // InternalTableDSL.g:25215:5: ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) )
-                    // InternalTableDSL.g:25216:6: ( rule__TableSelection__SelectalwaysAssignment_3_0 )
+                    // InternalTableDSL.g:24594:5: ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) )
+                    // InternalTableDSL.g:24595:6: ( rule__TableSelection__SelectalwaysAssignment_3_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableSelectionAccess().getSelectalwaysAssignment_3_0()); 
                     }
-                    // InternalTableDSL.g:25217:6: ( rule__TableSelection__SelectalwaysAssignment_3_0 )
-                    // InternalTableDSL.g:25217:7: rule__TableSelection__SelectalwaysAssignment_3_0
+                    // InternalTableDSL.g:24596:6: ( rule__TableSelection__SelectalwaysAssignment_3_0 )
+                    // InternalTableDSL.g:24596:7: rule__TableSelection__SelectalwaysAssignment_3_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableSelection__SelectalwaysAssignment_3_0();
@@ -82625,28 +80661,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:25222:3: ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) )
+                    // InternalTableDSL.g:24601:3: ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) )
                     {
-                    // InternalTableDSL.g:25222:3: ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) )
-                    // InternalTableDSL.g:25223:4: {...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) )
+                    // InternalTableDSL.g:24601:3: ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) )
+                    // InternalTableDSL.g:24602:4: {...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableSelection__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1)");
                     }
-                    // InternalTableDSL.g:25223:110: ( ( ( rule__TableSelection__Group_3_1__0 ) ) )
-                    // InternalTableDSL.g:25224:5: ( ( rule__TableSelection__Group_3_1__0 ) )
+                    // InternalTableDSL.g:24602:110: ( ( ( rule__TableSelection__Group_3_1__0 ) ) )
+                    // InternalTableDSL.g:24603:5: ( ( rule__TableSelection__Group_3_1__0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1);
                     selected = true;
-                    // InternalTableDSL.g:25230:5: ( ( rule__TableSelection__Group_3_1__0 ) )
-                    // InternalTableDSL.g:25231:6: ( rule__TableSelection__Group_3_1__0 )
+                    // InternalTableDSL.g:24609:5: ( ( rule__TableSelection__Group_3_1__0 ) )
+                    // InternalTableDSL.g:24610:6: ( rule__TableSelection__Group_3_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableSelectionAccess().getGroup_3_1()); 
                     }
-                    // InternalTableDSL.g:25232:6: ( rule__TableSelection__Group_3_1__0 )
-                    // InternalTableDSL.g:25232:7: rule__TableSelection__Group_3_1__0
+                    // InternalTableDSL.g:24611:6: ( rule__TableSelection__Group_3_1__0 )
+                    // InternalTableDSL.g:24611:7: rule__TableSelection__Group_3_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableSelection__Group_3_1__0();
@@ -82672,31 +80708,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:25237:3: ({...}? => ( ( ( rule__TableSelection__Group_3_2__0 ) ) ) )
+                    // InternalTableDSL.g:24616:3: ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_2 ) ) ) )
                     {
-                    // InternalTableDSL.g:25237:3: ({...}? => ( ( ( rule__TableSelection__Group_3_2__0 ) ) ) )
-                    // InternalTableDSL.g:25238:4: {...}? => ( ( ( rule__TableSelection__Group_3_2__0 ) ) )
+                    // InternalTableDSL.g:24616:3: ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_2 ) ) ) )
+                    // InternalTableDSL.g:24617:4: {...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_2 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableSelection__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2)");
                     }
-                    // InternalTableDSL.g:25238:110: ( ( ( rule__TableSelection__Group_3_2__0 ) ) )
-                    // InternalTableDSL.g:25239:5: ( ( rule__TableSelection__Group_3_2__0 ) )
+                    // InternalTableDSL.g:24617:110: ( ( ( rule__TableSelection__FilteringAssignment_3_2 ) ) )
+                    // InternalTableDSL.g:24618:5: ( ( rule__TableSelection__FilteringAssignment_3_2 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2);
                     selected = true;
-                    // InternalTableDSL.g:25245:5: ( ( rule__TableSelection__Group_3_2__0 ) )
-                    // InternalTableDSL.g:25246:6: ( rule__TableSelection__Group_3_2__0 )
+                    // InternalTableDSL.g:24624:5: ( ( rule__TableSelection__FilteringAssignment_3_2 ) )
+                    // InternalTableDSL.g:24625:6: ( rule__TableSelection__FilteringAssignment_3_2 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableSelectionAccess().getGroup_3_2()); 
+                       before(grammarAccess.getTableSelectionAccess().getFilteringAssignment_3_2()); 
                     }
-                    // InternalTableDSL.g:25247:6: ( rule__TableSelection__Group_3_2__0 )
-                    // InternalTableDSL.g:25247:7: rule__TableSelection__Group_3_2__0
+                    // InternalTableDSL.g:24626:6: ( rule__TableSelection__FilteringAssignment_3_2 )
+                    // InternalTableDSL.g:24626:7: rule__TableSelection__FilteringAssignment_3_2
                     {
                     pushFollow(FOLLOW_2);
-                    rule__TableSelection__Group_3_2__0();
+                    rule__TableSelection__FilteringAssignment_3_2();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -82704,7 +80740,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableSelectionAccess().getGroup_3_2()); 
+                       after(grammarAccess.getTableSelectionAccess().getFilteringAssignment_3_2()); 
                     }
 
                     }
@@ -82719,31 +80755,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:25252:3: ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_3 ) ) ) )
+                    // InternalTableDSL.g:24631:3: ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) ) ) )
                     {
-                    // InternalTableDSL.g:25252:3: ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_3 ) ) ) )
-                    // InternalTableDSL.g:25253:4: {...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_3 ) ) )
+                    // InternalTableDSL.g:24631:3: ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) ) ) )
+                    // InternalTableDSL.g:24632:4: {...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableSelection__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3)");
                     }
-                    // InternalTableDSL.g:25253:110: ( ( ( rule__TableSelection__FilteringAssignment_3_3 ) ) )
-                    // InternalTableDSL.g:25254:5: ( ( rule__TableSelection__FilteringAssignment_3_3 ) )
+                    // InternalTableDSL.g:24632:110: ( ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) ) )
+                    // InternalTableDSL.g:24633:5: ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3);
                     selected = true;
-                    // InternalTableDSL.g:25260:5: ( ( rule__TableSelection__FilteringAssignment_3_3 ) )
-                    // InternalTableDSL.g:25261:6: ( rule__TableSelection__FilteringAssignment_3_3 )
+                    // InternalTableDSL.g:24639:5: ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) )
+                    // InternalTableDSL.g:24640:6: ( rule__TableSelection__EmbeddedAssignment_3_3 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableSelectionAccess().getFilteringAssignment_3_3()); 
+                       before(grammarAccess.getTableSelectionAccess().getEmbeddedAssignment_3_3()); 
                     }
-                    // InternalTableDSL.g:25262:6: ( rule__TableSelection__FilteringAssignment_3_3 )
-                    // InternalTableDSL.g:25262:7: rule__TableSelection__FilteringAssignment_3_3
+                    // InternalTableDSL.g:24641:6: ( rule__TableSelection__EmbeddedAssignment_3_3 )
+                    // InternalTableDSL.g:24641:7: rule__TableSelection__EmbeddedAssignment_3_3
                     {
                     pushFollow(FOLLOW_2);
-                    rule__TableSelection__FilteringAssignment_3_3();
+                    rule__TableSelection__EmbeddedAssignment_3_3();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -82751,7 +80787,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableSelectionAccess().getFilteringAssignment_3_3()); 
+                       after(grammarAccess.getTableSelectionAccess().getEmbeddedAssignment_3_3()); 
                     }
 
                     }
@@ -82766,78 +80802,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:25267:3: ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) ) ) )
+                    // InternalTableDSL.g:24646:3: ({...}? => ( ( ( rule__TableSelection__Group_3_4__0 ) ) ) )
                     {
-                    // InternalTableDSL.g:25267:3: ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) ) ) )
-                    // InternalTableDSL.g:25268:4: {...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) ) )
+                    // InternalTableDSL.g:24646:3: ({...}? => ( ( ( rule__TableSelection__Group_3_4__0 ) ) ) )
+                    // InternalTableDSL.g:24647:4: {...}? => ( ( ( rule__TableSelection__Group_3_4__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableSelection__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4)");
                     }
-                    // InternalTableDSL.g:25268:110: ( ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) ) )
-                    // InternalTableDSL.g:25269:5: ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) )
+                    // InternalTableDSL.g:24647:110: ( ( ( rule__TableSelection__Group_3_4__0 ) ) )
+                    // InternalTableDSL.g:24648:5: ( ( rule__TableSelection__Group_3_4__0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4);
                     selected = true;
-                    // InternalTableDSL.g:25275:5: ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) )
-                    // InternalTableDSL.g:25276:6: ( rule__TableSelection__EmbeddedAssignment_3_4 )
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableSelectionAccess().getEmbeddedAssignment_3_4()); 
-                    }
-                    // InternalTableDSL.g:25277:6: ( rule__TableSelection__EmbeddedAssignment_3_4 )
-                    // InternalTableDSL.g:25277:7: rule__TableSelection__EmbeddedAssignment_3_4
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableSelection__EmbeddedAssignment_3_4();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableSelectionAccess().getEmbeddedAssignment_3_4()); 
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 6 :
-                    // InternalTableDSL.g:25282:3: ({...}? => ( ( ( rule__TableSelection__Group_3_5__0 ) ) ) )
-                    {
-                    // InternalTableDSL.g:25282:3: ({...}? => ( ( ( rule__TableSelection__Group_3_5__0 ) ) ) )
-                    // InternalTableDSL.g:25283:4: {...}? => ( ( ( rule__TableSelection__Group_3_5__0 ) ) )
-                    {
-                    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
-                        throw new FailedPredicateException(input, "rule__TableSelection__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5)");
-                    }
-                    // InternalTableDSL.g:25283:110: ( ( ( rule__TableSelection__Group_3_5__0 ) ) )
-                    // InternalTableDSL.g:25284:5: ( ( rule__TableSelection__Group_3_5__0 ) )
-                    {
-                    getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5);
-                    selected = true;
-                    // InternalTableDSL.g:25290:5: ( ( rule__TableSelection__Group_3_5__0 ) )
-                    // InternalTableDSL.g:25291:6: ( rule__TableSelection__Group_3_5__0 )
+                    // InternalTableDSL.g:24654:5: ( ( rule__TableSelection__Group_3_4__0 ) )
+                    // InternalTableDSL.g:24655:6: ( rule__TableSelection__Group_3_4__0 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableSelectionAccess().getGroup_3_5()); 
+                       before(grammarAccess.getTableSelectionAccess().getGroup_3_4()); 
                     }
-                    // InternalTableDSL.g:25292:6: ( rule__TableSelection__Group_3_5__0 )
-                    // InternalTableDSL.g:25292:7: rule__TableSelection__Group_3_5__0
+                    // InternalTableDSL.g:24656:6: ( rule__TableSelection__Group_3_4__0 )
+                    // InternalTableDSL.g:24656:7: rule__TableSelection__Group_3_4__0
                     {
                     pushFollow(FOLLOW_2);
-                    rule__TableSelection__Group_3_5__0();
+                    rule__TableSelection__Group_3_4__0();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -82845,7 +80834,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableSelectionAccess().getGroup_3_5()); 
+                       after(grammarAccess.getTableSelectionAccess().getGroup_3_4()); 
                     }
 
                     }
@@ -82883,43 +80872,40 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableSelection__UnorderedGroup_3__0"
-    // InternalTableDSL.g:25305:1: rule__TableSelection__UnorderedGroup_3__0 : rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__1 )? ;
+    // InternalTableDSL.g:24669:1: rule__TableSelection__UnorderedGroup_3__0 : rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__1 )? ;
     public final void rule__TableSelection__UnorderedGroup_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25309:1: ( rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__1 )? )
-            // InternalTableDSL.g:25310:2: rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__1 )?
+            // InternalTableDSL.g:24673:1: ( rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__1 )? )
+            // InternalTableDSL.g:24674:2: rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__1 )?
             {
-            pushFollow(FOLLOW_183);
+            pushFollow(FOLLOW_182);
             rule__TableSelection__UnorderedGroup_3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:25311:2: ( rule__TableSelection__UnorderedGroup_3__1 )?
-            int alt177=2;
-            int LA177_0 = input.LA(1);
+            // InternalTableDSL.g:24675:2: ( rule__TableSelection__UnorderedGroup_3__1 )?
+            int alt175=2;
+            int LA175_0 = input.LA(1);
 
-            if ( LA177_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
-                alt177=1;
-            }
-            else if ( LA177_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
-                alt177=1;
+            if ( LA175_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
+                alt175=1;
             }
-            else if ( LA177_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
-                alt177=1;
+            else if ( LA175_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
+                alt175=1;
             }
-            else if ( LA177_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
-                alt177=1;
+            else if ( LA175_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
+                alt175=1;
             }
-            else if ( LA177_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
-                alt177=1;
+            else if ( LA175_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
+                alt175=1;
             }
-            else if ( LA177_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5) ) {
-                alt177=1;
+            else if ( LA175_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
+                alt175=1;
             }
-            switch (alt177) {
+            switch (alt175) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableSelection__UnorderedGroup_3__1
                     {
@@ -82953,43 +80939,40 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableSelection__UnorderedGroup_3__1"
-    // InternalTableDSL.g:25317:1: rule__TableSelection__UnorderedGroup_3__1 : rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__2 )? ;
+    // InternalTableDSL.g:24681:1: rule__TableSelection__UnorderedGroup_3__1 : rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__2 )? ;
     public final void rule__TableSelection__UnorderedGroup_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25321:1: ( rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__2 )? )
-            // InternalTableDSL.g:25322:2: rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__2 )?
+            // InternalTableDSL.g:24685:1: ( rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__2 )? )
+            // InternalTableDSL.g:24686:2: rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__2 )?
             {
-            pushFollow(FOLLOW_183);
+            pushFollow(FOLLOW_182);
             rule__TableSelection__UnorderedGroup_3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:25323:2: ( rule__TableSelection__UnorderedGroup_3__2 )?
-            int alt178=2;
-            int LA178_0 = input.LA(1);
+            // InternalTableDSL.g:24687:2: ( rule__TableSelection__UnorderedGroup_3__2 )?
+            int alt176=2;
+            int LA176_0 = input.LA(1);
 
-            if ( LA178_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
-                alt178=1;
-            }
-            else if ( LA178_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
-                alt178=1;
+            if ( LA176_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
+                alt176=1;
             }
-            else if ( LA178_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
-                alt178=1;
+            else if ( LA176_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
+                alt176=1;
             }
-            else if ( LA178_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
-                alt178=1;
+            else if ( LA176_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
+                alt176=1;
             }
-            else if ( LA178_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
-                alt178=1;
+            else if ( LA176_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
+                alt176=1;
             }
-            else if ( LA178_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5) ) {
-                alt178=1;
+            else if ( LA176_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
+                alt176=1;
             }
-            switch (alt178) {
+            switch (alt176) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableSelection__UnorderedGroup_3__2
                     {
@@ -83023,43 +81006,40 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableSelection__UnorderedGroup_3__2"
-    // InternalTableDSL.g:25329:1: rule__TableSelection__UnorderedGroup_3__2 : rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__3 )? ;
+    // InternalTableDSL.g:24693:1: rule__TableSelection__UnorderedGroup_3__2 : rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__3 )? ;
     public final void rule__TableSelection__UnorderedGroup_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25333:1: ( rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__3 )? )
-            // InternalTableDSL.g:25334:2: rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__3 )?
+            // InternalTableDSL.g:24697:1: ( rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__3 )? )
+            // InternalTableDSL.g:24698:2: rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__3 )?
             {
-            pushFollow(FOLLOW_183);
+            pushFollow(FOLLOW_182);
             rule__TableSelection__UnorderedGroup_3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:25335:2: ( rule__TableSelection__UnorderedGroup_3__3 )?
-            int alt179=2;
-            int LA179_0 = input.LA(1);
+            // InternalTableDSL.g:24699:2: ( rule__TableSelection__UnorderedGroup_3__3 )?
+            int alt177=2;
+            int LA177_0 = input.LA(1);
 
-            if ( LA179_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
-                alt179=1;
-            }
-            else if ( LA179_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
-                alt179=1;
+            if ( LA177_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
+                alt177=1;
             }
-            else if ( LA179_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
-                alt179=1;
+            else if ( LA177_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
+                alt177=1;
             }
-            else if ( LA179_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
-                alt179=1;
+            else if ( LA177_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
+                alt177=1;
             }
-            else if ( LA179_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
-                alt179=1;
+            else if ( LA177_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
+                alt177=1;
             }
-            else if ( LA179_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5) ) {
-                alt179=1;
+            else if ( LA177_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
+                alt177=1;
             }
-            switch (alt179) {
+            switch (alt177) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableSelection__UnorderedGroup_3__3
                     {
@@ -83093,43 +81073,40 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableSelection__UnorderedGroup_3__3"
-    // InternalTableDSL.g:25341:1: rule__TableSelection__UnorderedGroup_3__3 : rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__4 )? ;
+    // InternalTableDSL.g:24705:1: rule__TableSelection__UnorderedGroup_3__3 : rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__4 )? ;
     public final void rule__TableSelection__UnorderedGroup_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25345:1: ( rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__4 )? )
-            // InternalTableDSL.g:25346:2: rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__4 )?
+            // InternalTableDSL.g:24709:1: ( rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__4 )? )
+            // InternalTableDSL.g:24710:2: rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__4 )?
             {
-            pushFollow(FOLLOW_183);
+            pushFollow(FOLLOW_182);
             rule__TableSelection__UnorderedGroup_3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:25347:2: ( rule__TableSelection__UnorderedGroup_3__4 )?
-            int alt180=2;
-            int LA180_0 = input.LA(1);
+            // InternalTableDSL.g:24711:2: ( rule__TableSelection__UnorderedGroup_3__4 )?
+            int alt178=2;
+            int LA178_0 = input.LA(1);
 
-            if ( LA180_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
-                alt180=1;
-            }
-            else if ( LA180_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
-                alt180=1;
+            if ( LA178_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
+                alt178=1;
             }
-            else if ( LA180_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
-                alt180=1;
+            else if ( LA178_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
+                alt178=1;
             }
-            else if ( LA180_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
-                alt180=1;
+            else if ( LA178_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
+                alt178=1;
             }
-            else if ( LA180_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
-                alt180=1;
+            else if ( LA178_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
+                alt178=1;
             }
-            else if ( LA180_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5) ) {
-                alt180=1;
+            else if ( LA178_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
+                alt178=1;
             }
-            switch (alt180) {
+            switch (alt178) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableSelection__UnorderedGroup_3__4
                     {
@@ -83163,84 +81140,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableSelection__UnorderedGroup_3__4"
-    // InternalTableDSL.g:25353:1: rule__TableSelection__UnorderedGroup_3__4 : rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__5 )? ;
+    // InternalTableDSL.g:24717:1: rule__TableSelection__UnorderedGroup_3__4 : rule__TableSelection__UnorderedGroup_3__Impl ;
     public final void rule__TableSelection__UnorderedGroup_3__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25357:1: ( rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__5 )? )
-            // InternalTableDSL.g:25358:2: rule__TableSelection__UnorderedGroup_3__Impl ( rule__TableSelection__UnorderedGroup_3__5 )?
-            {
-            pushFollow(FOLLOW_183);
-            rule__TableSelection__UnorderedGroup_3__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            // InternalTableDSL.g:25359:2: ( rule__TableSelection__UnorderedGroup_3__5 )?
-            int alt181=2;
-            int LA181_0 = input.LA(1);
-
-            if ( LA181_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
-                alt181=1;
-            }
-            else if ( LA181_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
-                alt181=1;
-            }
-            else if ( LA181_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
-                alt181=1;
-            }
-            else if ( LA181_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
-                alt181=1;
-            }
-            else if ( LA181_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
-                alt181=1;
-            }
-            else if ( LA181_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5) ) {
-                alt181=1;
-            }
-            switch (alt181) {
-                case 1 :
-                    // InternalTableDSL.g:0:0: rule__TableSelection__UnorderedGroup_3__5
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableSelection__UnorderedGroup_3__5();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableSelection__UnorderedGroup_3__4"
-
-
-    // $ANTLR start "rule__TableSelection__UnorderedGroup_3__5"
-    // InternalTableDSL.g:25365:1: rule__TableSelection__UnorderedGroup_3__5 : rule__TableSelection__UnorderedGroup_3__Impl ;
-    public final void rule__TableSelection__UnorderedGroup_3__5() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:25369:1: ( rule__TableSelection__UnorderedGroup_3__Impl )
-            // InternalTableDSL.g:25370:2: rule__TableSelection__UnorderedGroup_3__Impl
+            // InternalTableDSL.g:24721:1: ( rule__TableSelection__UnorderedGroup_3__Impl )
+            // InternalTableDSL.g:24722:2: rule__TableSelection__UnorderedGroup_3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableSelection__UnorderedGroup_3__Impl();
@@ -83262,46 +81169,43 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableSelection__UnorderedGroup_3__5"
+    // $ANTLR end "rule__TableSelection__UnorderedGroup_3__4"
 
 
     // $ANTLR start "rule__TableTable__UnorderedGroup_2"
-    // InternalTableDSL.g:25377:1: rule__TableTable__UnorderedGroup_2 : ( rule__TableTable__UnorderedGroup_2__0 )? ;
+    // InternalTableDSL.g:24729:1: rule__TableTable__UnorderedGroup_2 : ( rule__TableTable__UnorderedGroup_2__0 )? ;
     public final void rule__TableTable__UnorderedGroup_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getTableTableAccess().getUnorderedGroup_2());
         	
         try {
-            // InternalTableDSL.g:25382:1: ( ( rule__TableTable__UnorderedGroup_2__0 )? )
-            // InternalTableDSL.g:25383:2: ( rule__TableTable__UnorderedGroup_2__0 )?
+            // InternalTableDSL.g:24734:1: ( ( rule__TableTable__UnorderedGroup_2__0 )? )
+            // InternalTableDSL.g:24735:2: ( rule__TableTable__UnorderedGroup_2__0 )?
             {
-            // InternalTableDSL.g:25383:2: ( rule__TableTable__UnorderedGroup_2__0 )?
-            int alt182=2;
-            int LA182_0 = input.LA(1);
+            // InternalTableDSL.g:24735:2: ( rule__TableTable__UnorderedGroup_2__0 )?
+            int alt179=2;
+            int LA179_0 = input.LA(1);
 
-            if ( LA182_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
-                alt182=1;
-            }
-            else if ( LA182_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
-                alt182=1;
+            if ( LA179_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
+                alt179=1;
             }
-            else if ( LA182_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
-                alt182=1;
+            else if ( LA179_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
+                alt179=1;
             }
-            else if ( LA182_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
-                alt182=1;
+            else if ( LA179_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
+                alt179=1;
             }
-            else if ( LA182_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
-                alt182=1;
+            else if ( LA179_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
+                alt179=1;
             }
-            else if ( LA182_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
-                alt182=1;
+            else if ( LA179_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
+                alt179=1;
             }
-            else if ( LA182_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6) ) {
-                alt182=1;
+            else if ( LA179_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
+                alt179=1;
             }
-            switch (alt182) {
+            switch (alt179) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableTable__UnorderedGroup_2__0
                     {
@@ -83336,72 +81240,69 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__UnorderedGroup_2__Impl"
-    // InternalTableDSL.g:25391:1: rule__TableTable__UnorderedGroup_2__Impl : ( ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_4 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_5 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_6__0 ) ) ) ) ) ;
+    // InternalTableDSL.g:24743:1: rule__TableTable__UnorderedGroup_2__Impl : ( ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_3 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_4 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_5__0 ) ) ) ) ) ;
     public final void rule__TableTable__UnorderedGroup_2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
         	
         try {
-            // InternalTableDSL.g:25396:1: ( ( ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_4 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_5 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_6__0 ) ) ) ) ) )
-            // InternalTableDSL.g:25397:3: ( ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_4 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_5 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_6__0 ) ) ) ) )
+            // InternalTableDSL.g:24748:1: ( ( ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_3 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_4 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_5__0 ) ) ) ) ) )
+            // InternalTableDSL.g:24749:3: ( ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_3 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_4 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_5__0 ) ) ) ) )
             {
-            // InternalTableDSL.g:25397:3: ( ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_4 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_5 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_6__0 ) ) ) ) )
-            int alt183=7;
-            int LA183_0 = input.LA(1);
+            // InternalTableDSL.g:24749:3: ( ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_3 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_4 ) ) ) ) | ({...}? => ( ( ( rule__TableTable__Group_2_5__0 ) ) ) ) )
+            int alt180=6;
+            int LA180_0 = input.LA(1);
 
-            if ( LA183_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
-                alt183=1;
-            }
-            else if ( LA183_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
-                alt183=2;
+            if ( LA180_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
+                alt180=1;
             }
-            else if ( LA183_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
-                alt183=3;
+            else if ( LA180_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
+                alt180=2;
             }
-            else if ( LA183_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
-                alt183=4;
+            else if ( LA180_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
+                alt180=3;
             }
-            else if ( LA183_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
-                alt183=5;
+            else if ( LA180_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
+                alt180=4;
             }
-            else if ( LA183_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
-                alt183=6;
+            else if ( LA180_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
+                alt180=5;
             }
-            else if ( LA183_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6) ) {
-                alt183=7;
+            else if ( LA180_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
+                alt180=6;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 183, 0, input);
+                    new NoViableAltException("", 180, 0, input);
 
                 throw nvae;
             }
-            switch (alt183) {
+            switch (alt180) {
                 case 1 :
-                    // InternalTableDSL.g:25398:3: ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) )
+                    // InternalTableDSL.g:24750:3: ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) )
                     {
-                    // InternalTableDSL.g:25398:3: ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) )
-                    // InternalTableDSL.g:25399:4: {...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) )
+                    // InternalTableDSL.g:24750:3: ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) )
+                    // InternalTableDSL.g:24751:4: {...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableTable__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0)");
                     }
-                    // InternalTableDSL.g:25399:106: ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) )
-                    // InternalTableDSL.g:25400:5: ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) )
+                    // InternalTableDSL.g:24751:106: ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) )
+                    // InternalTableDSL.g:24752:5: ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0);
                     selected = true;
-                    // InternalTableDSL.g:25406:5: ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) )
-                    // InternalTableDSL.g:25407:6: ( rule__TableTable__SelectalwaysAssignment_2_0 )
+                    // InternalTableDSL.g:24758:5: ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) )
+                    // InternalTableDSL.g:24759:6: ( rule__TableTable__SelectalwaysAssignment_2_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableTableAccess().getSelectalwaysAssignment_2_0()); 
                     }
-                    // InternalTableDSL.g:25408:6: ( rule__TableTable__SelectalwaysAssignment_2_0 )
-                    // InternalTableDSL.g:25408:7: rule__TableTable__SelectalwaysAssignment_2_0
+                    // InternalTableDSL.g:24760:6: ( rule__TableTable__SelectalwaysAssignment_2_0 )
+                    // InternalTableDSL.g:24760:7: rule__TableTable__SelectalwaysAssignment_2_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableTable__SelectalwaysAssignment_2_0();
@@ -83427,28 +81328,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:25413:3: ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) )
+                    // InternalTableDSL.g:24765:3: ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) )
                     {
-                    // InternalTableDSL.g:25413:3: ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) )
-                    // InternalTableDSL.g:25414:4: {...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) )
+                    // InternalTableDSL.g:24765:3: ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) )
+                    // InternalTableDSL.g:24766:4: {...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableTable__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1)");
                     }
-                    // InternalTableDSL.g:25414:106: ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) )
-                    // InternalTableDSL.g:25415:5: ( ( rule__TableTable__SelectByIdAssignment_2_1 ) )
+                    // InternalTableDSL.g:24766:106: ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) )
+                    // InternalTableDSL.g:24767:5: ( ( rule__TableTable__SelectByIdAssignment_2_1 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1);
                     selected = true;
-                    // InternalTableDSL.g:25421:5: ( ( rule__TableTable__SelectByIdAssignment_2_1 ) )
-                    // InternalTableDSL.g:25422:6: ( rule__TableTable__SelectByIdAssignment_2_1 )
+                    // InternalTableDSL.g:24773:5: ( ( rule__TableTable__SelectByIdAssignment_2_1 ) )
+                    // InternalTableDSL.g:24774:6: ( rule__TableTable__SelectByIdAssignment_2_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableTableAccess().getSelectByIdAssignment_2_1()); 
                     }
-                    // InternalTableDSL.g:25423:6: ( rule__TableTable__SelectByIdAssignment_2_1 )
-                    // InternalTableDSL.g:25423:7: rule__TableTable__SelectByIdAssignment_2_1
+                    // InternalTableDSL.g:24775:6: ( rule__TableTable__SelectByIdAssignment_2_1 )
+                    // InternalTableDSL.g:24775:7: rule__TableTable__SelectByIdAssignment_2_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableTable__SelectByIdAssignment_2_1();
@@ -83474,28 +81375,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:25428:3: ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) )
+                    // InternalTableDSL.g:24780:3: ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) )
                     {
-                    // InternalTableDSL.g:25428:3: ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) )
-                    // InternalTableDSL.g:25429:4: {...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) )
+                    // InternalTableDSL.g:24780:3: ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) )
+                    // InternalTableDSL.g:24781:4: {...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableTable__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2)");
                     }
-                    // InternalTableDSL.g:25429:106: ( ( ( rule__TableTable__Group_2_2__0 ) ) )
-                    // InternalTableDSL.g:25430:5: ( ( rule__TableTable__Group_2_2__0 ) )
+                    // InternalTableDSL.g:24781:106: ( ( ( rule__TableTable__Group_2_2__0 ) ) )
+                    // InternalTableDSL.g:24782:5: ( ( rule__TableTable__Group_2_2__0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2);
                     selected = true;
-                    // InternalTableDSL.g:25436:5: ( ( rule__TableTable__Group_2_2__0 ) )
-                    // InternalTableDSL.g:25437:6: ( rule__TableTable__Group_2_2__0 )
+                    // InternalTableDSL.g:24788:5: ( ( rule__TableTable__Group_2_2__0 ) )
+                    // InternalTableDSL.g:24789:6: ( rule__TableTable__Group_2_2__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableTableAccess().getGroup_2_2()); 
                     }
-                    // InternalTableDSL.g:25438:6: ( rule__TableTable__Group_2_2__0 )
-                    // InternalTableDSL.g:25438:7: rule__TableTable__Group_2_2__0
+                    // InternalTableDSL.g:24790:6: ( rule__TableTable__Group_2_2__0 )
+                    // InternalTableDSL.g:24790:7: rule__TableTable__Group_2_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableTable__Group_2_2__0();
@@ -83521,31 +81422,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:25443:3: ({...}? => ( ( ( rule__TableTable__Group_2_3__0 ) ) ) )
+                    // InternalTableDSL.g:24795:3: ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_3 ) ) ) )
                     {
-                    // InternalTableDSL.g:25443:3: ({...}? => ( ( ( rule__TableTable__Group_2_3__0 ) ) ) )
-                    // InternalTableDSL.g:25444:4: {...}? => ( ( ( rule__TableTable__Group_2_3__0 ) ) )
+                    // InternalTableDSL.g:24795:3: ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_3 ) ) ) )
+                    // InternalTableDSL.g:24796:4: {...}? => ( ( ( rule__TableTable__FilteringAssignment_2_3 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableTable__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3)");
                     }
-                    // InternalTableDSL.g:25444:106: ( ( ( rule__TableTable__Group_2_3__0 ) ) )
-                    // InternalTableDSL.g:25445:5: ( ( rule__TableTable__Group_2_3__0 ) )
+                    // InternalTableDSL.g:24796:106: ( ( ( rule__TableTable__FilteringAssignment_2_3 ) ) )
+                    // InternalTableDSL.g:24797:5: ( ( rule__TableTable__FilteringAssignment_2_3 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3);
                     selected = true;
-                    // InternalTableDSL.g:25451:5: ( ( rule__TableTable__Group_2_3__0 ) )
-                    // InternalTableDSL.g:25452:6: ( rule__TableTable__Group_2_3__0 )
+                    // InternalTableDSL.g:24803:5: ( ( rule__TableTable__FilteringAssignment_2_3 ) )
+                    // InternalTableDSL.g:24804:6: ( rule__TableTable__FilteringAssignment_2_3 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableTableAccess().getGroup_2_3()); 
+                       before(grammarAccess.getTableTableAccess().getFilteringAssignment_2_3()); 
                     }
-                    // InternalTableDSL.g:25453:6: ( rule__TableTable__Group_2_3__0 )
-                    // InternalTableDSL.g:25453:7: rule__TableTable__Group_2_3__0
+                    // InternalTableDSL.g:24805:6: ( rule__TableTable__FilteringAssignment_2_3 )
+                    // InternalTableDSL.g:24805:7: rule__TableTable__FilteringAssignment_2_3
                     {
                     pushFollow(FOLLOW_2);
-                    rule__TableTable__Group_2_3__0();
+                    rule__TableTable__FilteringAssignment_2_3();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -83553,7 +81454,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableTableAccess().getGroup_2_3()); 
+                       after(grammarAccess.getTableTableAccess().getFilteringAssignment_2_3()); 
                     }
 
                     }
@@ -83568,31 +81469,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:25458:3: ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_4 ) ) ) )
+                    // InternalTableDSL.g:24810:3: ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_4 ) ) ) )
                     {
-                    // InternalTableDSL.g:25458:3: ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_4 ) ) ) )
-                    // InternalTableDSL.g:25459:4: {...}? => ( ( ( rule__TableTable__FilteringAssignment_2_4 ) ) )
+                    // InternalTableDSL.g:24810:3: ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_4 ) ) ) )
+                    // InternalTableDSL.g:24811:4: {...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_4 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableTable__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4)");
                     }
-                    // InternalTableDSL.g:25459:106: ( ( ( rule__TableTable__FilteringAssignment_2_4 ) ) )
-                    // InternalTableDSL.g:25460:5: ( ( rule__TableTable__FilteringAssignment_2_4 ) )
+                    // InternalTableDSL.g:24811:106: ( ( ( rule__TableTable__EmbeddedAssignment_2_4 ) ) )
+                    // InternalTableDSL.g:24812:5: ( ( rule__TableTable__EmbeddedAssignment_2_4 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4);
                     selected = true;
-                    // InternalTableDSL.g:25466:5: ( ( rule__TableTable__FilteringAssignment_2_4 ) )
-                    // InternalTableDSL.g:25467:6: ( rule__TableTable__FilteringAssignment_2_4 )
+                    // InternalTableDSL.g:24818:5: ( ( rule__TableTable__EmbeddedAssignment_2_4 ) )
+                    // InternalTableDSL.g:24819:6: ( rule__TableTable__EmbeddedAssignment_2_4 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableTableAccess().getFilteringAssignment_2_4()); 
+                       before(grammarAccess.getTableTableAccess().getEmbeddedAssignment_2_4()); 
                     }
-                    // InternalTableDSL.g:25468:6: ( rule__TableTable__FilteringAssignment_2_4 )
-                    // InternalTableDSL.g:25468:7: rule__TableTable__FilteringAssignment_2_4
+                    // InternalTableDSL.g:24820:6: ( rule__TableTable__EmbeddedAssignment_2_4 )
+                    // InternalTableDSL.g:24820:7: rule__TableTable__EmbeddedAssignment_2_4
                     {
                     pushFollow(FOLLOW_2);
-                    rule__TableTable__FilteringAssignment_2_4();
+                    rule__TableTable__EmbeddedAssignment_2_4();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -83600,7 +81501,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableTableAccess().getFilteringAssignment_2_4()); 
+                       after(grammarAccess.getTableTableAccess().getEmbeddedAssignment_2_4()); 
                     }
 
                     }
@@ -83615,31 +81516,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 6 :
-                    // InternalTableDSL.g:25473:3: ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_5 ) ) ) )
+                    // InternalTableDSL.g:24825:3: ({...}? => ( ( ( rule__TableTable__Group_2_5__0 ) ) ) )
                     {
-                    // InternalTableDSL.g:25473:3: ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_5 ) ) ) )
-                    // InternalTableDSL.g:25474:4: {...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_5 ) ) )
+                    // InternalTableDSL.g:24825:3: ({...}? => ( ( ( rule__TableTable__Group_2_5__0 ) ) ) )
+                    // InternalTableDSL.g:24826:4: {...}? => ( ( ( rule__TableTable__Group_2_5__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableTable__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5)");
                     }
-                    // InternalTableDSL.g:25474:106: ( ( ( rule__TableTable__EmbeddedAssignment_2_5 ) ) )
-                    // InternalTableDSL.g:25475:5: ( ( rule__TableTable__EmbeddedAssignment_2_5 ) )
+                    // InternalTableDSL.g:24826:106: ( ( ( rule__TableTable__Group_2_5__0 ) ) )
+                    // InternalTableDSL.g:24827:5: ( ( rule__TableTable__Group_2_5__0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5);
                     selected = true;
-                    // InternalTableDSL.g:25481:5: ( ( rule__TableTable__EmbeddedAssignment_2_5 ) )
-                    // InternalTableDSL.g:25482:6: ( rule__TableTable__EmbeddedAssignment_2_5 )
+                    // InternalTableDSL.g:24833:5: ( ( rule__TableTable__Group_2_5__0 ) )
+                    // InternalTableDSL.g:24834:6: ( rule__TableTable__Group_2_5__0 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableTableAccess().getEmbeddedAssignment_2_5()); 
+                       before(grammarAccess.getTableTableAccess().getGroup_2_5()); 
                     }
-                    // InternalTableDSL.g:25483:6: ( rule__TableTable__EmbeddedAssignment_2_5 )
-                    // InternalTableDSL.g:25483:7: rule__TableTable__EmbeddedAssignment_2_5
+                    // InternalTableDSL.g:24835:6: ( rule__TableTable__Group_2_5__0 )
+                    // InternalTableDSL.g:24835:7: rule__TableTable__Group_2_5__0
                     {
                     pushFollow(FOLLOW_2);
-                    rule__TableTable__EmbeddedAssignment_2_5();
+                    rule__TableTable__Group_2_5__0();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -83647,54 +81548,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableTableAccess().getEmbeddedAssignment_2_5()); 
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 7 :
-                    // InternalTableDSL.g:25488:3: ({...}? => ( ( ( rule__TableTable__Group_2_6__0 ) ) ) )
-                    {
-                    // InternalTableDSL.g:25488:3: ({...}? => ( ( ( rule__TableTable__Group_2_6__0 ) ) ) )
-                    // InternalTableDSL.g:25489:4: {...}? => ( ( ( rule__TableTable__Group_2_6__0 ) ) )
-                    {
-                    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
-                        throw new FailedPredicateException(input, "rule__TableTable__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6)");
-                    }
-                    // InternalTableDSL.g:25489:106: ( ( ( rule__TableTable__Group_2_6__0 ) ) )
-                    // InternalTableDSL.g:25490:5: ( ( rule__TableTable__Group_2_6__0 ) )
-                    {
-                    getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6);
-                    selected = true;
-                    // InternalTableDSL.g:25496:5: ( ( rule__TableTable__Group_2_6__0 ) )
-                    // InternalTableDSL.g:25497:6: ( rule__TableTable__Group_2_6__0 )
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableTableAccess().getGroup_2_6()); 
-                    }
-                    // InternalTableDSL.g:25498:6: ( rule__TableTable__Group_2_6__0 )
-                    // InternalTableDSL.g:25498:7: rule__TableTable__Group_2_6__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableTable__Group_2_6__0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableTableAccess().getGroup_2_6()); 
+                       after(grammarAccess.getTableTableAccess().getGroup_2_5()); 
                     }
 
                     }
@@ -83732,46 +81586,43 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__UnorderedGroup_2__0"
-    // InternalTableDSL.g:25511:1: rule__TableTable__UnorderedGroup_2__0 : rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__1 )? ;
+    // InternalTableDSL.g:24848:1: rule__TableTable__UnorderedGroup_2__0 : rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__1 )? ;
     public final void rule__TableTable__UnorderedGroup_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25515:1: ( rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__1 )? )
-            // InternalTableDSL.g:25516:2: rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__1 )?
+            // InternalTableDSL.g:24852:1: ( rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__1 )? )
+            // InternalTableDSL.g:24853:2: rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__1 )?
             {
-            pushFollow(FOLLOW_184);
+            pushFollow(FOLLOW_183);
             rule__TableTable__UnorderedGroup_2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:25517:2: ( rule__TableTable__UnorderedGroup_2__1 )?
-            int alt184=2;
-            int LA184_0 = input.LA(1);
+            // InternalTableDSL.g:24854:2: ( rule__TableTable__UnorderedGroup_2__1 )?
+            int alt181=2;
+            int LA181_0 = input.LA(1);
 
-            if ( LA184_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
-                alt184=1;
-            }
-            else if ( LA184_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
-                alt184=1;
+            if ( LA181_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
+                alt181=1;
             }
-            else if ( LA184_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
-                alt184=1;
+            else if ( LA181_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
+                alt181=1;
             }
-            else if ( LA184_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
-                alt184=1;
+            else if ( LA181_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
+                alt181=1;
             }
-            else if ( LA184_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
-                alt184=1;
+            else if ( LA181_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
+                alt181=1;
             }
-            else if ( LA184_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
-                alt184=1;
+            else if ( LA181_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
+                alt181=1;
             }
-            else if ( LA184_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6) ) {
-                alt184=1;
+            else if ( LA181_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
+                alt181=1;
             }
-            switch (alt184) {
+            switch (alt181) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableTable__UnorderedGroup_2__1
                     {
@@ -83805,46 +81656,43 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__UnorderedGroup_2__1"
-    // InternalTableDSL.g:25523:1: rule__TableTable__UnorderedGroup_2__1 : rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__2 )? ;
+    // InternalTableDSL.g:24860:1: rule__TableTable__UnorderedGroup_2__1 : rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__2 )? ;
     public final void rule__TableTable__UnorderedGroup_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25527:1: ( rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__2 )? )
-            // InternalTableDSL.g:25528:2: rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__2 )?
+            // InternalTableDSL.g:24864:1: ( rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__2 )? )
+            // InternalTableDSL.g:24865:2: rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__2 )?
             {
-            pushFollow(FOLLOW_184);
+            pushFollow(FOLLOW_183);
             rule__TableTable__UnorderedGroup_2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:25529:2: ( rule__TableTable__UnorderedGroup_2__2 )?
-            int alt185=2;
-            int LA185_0 = input.LA(1);
+            // InternalTableDSL.g:24866:2: ( rule__TableTable__UnorderedGroup_2__2 )?
+            int alt182=2;
+            int LA182_0 = input.LA(1);
 
-            if ( LA185_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
-                alt185=1;
-            }
-            else if ( LA185_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
-                alt185=1;
+            if ( LA182_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
+                alt182=1;
             }
-            else if ( LA185_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
-                alt185=1;
+            else if ( LA182_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
+                alt182=1;
             }
-            else if ( LA185_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
-                alt185=1;
+            else if ( LA182_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
+                alt182=1;
             }
-            else if ( LA185_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
-                alt185=1;
+            else if ( LA182_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
+                alt182=1;
             }
-            else if ( LA185_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
-                alt185=1;
+            else if ( LA182_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
+                alt182=1;
             }
-            else if ( LA185_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6) ) {
-                alt185=1;
+            else if ( LA182_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
+                alt182=1;
             }
-            switch (alt185) {
+            switch (alt182) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableTable__UnorderedGroup_2__2
                     {
@@ -83878,46 +81726,43 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__UnorderedGroup_2__2"
-    // InternalTableDSL.g:25535:1: rule__TableTable__UnorderedGroup_2__2 : rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__3 )? ;
+    // InternalTableDSL.g:24872:1: rule__TableTable__UnorderedGroup_2__2 : rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__3 )? ;
     public final void rule__TableTable__UnorderedGroup_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25539:1: ( rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__3 )? )
-            // InternalTableDSL.g:25540:2: rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__3 )?
+            // InternalTableDSL.g:24876:1: ( rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__3 )? )
+            // InternalTableDSL.g:24877:2: rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__3 )?
             {
-            pushFollow(FOLLOW_184);
+            pushFollow(FOLLOW_183);
             rule__TableTable__UnorderedGroup_2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:25541:2: ( rule__TableTable__UnorderedGroup_2__3 )?
-            int alt186=2;
-            int LA186_0 = input.LA(1);
+            // InternalTableDSL.g:24878:2: ( rule__TableTable__UnorderedGroup_2__3 )?
+            int alt183=2;
+            int LA183_0 = input.LA(1);
 
-            if ( LA186_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
-                alt186=1;
-            }
-            else if ( LA186_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
-                alt186=1;
+            if ( LA183_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
+                alt183=1;
             }
-            else if ( LA186_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
-                alt186=1;
+            else if ( LA183_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
+                alt183=1;
             }
-            else if ( LA186_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
-                alt186=1;
+            else if ( LA183_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
+                alt183=1;
             }
-            else if ( LA186_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
-                alt186=1;
+            else if ( LA183_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
+                alt183=1;
             }
-            else if ( LA186_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
-                alt186=1;
+            else if ( LA183_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
+                alt183=1;
             }
-            else if ( LA186_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6) ) {
-                alt186=1;
+            else if ( LA183_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
+                alt183=1;
             }
-            switch (alt186) {
+            switch (alt183) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableTable__UnorderedGroup_2__3
                     {
@@ -83951,46 +81796,43 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__UnorderedGroup_2__3"
-    // InternalTableDSL.g:25547:1: rule__TableTable__UnorderedGroup_2__3 : rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__4 )? ;
+    // InternalTableDSL.g:24884:1: rule__TableTable__UnorderedGroup_2__3 : rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__4 )? ;
     public final void rule__TableTable__UnorderedGroup_2__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25551:1: ( rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__4 )? )
-            // InternalTableDSL.g:25552:2: rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__4 )?
+            // InternalTableDSL.g:24888:1: ( rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__4 )? )
+            // InternalTableDSL.g:24889:2: rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__4 )?
             {
-            pushFollow(FOLLOW_184);
+            pushFollow(FOLLOW_183);
             rule__TableTable__UnorderedGroup_2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:25553:2: ( rule__TableTable__UnorderedGroup_2__4 )?
-            int alt187=2;
-            int LA187_0 = input.LA(1);
+            // InternalTableDSL.g:24890:2: ( rule__TableTable__UnorderedGroup_2__4 )?
+            int alt184=2;
+            int LA184_0 = input.LA(1);
 
-            if ( LA187_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
-                alt187=1;
-            }
-            else if ( LA187_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
-                alt187=1;
+            if ( LA184_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
+                alt184=1;
             }
-            else if ( LA187_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
-                alt187=1;
+            else if ( LA184_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
+                alt184=1;
             }
-            else if ( LA187_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
-                alt187=1;
+            else if ( LA184_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
+                alt184=1;
             }
-            else if ( LA187_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
-                alt187=1;
+            else if ( LA184_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
+                alt184=1;
             }
-            else if ( LA187_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
-                alt187=1;
+            else if ( LA184_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
+                alt184=1;
             }
-            else if ( LA187_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6) ) {
-                alt187=1;
+            else if ( LA184_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
+                alt184=1;
             }
-            switch (alt187) {
+            switch (alt184) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableTable__UnorderedGroup_2__4
                     {
@@ -84024,46 +81866,43 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__UnorderedGroup_2__4"
-    // InternalTableDSL.g:25559:1: rule__TableTable__UnorderedGroup_2__4 : rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__5 )? ;
+    // InternalTableDSL.g:24896:1: rule__TableTable__UnorderedGroup_2__4 : rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__5 )? ;
     public final void rule__TableTable__UnorderedGroup_2__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25563:1: ( rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__5 )? )
-            // InternalTableDSL.g:25564:2: rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__5 )?
+            // InternalTableDSL.g:24900:1: ( rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__5 )? )
+            // InternalTableDSL.g:24901:2: rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__5 )?
             {
-            pushFollow(FOLLOW_184);
+            pushFollow(FOLLOW_183);
             rule__TableTable__UnorderedGroup_2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:25565:2: ( rule__TableTable__UnorderedGroup_2__5 )?
-            int alt188=2;
-            int LA188_0 = input.LA(1);
+            // InternalTableDSL.g:24902:2: ( rule__TableTable__UnorderedGroup_2__5 )?
+            int alt185=2;
+            int LA185_0 = input.LA(1);
 
-            if ( LA188_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
-                alt188=1;
-            }
-            else if ( LA188_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
-                alt188=1;
+            if ( LA185_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
+                alt185=1;
             }
-            else if ( LA188_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
-                alt188=1;
+            else if ( LA185_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
+                alt185=1;
             }
-            else if ( LA188_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
-                alt188=1;
+            else if ( LA185_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
+                alt185=1;
             }
-            else if ( LA188_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
-                alt188=1;
+            else if ( LA185_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
+                alt185=1;
             }
-            else if ( LA188_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
-                alt188=1;
+            else if ( LA185_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
+                alt185=1;
             }
-            else if ( LA188_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6) ) {
-                alt188=1;
+            else if ( LA185_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
+                alt185=1;
             }
-            switch (alt188) {
+            switch (alt185) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableTable__UnorderedGroup_2__5
                     {
@@ -84097,87 +81936,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__UnorderedGroup_2__5"
-    // InternalTableDSL.g:25571:1: rule__TableTable__UnorderedGroup_2__5 : rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__6 )? ;
+    // InternalTableDSL.g:24908:1: rule__TableTable__UnorderedGroup_2__5 : rule__TableTable__UnorderedGroup_2__Impl ;
     public final void rule__TableTable__UnorderedGroup_2__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25575:1: ( rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__6 )? )
-            // InternalTableDSL.g:25576:2: rule__TableTable__UnorderedGroup_2__Impl ( rule__TableTable__UnorderedGroup_2__6 )?
-            {
-            pushFollow(FOLLOW_184);
-            rule__TableTable__UnorderedGroup_2__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            // InternalTableDSL.g:25577:2: ( rule__TableTable__UnorderedGroup_2__6 )?
-            int alt189=2;
-            int LA189_0 = input.LA(1);
-
-            if ( LA189_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
-                alt189=1;
-            }
-            else if ( LA189_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
-                alt189=1;
-            }
-            else if ( LA189_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
-                alt189=1;
-            }
-            else if ( LA189_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
-                alt189=1;
-            }
-            else if ( LA189_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
-                alt189=1;
-            }
-            else if ( LA189_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
-                alt189=1;
-            }
-            else if ( LA189_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6) ) {
-                alt189=1;
-            }
-            switch (alt189) {
-                case 1 :
-                    // InternalTableDSL.g:0:0: rule__TableTable__UnorderedGroup_2__6
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableTable__UnorderedGroup_2__6();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableTable__UnorderedGroup_2__5"
-
-
-    // $ANTLR start "rule__TableTable__UnorderedGroup_2__6"
-    // InternalTableDSL.g:25583:1: rule__TableTable__UnorderedGroup_2__6 : rule__TableTable__UnorderedGroup_2__Impl ;
-    public final void rule__TableTable__UnorderedGroup_2__6() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:25587:1: ( rule__TableTable__UnorderedGroup_2__Impl )
-            // InternalTableDSL.g:25588:2: rule__TableTable__UnorderedGroup_2__Impl
+            // InternalTableDSL.g:24912:1: ( rule__TableTable__UnorderedGroup_2__Impl )
+            // InternalTableDSL.g:24913:2: rule__TableTable__UnorderedGroup_2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableTable__UnorderedGroup_2__Impl();
@@ -84199,977 +81965,40 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableTable__UnorderedGroup_2__6"
-
-
-    // $ANTLR start "rule__TableBean__UnorderedGroup_2"
-    // InternalTableDSL.g:25595:1: rule__TableBean__UnorderedGroup_2 : ( rule__TableBean__UnorderedGroup_2__0 )? ;
-    public final void rule__TableBean__UnorderedGroup_2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        		getUnorderedGroupHelper().enter(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-        	
-        try {
-            // InternalTableDSL.g:25600:1: ( ( rule__TableBean__UnorderedGroup_2__0 )? )
-            // InternalTableDSL.g:25601:2: ( rule__TableBean__UnorderedGroup_2__0 )?
-            {
-            // InternalTableDSL.g:25601:2: ( rule__TableBean__UnorderedGroup_2__0 )?
-            int alt190=2;
-            int LA190_0 = input.LA(1);
-
-            if ( LA190_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0) ) {
-                alt190=1;
-            }
-            else if ( LA190_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1) ) {
-                alt190=1;
-            }
-            else if ( LA190_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2) ) {
-                alt190=1;
-            }
-            else if ( LA190_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3) ) {
-                alt190=1;
-            }
-            else if ( LA190_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4) ) {
-                alt190=1;
-            }
-            else if ( LA190_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5) ) {
-                alt190=1;
-            }
-            else if ( LA190_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6) ) {
-                alt190=1;
-            }
-            switch (alt190) {
-                case 1 :
-                    // InternalTableDSL.g:0:0: rule__TableBean__UnorderedGroup_2__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableBean__UnorderedGroup_2__0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	getUnorderedGroupHelper().leave(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__UnorderedGroup_2"
-
-
-    // $ANTLR start "rule__TableBean__UnorderedGroup_2__Impl"
-    // InternalTableDSL.g:25609:1: rule__TableBean__UnorderedGroup_2__Impl : ( ({...}? => ( ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__SelectByIdAssignment_2_1 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__Group_2_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__Group_2_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__FilteringAssignment_2_4 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__EmbeddedAssignment_2_5 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__Group_2_6__0 ) ) ) ) ) ;
-    public final void rule__TableBean__UnorderedGroup_2__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        		boolean selected = false;
-        	
-        try {
-            // InternalTableDSL.g:25614:1: ( ( ({...}? => ( ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__SelectByIdAssignment_2_1 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__Group_2_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__Group_2_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__FilteringAssignment_2_4 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__EmbeddedAssignment_2_5 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__Group_2_6__0 ) ) ) ) ) )
-            // InternalTableDSL.g:25615:3: ( ({...}? => ( ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__SelectByIdAssignment_2_1 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__Group_2_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__Group_2_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__FilteringAssignment_2_4 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__EmbeddedAssignment_2_5 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__Group_2_6__0 ) ) ) ) )
-            {
-            // InternalTableDSL.g:25615:3: ( ({...}? => ( ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__SelectByIdAssignment_2_1 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__Group_2_2__0 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__Group_2_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__FilteringAssignment_2_4 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__EmbeddedAssignment_2_5 ) ) ) ) | ({...}? => ( ( ( rule__TableBean__Group_2_6__0 ) ) ) ) )
-            int alt191=7;
-            int LA191_0 = input.LA(1);
-
-            if ( LA191_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0) ) {
-                alt191=1;
-            }
-            else if ( LA191_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1) ) {
-                alt191=2;
-            }
-            else if ( LA191_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2) ) {
-                alt191=3;
-            }
-            else if ( LA191_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3) ) {
-                alt191=4;
-            }
-            else if ( LA191_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4) ) {
-                alt191=5;
-            }
-            else if ( LA191_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5) ) {
-                alt191=6;
-            }
-            else if ( LA191_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6) ) {
-                alt191=7;
-            }
-            else {
-                if (state.backtracking>0) {state.failed=true; return ;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 191, 0, input);
-
-                throw nvae;
-            }
-            switch (alt191) {
-                case 1 :
-                    // InternalTableDSL.g:25616:3: ({...}? => ( ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) ) ) )
-                    {
-                    // InternalTableDSL.g:25616:3: ({...}? => ( ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) ) ) )
-                    // InternalTableDSL.g:25617:4: {...}? => ( ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) ) )
-                    {
-                    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
-                        throw new FailedPredicateException(input, "rule__TableBean__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0)");
-                    }
-                    // InternalTableDSL.g:25617:105: ( ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) ) )
-                    // InternalTableDSL.g:25618:5: ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) )
-                    {
-                    getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0);
-                    selected = true;
-                    // InternalTableDSL.g:25624:5: ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) )
-                    // InternalTableDSL.g:25625:6: ( rule__TableBean__SelectalwaysAssignment_2_0 )
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableBeanAccess().getSelectalwaysAssignment_2_0()); 
-                    }
-                    // InternalTableDSL.g:25626:6: ( rule__TableBean__SelectalwaysAssignment_2_0 )
-                    // InternalTableDSL.g:25626:7: rule__TableBean__SelectalwaysAssignment_2_0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableBean__SelectalwaysAssignment_2_0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableBeanAccess().getSelectalwaysAssignment_2_0()); 
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // InternalTableDSL.g:25631:3: ({...}? => ( ( ( rule__TableBean__SelectByIdAssignment_2_1 ) ) ) )
-                    {
-                    // InternalTableDSL.g:25631:3: ({...}? => ( ( ( rule__TableBean__SelectByIdAssignment_2_1 ) ) ) )
-                    // InternalTableDSL.g:25632:4: {...}? => ( ( ( rule__TableBean__SelectByIdAssignment_2_1 ) ) )
-                    {
-                    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
-                        throw new FailedPredicateException(input, "rule__TableBean__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1)");
-                    }
-                    // InternalTableDSL.g:25632:105: ( ( ( rule__TableBean__SelectByIdAssignment_2_1 ) ) )
-                    // InternalTableDSL.g:25633:5: ( ( rule__TableBean__SelectByIdAssignment_2_1 ) )
-                    {
-                    getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1);
-                    selected = true;
-                    // InternalTableDSL.g:25639:5: ( ( rule__TableBean__SelectByIdAssignment_2_1 ) )
-                    // InternalTableDSL.g:25640:6: ( rule__TableBean__SelectByIdAssignment_2_1 )
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableBeanAccess().getSelectByIdAssignment_2_1()); 
-                    }
-                    // InternalTableDSL.g:25641:6: ( rule__TableBean__SelectByIdAssignment_2_1 )
-                    // InternalTableDSL.g:25641:7: rule__TableBean__SelectByIdAssignment_2_1
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableBean__SelectByIdAssignment_2_1();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableBeanAccess().getSelectByIdAssignment_2_1()); 
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // InternalTableDSL.g:25646:3: ({...}? => ( ( ( rule__TableBean__Group_2_2__0 ) ) ) )
-                    {
-                    // InternalTableDSL.g:25646:3: ({...}? => ( ( ( rule__TableBean__Group_2_2__0 ) ) ) )
-                    // InternalTableDSL.g:25647:4: {...}? => ( ( ( rule__TableBean__Group_2_2__0 ) ) )
-                    {
-                    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
-                        throw new FailedPredicateException(input, "rule__TableBean__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2)");
-                    }
-                    // InternalTableDSL.g:25647:105: ( ( ( rule__TableBean__Group_2_2__0 ) ) )
-                    // InternalTableDSL.g:25648:5: ( ( rule__TableBean__Group_2_2__0 ) )
-                    {
-                    getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2);
-                    selected = true;
-                    // InternalTableDSL.g:25654:5: ( ( rule__TableBean__Group_2_2__0 ) )
-                    // InternalTableDSL.g:25655:6: ( rule__TableBean__Group_2_2__0 )
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableBeanAccess().getGroup_2_2()); 
-                    }
-                    // InternalTableDSL.g:25656:6: ( rule__TableBean__Group_2_2__0 )
-                    // InternalTableDSL.g:25656:7: rule__TableBean__Group_2_2__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableBean__Group_2_2__0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableBeanAccess().getGroup_2_2()); 
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // InternalTableDSL.g:25661:3: ({...}? => ( ( ( rule__TableBean__Group_2_3__0 ) ) ) )
-                    {
-                    // InternalTableDSL.g:25661:3: ({...}? => ( ( ( rule__TableBean__Group_2_3__0 ) ) ) )
-                    // InternalTableDSL.g:25662:4: {...}? => ( ( ( rule__TableBean__Group_2_3__0 ) ) )
-                    {
-                    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
-                        throw new FailedPredicateException(input, "rule__TableBean__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3)");
-                    }
-                    // InternalTableDSL.g:25662:105: ( ( ( rule__TableBean__Group_2_3__0 ) ) )
-                    // InternalTableDSL.g:25663:5: ( ( rule__TableBean__Group_2_3__0 ) )
-                    {
-                    getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3);
-                    selected = true;
-                    // InternalTableDSL.g:25669:5: ( ( rule__TableBean__Group_2_3__0 ) )
-                    // InternalTableDSL.g:25670:6: ( rule__TableBean__Group_2_3__0 )
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableBeanAccess().getGroup_2_3()); 
-                    }
-                    // InternalTableDSL.g:25671:6: ( rule__TableBean__Group_2_3__0 )
-                    // InternalTableDSL.g:25671:7: rule__TableBean__Group_2_3__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableBean__Group_2_3__0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableBeanAccess().getGroup_2_3()); 
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 5 :
-                    // InternalTableDSL.g:25676:3: ({...}? => ( ( ( rule__TableBean__FilteringAssignment_2_4 ) ) ) )
-                    {
-                    // InternalTableDSL.g:25676:3: ({...}? => ( ( ( rule__TableBean__FilteringAssignment_2_4 ) ) ) )
-                    // InternalTableDSL.g:25677:4: {...}? => ( ( ( rule__TableBean__FilteringAssignment_2_4 ) ) )
-                    {
-                    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
-                        throw new FailedPredicateException(input, "rule__TableBean__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4)");
-                    }
-                    // InternalTableDSL.g:25677:105: ( ( ( rule__TableBean__FilteringAssignment_2_4 ) ) )
-                    // InternalTableDSL.g:25678:5: ( ( rule__TableBean__FilteringAssignment_2_4 ) )
-                    {
-                    getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4);
-                    selected = true;
-                    // InternalTableDSL.g:25684:5: ( ( rule__TableBean__FilteringAssignment_2_4 ) )
-                    // InternalTableDSL.g:25685:6: ( rule__TableBean__FilteringAssignment_2_4 )
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableBeanAccess().getFilteringAssignment_2_4()); 
-                    }
-                    // InternalTableDSL.g:25686:6: ( rule__TableBean__FilteringAssignment_2_4 )
-                    // InternalTableDSL.g:25686:7: rule__TableBean__FilteringAssignment_2_4
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableBean__FilteringAssignment_2_4();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableBeanAccess().getFilteringAssignment_2_4()); 
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 6 :
-                    // InternalTableDSL.g:25691:3: ({...}? => ( ( ( rule__TableBean__EmbeddedAssignment_2_5 ) ) ) )
-                    {
-                    // InternalTableDSL.g:25691:3: ({...}? => ( ( ( rule__TableBean__EmbeddedAssignment_2_5 ) ) ) )
-                    // InternalTableDSL.g:25692:4: {...}? => ( ( ( rule__TableBean__EmbeddedAssignment_2_5 ) ) )
-                    {
-                    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
-                        throw new FailedPredicateException(input, "rule__TableBean__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5)");
-                    }
-                    // InternalTableDSL.g:25692:105: ( ( ( rule__TableBean__EmbeddedAssignment_2_5 ) ) )
-                    // InternalTableDSL.g:25693:5: ( ( rule__TableBean__EmbeddedAssignment_2_5 ) )
-                    {
-                    getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5);
-                    selected = true;
-                    // InternalTableDSL.g:25699:5: ( ( rule__TableBean__EmbeddedAssignment_2_5 ) )
-                    // InternalTableDSL.g:25700:6: ( rule__TableBean__EmbeddedAssignment_2_5 )
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableBeanAccess().getEmbeddedAssignment_2_5()); 
-                    }
-                    // InternalTableDSL.g:25701:6: ( rule__TableBean__EmbeddedAssignment_2_5 )
-                    // InternalTableDSL.g:25701:7: rule__TableBean__EmbeddedAssignment_2_5
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableBean__EmbeddedAssignment_2_5();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableBeanAccess().getEmbeddedAssignment_2_5()); 
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 7 :
-                    // InternalTableDSL.g:25706:3: ({...}? => ( ( ( rule__TableBean__Group_2_6__0 ) ) ) )
-                    {
-                    // InternalTableDSL.g:25706:3: ({...}? => ( ( ( rule__TableBean__Group_2_6__0 ) ) ) )
-                    // InternalTableDSL.g:25707:4: {...}? => ( ( ( rule__TableBean__Group_2_6__0 ) ) )
-                    {
-                    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
-                        throw new FailedPredicateException(input, "rule__TableBean__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6)");
-                    }
-                    // InternalTableDSL.g:25707:105: ( ( ( rule__TableBean__Group_2_6__0 ) ) )
-                    // InternalTableDSL.g:25708:5: ( ( rule__TableBean__Group_2_6__0 ) )
-                    {
-                    getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6);
-                    selected = true;
-                    // InternalTableDSL.g:25714:5: ( ( rule__TableBean__Group_2_6__0 ) )
-                    // InternalTableDSL.g:25715:6: ( rule__TableBean__Group_2_6__0 )
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableBeanAccess().getGroup_2_6()); 
-                    }
-                    // InternalTableDSL.g:25716:6: ( rule__TableBean__Group_2_6__0 )
-                    // InternalTableDSL.g:25716:7: rule__TableBean__Group_2_6__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableBean__Group_2_6__0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableBeanAccess().getGroup_2_6()); 
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	if (selected)
-            		getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__UnorderedGroup_2__Impl"
-
-
-    // $ANTLR start "rule__TableBean__UnorderedGroup_2__0"
-    // InternalTableDSL.g:25729:1: rule__TableBean__UnorderedGroup_2__0 : rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__1 )? ;
-    public final void rule__TableBean__UnorderedGroup_2__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:25733:1: ( rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__1 )? )
-            // InternalTableDSL.g:25734:2: rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__1 )?
-            {
-            pushFollow(FOLLOW_184);
-            rule__TableBean__UnorderedGroup_2__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            // InternalTableDSL.g:25735:2: ( rule__TableBean__UnorderedGroup_2__1 )?
-            int alt192=2;
-            int LA192_0 = input.LA(1);
-
-            if ( LA192_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0) ) {
-                alt192=1;
-            }
-            else if ( LA192_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1) ) {
-                alt192=1;
-            }
-            else if ( LA192_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2) ) {
-                alt192=1;
-            }
-            else if ( LA192_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3) ) {
-                alt192=1;
-            }
-            else if ( LA192_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4) ) {
-                alt192=1;
-            }
-            else if ( LA192_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5) ) {
-                alt192=1;
-            }
-            else if ( LA192_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6) ) {
-                alt192=1;
-            }
-            switch (alt192) {
-                case 1 :
-                    // InternalTableDSL.g:0:0: rule__TableBean__UnorderedGroup_2__1
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableBean__UnorderedGroup_2__1();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__UnorderedGroup_2__0"
-
-
-    // $ANTLR start "rule__TableBean__UnorderedGroup_2__1"
-    // InternalTableDSL.g:25741:1: rule__TableBean__UnorderedGroup_2__1 : rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__2 )? ;
-    public final void rule__TableBean__UnorderedGroup_2__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:25745:1: ( rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__2 )? )
-            // InternalTableDSL.g:25746:2: rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__2 )?
-            {
-            pushFollow(FOLLOW_184);
-            rule__TableBean__UnorderedGroup_2__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            // InternalTableDSL.g:25747:2: ( rule__TableBean__UnorderedGroup_2__2 )?
-            int alt193=2;
-            int LA193_0 = input.LA(1);
-
-            if ( LA193_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0) ) {
-                alt193=1;
-            }
-            else if ( LA193_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1) ) {
-                alt193=1;
-            }
-            else if ( LA193_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2) ) {
-                alt193=1;
-            }
-            else if ( LA193_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3) ) {
-                alt193=1;
-            }
-            else if ( LA193_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4) ) {
-                alt193=1;
-            }
-            else if ( LA193_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5) ) {
-                alt193=1;
-            }
-            else if ( LA193_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6) ) {
-                alt193=1;
-            }
-            switch (alt193) {
-                case 1 :
-                    // InternalTableDSL.g:0:0: rule__TableBean__UnorderedGroup_2__2
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableBean__UnorderedGroup_2__2();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__UnorderedGroup_2__1"
-
-
-    // $ANTLR start "rule__TableBean__UnorderedGroup_2__2"
-    // InternalTableDSL.g:25753:1: rule__TableBean__UnorderedGroup_2__2 : rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__3 )? ;
-    public final void rule__TableBean__UnorderedGroup_2__2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:25757:1: ( rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__3 )? )
-            // InternalTableDSL.g:25758:2: rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__3 )?
-            {
-            pushFollow(FOLLOW_184);
-            rule__TableBean__UnorderedGroup_2__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            // InternalTableDSL.g:25759:2: ( rule__TableBean__UnorderedGroup_2__3 )?
-            int alt194=2;
-            int LA194_0 = input.LA(1);
-
-            if ( LA194_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0) ) {
-                alt194=1;
-            }
-            else if ( LA194_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1) ) {
-                alt194=1;
-            }
-            else if ( LA194_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2) ) {
-                alt194=1;
-            }
-            else if ( LA194_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3) ) {
-                alt194=1;
-            }
-            else if ( LA194_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4) ) {
-                alt194=1;
-            }
-            else if ( LA194_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5) ) {
-                alt194=1;
-            }
-            else if ( LA194_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6) ) {
-                alt194=1;
-            }
-            switch (alt194) {
-                case 1 :
-                    // InternalTableDSL.g:0:0: rule__TableBean__UnorderedGroup_2__3
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableBean__UnorderedGroup_2__3();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__UnorderedGroup_2__2"
-
-
-    // $ANTLR start "rule__TableBean__UnorderedGroup_2__3"
-    // InternalTableDSL.g:25765:1: rule__TableBean__UnorderedGroup_2__3 : rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__4 )? ;
-    public final void rule__TableBean__UnorderedGroup_2__3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:25769:1: ( rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__4 )? )
-            // InternalTableDSL.g:25770:2: rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__4 )?
-            {
-            pushFollow(FOLLOW_184);
-            rule__TableBean__UnorderedGroup_2__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            // InternalTableDSL.g:25771:2: ( rule__TableBean__UnorderedGroup_2__4 )?
-            int alt195=2;
-            int LA195_0 = input.LA(1);
-
-            if ( LA195_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0) ) {
-                alt195=1;
-            }
-            else if ( LA195_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1) ) {
-                alt195=1;
-            }
-            else if ( LA195_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2) ) {
-                alt195=1;
-            }
-            else if ( LA195_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3) ) {
-                alt195=1;
-            }
-            else if ( LA195_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4) ) {
-                alt195=1;
-            }
-            else if ( LA195_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5) ) {
-                alt195=1;
-            }
-            else if ( LA195_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6) ) {
-                alt195=1;
-            }
-            switch (alt195) {
-                case 1 :
-                    // InternalTableDSL.g:0:0: rule__TableBean__UnorderedGroup_2__4
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableBean__UnorderedGroup_2__4();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__UnorderedGroup_2__3"
-
-
-    // $ANTLR start "rule__TableBean__UnorderedGroup_2__4"
-    // InternalTableDSL.g:25777:1: rule__TableBean__UnorderedGroup_2__4 : rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__5 )? ;
-    public final void rule__TableBean__UnorderedGroup_2__4() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:25781:1: ( rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__5 )? )
-            // InternalTableDSL.g:25782:2: rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__5 )?
-            {
-            pushFollow(FOLLOW_184);
-            rule__TableBean__UnorderedGroup_2__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            // InternalTableDSL.g:25783:2: ( rule__TableBean__UnorderedGroup_2__5 )?
-            int alt196=2;
-            int LA196_0 = input.LA(1);
-
-            if ( LA196_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0) ) {
-                alt196=1;
-            }
-            else if ( LA196_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1) ) {
-                alt196=1;
-            }
-            else if ( LA196_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2) ) {
-                alt196=1;
-            }
-            else if ( LA196_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3) ) {
-                alt196=1;
-            }
-            else if ( LA196_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4) ) {
-                alt196=1;
-            }
-            else if ( LA196_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5) ) {
-                alt196=1;
-            }
-            else if ( LA196_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6) ) {
-                alt196=1;
-            }
-            switch (alt196) {
-                case 1 :
-                    // InternalTableDSL.g:0:0: rule__TableBean__UnorderedGroup_2__5
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableBean__UnorderedGroup_2__5();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__UnorderedGroup_2__4"
-
-
-    // $ANTLR start "rule__TableBean__UnorderedGroup_2__5"
-    // InternalTableDSL.g:25789:1: rule__TableBean__UnorderedGroup_2__5 : rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__6 )? ;
-    public final void rule__TableBean__UnorderedGroup_2__5() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:25793:1: ( rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__6 )? )
-            // InternalTableDSL.g:25794:2: rule__TableBean__UnorderedGroup_2__Impl ( rule__TableBean__UnorderedGroup_2__6 )?
-            {
-            pushFollow(FOLLOW_184);
-            rule__TableBean__UnorderedGroup_2__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            // InternalTableDSL.g:25795:2: ( rule__TableBean__UnorderedGroup_2__6 )?
-            int alt197=2;
-            int LA197_0 = input.LA(1);
-
-            if ( LA197_0 == 163 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0) ) {
-                alt197=1;
-            }
-            else if ( LA197_0 == 167 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1) ) {
-                alt197=1;
-            }
-            else if ( LA197_0 == 80 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2) ) {
-                alt197=1;
-            }
-            else if ( LA197_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3) ) {
-                alt197=1;
-            }
-            else if ( LA197_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4) ) {
-                alt197=1;
-            }
-            else if ( LA197_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5) ) {
-                alt197=1;
-            }
-            else if ( LA197_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6) ) {
-                alt197=1;
-            }
-            switch (alt197) {
-                case 1 :
-                    // InternalTableDSL.g:0:0: rule__TableBean__UnorderedGroup_2__6
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableBean__UnorderedGroup_2__6();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__UnorderedGroup_2__5"
-
-
-    // $ANTLR start "rule__TableBean__UnorderedGroup_2__6"
-    // InternalTableDSL.g:25801:1: rule__TableBean__UnorderedGroup_2__6 : rule__TableBean__UnorderedGroup_2__Impl ;
-    public final void rule__TableBean__UnorderedGroup_2__6() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:25805:1: ( rule__TableBean__UnorderedGroup_2__Impl )
-            // InternalTableDSL.g:25806:2: rule__TableBean__UnorderedGroup_2__Impl
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableBean__UnorderedGroup_2__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__UnorderedGroup_2__6"
+    // $ANTLR end "rule__TableTable__UnorderedGroup_2__5"
 
 
     // $ANTLR start "rule__TableValue__UnorderedGroup_3"
-    // InternalTableDSL.g:25813:1: rule__TableValue__UnorderedGroup_3 : ( rule__TableValue__UnorderedGroup_3__0 )? ;
+    // InternalTableDSL.g:24920:1: rule__TableValue__UnorderedGroup_3 : ( rule__TableValue__UnorderedGroup_3__0 )? ;
     public final void rule__TableValue__UnorderedGroup_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getTableValueAccess().getUnorderedGroup_3());
         	
         try {
-            // InternalTableDSL.g:25818:1: ( ( rule__TableValue__UnorderedGroup_3__0 )? )
-            // InternalTableDSL.g:25819:2: ( rule__TableValue__UnorderedGroup_3__0 )?
+            // InternalTableDSL.g:24925:1: ( ( rule__TableValue__UnorderedGroup_3__0 )? )
+            // InternalTableDSL.g:24926:2: ( rule__TableValue__UnorderedGroup_3__0 )?
             {
-            // InternalTableDSL.g:25819:2: ( rule__TableValue__UnorderedGroup_3__0 )?
-            int alt198=2;
-            int LA198_0 = input.LA(1);
+            // InternalTableDSL.g:24926:2: ( rule__TableValue__UnorderedGroup_3__0 )?
+            int alt186=2;
+            int LA186_0 = input.LA(1);
 
-            if ( LA198_0 == 169 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
-                alt198=1;
+            if ( LA186_0 == 168 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
+                alt186=1;
             }
-            else if ( LA198_0 == 86 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
-                alt198=1;
+            else if ( LA186_0 == 86 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
+                alt186=1;
             }
-            else if ( LA198_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
-                alt198=1;
+            else if ( LA186_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
+                alt186=1;
             }
-            else if ( LA198_0 == 170 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
-                alt198=1;
+            else if ( LA186_0 == 169 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
+                alt186=1;
             }
-            else if ( LA198_0 == 91 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
-                alt198=1;
+            else if ( LA186_0 == 91 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
+                alt186=1;
             }
-            switch (alt198) {
+            switch (alt186) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableValue__UnorderedGroup_3__0
                     {
@@ -85204,66 +82033,66 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__UnorderedGroup_3__Impl"
-    // InternalTableDSL.g:25827:1: rule__TableValue__UnorderedGroup_3__Impl : ( ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) ) ) ) ;
+    // InternalTableDSL.g:24934:1: rule__TableValue__UnorderedGroup_3__Impl : ( ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) ) ) ) ;
     public final void rule__TableValue__UnorderedGroup_3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
         	
         try {
-            // InternalTableDSL.g:25832:1: ( ( ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) ) ) ) )
-            // InternalTableDSL.g:25833:3: ( ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) ) ) )
+            // InternalTableDSL.g:24939:1: ( ( ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) ) ) ) )
+            // InternalTableDSL.g:24940:3: ( ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) ) ) )
             {
-            // InternalTableDSL.g:25833:3: ( ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) ) ) )
-            int alt199=5;
-            int LA199_0 = input.LA(1);
+            // InternalTableDSL.g:24940:3: ( ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) ) ) )
+            int alt187=5;
+            int LA187_0 = input.LA(1);
 
-            if ( LA199_0 == 169 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
-                alt199=1;
+            if ( LA187_0 == 168 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
+                alt187=1;
             }
-            else if ( LA199_0 == 86 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
-                alt199=2;
+            else if ( LA187_0 == 86 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
+                alt187=2;
             }
-            else if ( LA199_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
-                alt199=3;
+            else if ( LA187_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
+                alt187=3;
             }
-            else if ( LA199_0 == 170 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
-                alt199=4;
+            else if ( LA187_0 == 169 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
+                alt187=4;
             }
-            else if ( LA199_0 == 91 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
-                alt199=5;
+            else if ( LA187_0 == 91 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
+                alt187=5;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 199, 0, input);
+                    new NoViableAltException("", 187, 0, input);
 
                 throw nvae;
             }
-            switch (alt199) {
+            switch (alt187) {
                 case 1 :
-                    // InternalTableDSL.g:25834:3: ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) )
+                    // InternalTableDSL.g:24941:3: ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) )
                     {
-                    // InternalTableDSL.g:25834:3: ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) )
-                    // InternalTableDSL.g:25835:4: {...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) )
+                    // InternalTableDSL.g:24941:3: ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) )
+                    // InternalTableDSL.g:24942:4: {...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableValue__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0)");
                     }
-                    // InternalTableDSL.g:25835:106: ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) )
-                    // InternalTableDSL.g:25836:5: ( ( rule__TableValue__CollapsedAssignment_3_0 ) )
+                    // InternalTableDSL.g:24942:106: ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) )
+                    // InternalTableDSL.g:24943:5: ( ( rule__TableValue__CollapsedAssignment_3_0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0);
                     selected = true;
-                    // InternalTableDSL.g:25842:5: ( ( rule__TableValue__CollapsedAssignment_3_0 ) )
-                    // InternalTableDSL.g:25843:6: ( rule__TableValue__CollapsedAssignment_3_0 )
+                    // InternalTableDSL.g:24949:5: ( ( rule__TableValue__CollapsedAssignment_3_0 ) )
+                    // InternalTableDSL.g:24950:6: ( rule__TableValue__CollapsedAssignment_3_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueAccess().getCollapsedAssignment_3_0()); 
                     }
-                    // InternalTableDSL.g:25844:6: ( rule__TableValue__CollapsedAssignment_3_0 )
-                    // InternalTableDSL.g:25844:7: rule__TableValue__CollapsedAssignment_3_0
+                    // InternalTableDSL.g:24951:6: ( rule__TableValue__CollapsedAssignment_3_0 )
+                    // InternalTableDSL.g:24951:7: rule__TableValue__CollapsedAssignment_3_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableValue__CollapsedAssignment_3_0();
@@ -85289,28 +82118,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:25849:3: ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) )
+                    // InternalTableDSL.g:24956:3: ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) )
                     {
-                    // InternalTableDSL.g:25849:3: ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) )
-                    // InternalTableDSL.g:25850:4: {...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) )
+                    // InternalTableDSL.g:24956:3: ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) )
+                    // InternalTableDSL.g:24957:4: {...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableValue__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1)");
                     }
-                    // InternalTableDSL.g:25850:106: ( ( ( rule__TableValue__Group_3_1__0 ) ) )
-                    // InternalTableDSL.g:25851:5: ( ( rule__TableValue__Group_3_1__0 ) )
+                    // InternalTableDSL.g:24957:106: ( ( ( rule__TableValue__Group_3_1__0 ) ) )
+                    // InternalTableDSL.g:24958:5: ( ( rule__TableValue__Group_3_1__0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1);
                     selected = true;
-                    // InternalTableDSL.g:25857:5: ( ( rule__TableValue__Group_3_1__0 ) )
-                    // InternalTableDSL.g:25858:6: ( rule__TableValue__Group_3_1__0 )
+                    // InternalTableDSL.g:24964:5: ( ( rule__TableValue__Group_3_1__0 ) )
+                    // InternalTableDSL.g:24965:6: ( rule__TableValue__Group_3_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueAccess().getGroup_3_1()); 
                     }
-                    // InternalTableDSL.g:25859:6: ( rule__TableValue__Group_3_1__0 )
-                    // InternalTableDSL.g:25859:7: rule__TableValue__Group_3_1__0
+                    // InternalTableDSL.g:24966:6: ( rule__TableValue__Group_3_1__0 )
+                    // InternalTableDSL.g:24966:7: rule__TableValue__Group_3_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableValue__Group_3_1__0();
@@ -85336,28 +82165,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:25864:3: ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) )
+                    // InternalTableDSL.g:24971:3: ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) )
                     {
-                    // InternalTableDSL.g:25864:3: ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) )
-                    // InternalTableDSL.g:25865:4: {...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) )
+                    // InternalTableDSL.g:24971:3: ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) )
+                    // InternalTableDSL.g:24972:4: {...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableValue__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2)");
                     }
-                    // InternalTableDSL.g:25865:106: ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) )
-                    // InternalTableDSL.g:25866:5: ( ( rule__TableValue__FormatterAssignment_3_2 ) )
+                    // InternalTableDSL.g:24972:106: ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) )
+                    // InternalTableDSL.g:24973:5: ( ( rule__TableValue__FormatterAssignment_3_2 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2);
                     selected = true;
-                    // InternalTableDSL.g:25872:5: ( ( rule__TableValue__FormatterAssignment_3_2 ) )
-                    // InternalTableDSL.g:25873:6: ( rule__TableValue__FormatterAssignment_3_2 )
+                    // InternalTableDSL.g:24979:5: ( ( rule__TableValue__FormatterAssignment_3_2 ) )
+                    // InternalTableDSL.g:24980:6: ( rule__TableValue__FormatterAssignment_3_2 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueAccess().getFormatterAssignment_3_2()); 
                     }
-                    // InternalTableDSL.g:25874:6: ( rule__TableValue__FormatterAssignment_3_2 )
-                    // InternalTableDSL.g:25874:7: rule__TableValue__FormatterAssignment_3_2
+                    // InternalTableDSL.g:24981:6: ( rule__TableValue__FormatterAssignment_3_2 )
+                    // InternalTableDSL.g:24981:7: rule__TableValue__FormatterAssignment_3_2
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableValue__FormatterAssignment_3_2();
@@ -85383,28 +82212,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:25879:3: ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) )
+                    // InternalTableDSL.g:24986:3: ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) )
                     {
-                    // InternalTableDSL.g:25879:3: ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) )
-                    // InternalTableDSL.g:25880:4: {...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) )
+                    // InternalTableDSL.g:24986:3: ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) )
+                    // InternalTableDSL.g:24987:4: {...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableValue__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3)");
                     }
-                    // InternalTableDSL.g:25880:106: ( ( ( rule__TableValue__Group_3_3__0 ) ) )
-                    // InternalTableDSL.g:25881:5: ( ( rule__TableValue__Group_3_3__0 ) )
+                    // InternalTableDSL.g:24987:106: ( ( ( rule__TableValue__Group_3_3__0 ) ) )
+                    // InternalTableDSL.g:24988:5: ( ( rule__TableValue__Group_3_3__0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3);
                     selected = true;
-                    // InternalTableDSL.g:25887:5: ( ( rule__TableValue__Group_3_3__0 ) )
-                    // InternalTableDSL.g:25888:6: ( rule__TableValue__Group_3_3__0 )
+                    // InternalTableDSL.g:24994:5: ( ( rule__TableValue__Group_3_3__0 ) )
+                    // InternalTableDSL.g:24995:6: ( rule__TableValue__Group_3_3__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueAccess().getGroup_3_3()); 
                     }
-                    // InternalTableDSL.g:25889:6: ( rule__TableValue__Group_3_3__0 )
-                    // InternalTableDSL.g:25889:7: rule__TableValue__Group_3_3__0
+                    // InternalTableDSL.g:24996:6: ( rule__TableValue__Group_3_3__0 )
+                    // InternalTableDSL.g:24996:7: rule__TableValue__Group_3_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableValue__Group_3_3__0();
@@ -85430,28 +82259,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:25894:3: ({...}? => ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) ) )
+                    // InternalTableDSL.g:25001:3: ({...}? => ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) ) )
                     {
-                    // InternalTableDSL.g:25894:3: ({...}? => ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) ) )
-                    // InternalTableDSL.g:25895:4: {...}? => ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) )
+                    // InternalTableDSL.g:25001:3: ({...}? => ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) ) )
+                    // InternalTableDSL.g:25002:4: {...}? => ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableValue__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4)");
                     }
-                    // InternalTableDSL.g:25895:106: ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) )
-                    // InternalTableDSL.g:25896:5: ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) )
+                    // InternalTableDSL.g:25002:106: ( ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) ) )
+                    // InternalTableDSL.g:25003:5: ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4);
                     selected = true;
-                    // InternalTableDSL.g:25902:5: ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) )
-                    // InternalTableDSL.g:25903:6: ( rule__TableValue__TooltipPatternAssignment_3_4 )
+                    // InternalTableDSL.g:25009:5: ( ( rule__TableValue__TooltipPatternAssignment_3_4 ) )
+                    // InternalTableDSL.g:25010:6: ( rule__TableValue__TooltipPatternAssignment_3_4 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueAccess().getTooltipPatternAssignment_3_4()); 
                     }
-                    // InternalTableDSL.g:25904:6: ( rule__TableValue__TooltipPatternAssignment_3_4 )
-                    // InternalTableDSL.g:25904:7: rule__TableValue__TooltipPatternAssignment_3_4
+                    // InternalTableDSL.g:25011:6: ( rule__TableValue__TooltipPatternAssignment_3_4 )
+                    // InternalTableDSL.g:25011:7: rule__TableValue__TooltipPatternAssignment_3_4
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableValue__TooltipPatternAssignment_3_4();
@@ -85500,40 +82329,40 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__UnorderedGroup_3__0"
-    // InternalTableDSL.g:25917:1: rule__TableValue__UnorderedGroup_3__0 : rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__1 )? ;
+    // InternalTableDSL.g:25024:1: rule__TableValue__UnorderedGroup_3__0 : rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__1 )? ;
     public final void rule__TableValue__UnorderedGroup_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25921:1: ( rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__1 )? )
-            // InternalTableDSL.g:25922:2: rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__1 )?
+            // InternalTableDSL.g:25028:1: ( rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__1 )? )
+            // InternalTableDSL.g:25029:2: rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__1 )?
             {
-            pushFollow(FOLLOW_185);
+            pushFollow(FOLLOW_184);
             rule__TableValue__UnorderedGroup_3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:25923:2: ( rule__TableValue__UnorderedGroup_3__1 )?
-            int alt200=2;
-            int LA200_0 = input.LA(1);
+            // InternalTableDSL.g:25030:2: ( rule__TableValue__UnorderedGroup_3__1 )?
+            int alt188=2;
+            int LA188_0 = input.LA(1);
 
-            if ( LA200_0 == 169 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
-                alt200=1;
+            if ( LA188_0 == 168 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
+                alt188=1;
             }
-            else if ( LA200_0 == 86 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
-                alt200=1;
+            else if ( LA188_0 == 86 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
+                alt188=1;
             }
-            else if ( LA200_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
-                alt200=1;
+            else if ( LA188_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
+                alt188=1;
             }
-            else if ( LA200_0 == 170 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
-                alt200=1;
+            else if ( LA188_0 == 169 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
+                alt188=1;
             }
-            else if ( LA200_0 == 91 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
-                alt200=1;
+            else if ( LA188_0 == 91 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
+                alt188=1;
             }
-            switch (alt200) {
+            switch (alt188) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableValue__UnorderedGroup_3__1
                     {
@@ -85567,40 +82396,40 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__UnorderedGroup_3__1"
-    // InternalTableDSL.g:25929:1: rule__TableValue__UnorderedGroup_3__1 : rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__2 )? ;
+    // InternalTableDSL.g:25036:1: rule__TableValue__UnorderedGroup_3__1 : rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__2 )? ;
     public final void rule__TableValue__UnorderedGroup_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25933:1: ( rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__2 )? )
-            // InternalTableDSL.g:25934:2: rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__2 )?
+            // InternalTableDSL.g:25040:1: ( rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__2 )? )
+            // InternalTableDSL.g:25041:2: rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__2 )?
             {
-            pushFollow(FOLLOW_185);
+            pushFollow(FOLLOW_184);
             rule__TableValue__UnorderedGroup_3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:25935:2: ( rule__TableValue__UnorderedGroup_3__2 )?
-            int alt201=2;
-            int LA201_0 = input.LA(1);
+            // InternalTableDSL.g:25042:2: ( rule__TableValue__UnorderedGroup_3__2 )?
+            int alt189=2;
+            int LA189_0 = input.LA(1);
 
-            if ( LA201_0 == 169 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
-                alt201=1;
+            if ( LA189_0 == 168 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
+                alt189=1;
             }
-            else if ( LA201_0 == 86 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
-                alt201=1;
+            else if ( LA189_0 == 86 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
+                alt189=1;
             }
-            else if ( LA201_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
-                alt201=1;
+            else if ( LA189_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
+                alt189=1;
             }
-            else if ( LA201_0 == 170 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
-                alt201=1;
+            else if ( LA189_0 == 169 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
+                alt189=1;
             }
-            else if ( LA201_0 == 91 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
-                alt201=1;
+            else if ( LA189_0 == 91 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
+                alt189=1;
             }
-            switch (alt201) {
+            switch (alt189) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableValue__UnorderedGroup_3__2
                     {
@@ -85634,40 +82463,40 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__UnorderedGroup_3__2"
-    // InternalTableDSL.g:25941:1: rule__TableValue__UnorderedGroup_3__2 : rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__3 )? ;
+    // InternalTableDSL.g:25048:1: rule__TableValue__UnorderedGroup_3__2 : rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__3 )? ;
     public final void rule__TableValue__UnorderedGroup_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25945:1: ( rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__3 )? )
-            // InternalTableDSL.g:25946:2: rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__3 )?
+            // InternalTableDSL.g:25052:1: ( rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__3 )? )
+            // InternalTableDSL.g:25053:2: rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__3 )?
             {
-            pushFollow(FOLLOW_185);
+            pushFollow(FOLLOW_184);
             rule__TableValue__UnorderedGroup_3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:25947:2: ( rule__TableValue__UnorderedGroup_3__3 )?
-            int alt202=2;
-            int LA202_0 = input.LA(1);
+            // InternalTableDSL.g:25054:2: ( rule__TableValue__UnorderedGroup_3__3 )?
+            int alt190=2;
+            int LA190_0 = input.LA(1);
 
-            if ( LA202_0 == 169 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
-                alt202=1;
+            if ( LA190_0 == 168 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
+                alt190=1;
             }
-            else if ( LA202_0 == 86 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
-                alt202=1;
+            else if ( LA190_0 == 86 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
+                alt190=1;
             }
-            else if ( LA202_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
-                alt202=1;
+            else if ( LA190_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
+                alt190=1;
             }
-            else if ( LA202_0 == 170 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
-                alt202=1;
+            else if ( LA190_0 == 169 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
+                alt190=1;
             }
-            else if ( LA202_0 == 91 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
-                alt202=1;
+            else if ( LA190_0 == 91 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
+                alt190=1;
             }
-            switch (alt202) {
+            switch (alt190) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableValue__UnorderedGroup_3__3
                     {
@@ -85701,40 +82530,40 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__UnorderedGroup_3__3"
-    // InternalTableDSL.g:25953:1: rule__TableValue__UnorderedGroup_3__3 : rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__4 )? ;
+    // InternalTableDSL.g:25060:1: rule__TableValue__UnorderedGroup_3__3 : rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__4 )? ;
     public final void rule__TableValue__UnorderedGroup_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25957:1: ( rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__4 )? )
-            // InternalTableDSL.g:25958:2: rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__4 )?
+            // InternalTableDSL.g:25064:1: ( rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__4 )? )
+            // InternalTableDSL.g:25065:2: rule__TableValue__UnorderedGroup_3__Impl ( rule__TableValue__UnorderedGroup_3__4 )?
             {
-            pushFollow(FOLLOW_185);
+            pushFollow(FOLLOW_184);
             rule__TableValue__UnorderedGroup_3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:25959:2: ( rule__TableValue__UnorderedGroup_3__4 )?
-            int alt203=2;
-            int LA203_0 = input.LA(1);
+            // InternalTableDSL.g:25066:2: ( rule__TableValue__UnorderedGroup_3__4 )?
+            int alt191=2;
+            int LA191_0 = input.LA(1);
 
-            if ( LA203_0 == 169 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
-                alt203=1;
+            if ( LA191_0 == 168 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
+                alt191=1;
             }
-            else if ( LA203_0 == 86 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
-                alt203=1;
+            else if ( LA191_0 == 86 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
+                alt191=1;
             }
-            else if ( LA203_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
-                alt203=1;
+            else if ( LA191_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
+                alt191=1;
             }
-            else if ( LA203_0 == 170 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
-                alt203=1;
+            else if ( LA191_0 == 169 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
+                alt191=1;
             }
-            else if ( LA203_0 == 91 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
-                alt203=1;
+            else if ( LA191_0 == 91 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
+                alt191=1;
             }
-            switch (alt203) {
+            switch (alt191) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableValue__UnorderedGroup_3__4
                     {
@@ -85768,14 +82597,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__UnorderedGroup_3__4"
-    // InternalTableDSL.g:25965:1: rule__TableValue__UnorderedGroup_3__4 : rule__TableValue__UnorderedGroup_3__Impl ;
+    // InternalTableDSL.g:25072:1: rule__TableValue__UnorderedGroup_3__4 : rule__TableValue__UnorderedGroup_3__Impl ;
     public final void rule__TableValue__UnorderedGroup_3__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:25969:1: ( rule__TableValue__UnorderedGroup_3__Impl )
-            // InternalTableDSL.g:25970:2: rule__TableValue__UnorderedGroup_3__Impl
+            // InternalTableDSL.g:25076:1: ( rule__TableValue__UnorderedGroup_3__Impl )
+            // InternalTableDSL.g:25077:2: rule__TableValue__UnorderedGroup_3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableValue__UnorderedGroup_3__Impl();
@@ -85801,27 +82630,27 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__UnorderedGroup_4"
-    // InternalTableDSL.g:25977:1: rule__TableValue__UnorderedGroup_4 : ( rule__TableValue__UnorderedGroup_4__0 )? ;
+    // InternalTableDSL.g:25084:1: rule__TableValue__UnorderedGroup_4 : ( rule__TableValue__UnorderedGroup_4__0 )? ;
     public final void rule__TableValue__UnorderedGroup_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getTableValueAccess().getUnorderedGroup_4());
         	
         try {
-            // InternalTableDSL.g:25982:1: ( ( rule__TableValue__UnorderedGroup_4__0 )? )
-            // InternalTableDSL.g:25983:2: ( rule__TableValue__UnorderedGroup_4__0 )?
+            // InternalTableDSL.g:25089:1: ( ( rule__TableValue__UnorderedGroup_4__0 )? )
+            // InternalTableDSL.g:25090:2: ( rule__TableValue__UnorderedGroup_4__0 )?
             {
-            // InternalTableDSL.g:25983:2: ( rule__TableValue__UnorderedGroup_4__0 )?
-            int alt204=2;
-            int LA204_0 = input.LA(1);
+            // InternalTableDSL.g:25090:2: ( rule__TableValue__UnorderedGroup_4__0 )?
+            int alt192=2;
+            int LA192_0 = input.LA(1);
 
-            if ( LA204_0 == 87 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0) ) {
-                alt204=1;
+            if ( LA192_0 == 87 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0) ) {
+                alt192=1;
             }
-            else if ( LA204_0 == 88 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 1) ) {
-                alt204=1;
+            else if ( LA192_0 == 88 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 1) ) {
+                alt192=1;
             }
-            switch (alt204) {
+            switch (alt192) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableValue__UnorderedGroup_4__0
                     {
@@ -85856,57 +82685,57 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__UnorderedGroup_4__Impl"
-    // InternalTableDSL.g:25991:1: rule__TableValue__UnorderedGroup_4__Impl : ( ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_4_1__0 ) ) ) ) ) ;
+    // InternalTableDSL.g:25098:1: rule__TableValue__UnorderedGroup_4__Impl : ( ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_4_1__0 ) ) ) ) ) ;
     public final void rule__TableValue__UnorderedGroup_4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
         	
         try {
-            // InternalTableDSL.g:25996:1: ( ( ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_4_1__0 ) ) ) ) ) )
-            // InternalTableDSL.g:25997:3: ( ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_4_1__0 ) ) ) ) )
+            // InternalTableDSL.g:25103:1: ( ( ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_4_1__0 ) ) ) ) ) )
+            // InternalTableDSL.g:25104:3: ( ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_4_1__0 ) ) ) ) )
             {
-            // InternalTableDSL.g:25997:3: ( ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_4_1__0 ) ) ) ) )
-            int alt205=2;
-            int LA205_0 = input.LA(1);
+            // InternalTableDSL.g:25104:3: ( ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableValue__Group_4_1__0 ) ) ) ) )
+            int alt193=2;
+            int LA193_0 = input.LA(1);
 
-            if ( LA205_0 == 87 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0) ) {
-                alt205=1;
+            if ( LA193_0 == 87 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0) ) {
+                alt193=1;
             }
-            else if ( LA205_0 == 88 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 1) ) {
-                alt205=2;
+            else if ( LA193_0 == 88 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 1) ) {
+                alt193=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 205, 0, input);
+                    new NoViableAltException("", 193, 0, input);
 
                 throw nvae;
             }
-            switch (alt205) {
+            switch (alt193) {
                 case 1 :
-                    // InternalTableDSL.g:25998:3: ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) )
+                    // InternalTableDSL.g:25105:3: ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) )
                     {
-                    // InternalTableDSL.g:25998:3: ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) )
-                    // InternalTableDSL.g:25999:4: {...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) )
+                    // InternalTableDSL.g:25105:3: ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) )
+                    // InternalTableDSL.g:25106:4: {...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableValue__UnorderedGroup_4__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0)");
                     }
-                    // InternalTableDSL.g:25999:106: ( ( ( rule__TableValue__Group_4_0__0 ) ) )
-                    // InternalTableDSL.g:26000:5: ( ( rule__TableValue__Group_4_0__0 ) )
+                    // InternalTableDSL.g:25106:106: ( ( ( rule__TableValue__Group_4_0__0 ) ) )
+                    // InternalTableDSL.g:25107:5: ( ( rule__TableValue__Group_4_0__0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0);
                     selected = true;
-                    // InternalTableDSL.g:26006:5: ( ( rule__TableValue__Group_4_0__0 ) )
-                    // InternalTableDSL.g:26007:6: ( rule__TableValue__Group_4_0__0 )
+                    // InternalTableDSL.g:25113:5: ( ( rule__TableValue__Group_4_0__0 ) )
+                    // InternalTableDSL.g:25114:6: ( rule__TableValue__Group_4_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueAccess().getGroup_4_0()); 
                     }
-                    // InternalTableDSL.g:26008:6: ( rule__TableValue__Group_4_0__0 )
-                    // InternalTableDSL.g:26008:7: rule__TableValue__Group_4_0__0
+                    // InternalTableDSL.g:25115:6: ( rule__TableValue__Group_4_0__0 )
+                    // InternalTableDSL.g:25115:7: rule__TableValue__Group_4_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableValue__Group_4_0__0();
@@ -85932,28 +82761,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:26013:3: ({...}? => ( ( ( rule__TableValue__Group_4_1__0 ) ) ) )
+                    // InternalTableDSL.g:25120:3: ({...}? => ( ( ( rule__TableValue__Group_4_1__0 ) ) ) )
                     {
-                    // InternalTableDSL.g:26013:3: ({...}? => ( ( ( rule__TableValue__Group_4_1__0 ) ) ) )
-                    // InternalTableDSL.g:26014:4: {...}? => ( ( ( rule__TableValue__Group_4_1__0 ) ) )
+                    // InternalTableDSL.g:25120:3: ({...}? => ( ( ( rule__TableValue__Group_4_1__0 ) ) ) )
+                    // InternalTableDSL.g:25121:4: {...}? => ( ( ( rule__TableValue__Group_4_1__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 1) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableValue__UnorderedGroup_4__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 1)");
                     }
-                    // InternalTableDSL.g:26014:106: ( ( ( rule__TableValue__Group_4_1__0 ) ) )
-                    // InternalTableDSL.g:26015:5: ( ( rule__TableValue__Group_4_1__0 ) )
+                    // InternalTableDSL.g:25121:106: ( ( ( rule__TableValue__Group_4_1__0 ) ) )
+                    // InternalTableDSL.g:25122:5: ( ( rule__TableValue__Group_4_1__0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 1);
                     selected = true;
-                    // InternalTableDSL.g:26021:5: ( ( rule__TableValue__Group_4_1__0 ) )
-                    // InternalTableDSL.g:26022:6: ( rule__TableValue__Group_4_1__0 )
+                    // InternalTableDSL.g:25128:5: ( ( rule__TableValue__Group_4_1__0 ) )
+                    // InternalTableDSL.g:25129:6: ( rule__TableValue__Group_4_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableValueAccess().getGroup_4_1()); 
                     }
-                    // InternalTableDSL.g:26023:6: ( rule__TableValue__Group_4_1__0 )
-                    // InternalTableDSL.g:26023:7: rule__TableValue__Group_4_1__0
+                    // InternalTableDSL.g:25130:6: ( rule__TableValue__Group_4_1__0 )
+                    // InternalTableDSL.g:25130:7: rule__TableValue__Group_4_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableValue__Group_4_1__0();
@@ -86002,31 +82831,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__UnorderedGroup_4__0"
-    // InternalTableDSL.g:26036:1: rule__TableValue__UnorderedGroup_4__0 : rule__TableValue__UnorderedGroup_4__Impl ( rule__TableValue__UnorderedGroup_4__1 )? ;
+    // InternalTableDSL.g:25143:1: rule__TableValue__UnorderedGroup_4__0 : rule__TableValue__UnorderedGroup_4__Impl ( rule__TableValue__UnorderedGroup_4__1 )? ;
     public final void rule__TableValue__UnorderedGroup_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26040:1: ( rule__TableValue__UnorderedGroup_4__Impl ( rule__TableValue__UnorderedGroup_4__1 )? )
-            // InternalTableDSL.g:26041:2: rule__TableValue__UnorderedGroup_4__Impl ( rule__TableValue__UnorderedGroup_4__1 )?
+            // InternalTableDSL.g:25147:1: ( rule__TableValue__UnorderedGroup_4__Impl ( rule__TableValue__UnorderedGroup_4__1 )? )
+            // InternalTableDSL.g:25148:2: rule__TableValue__UnorderedGroup_4__Impl ( rule__TableValue__UnorderedGroup_4__1 )?
             {
-            pushFollow(FOLLOW_186);
+            pushFollow(FOLLOW_185);
             rule__TableValue__UnorderedGroup_4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:26042:2: ( rule__TableValue__UnorderedGroup_4__1 )?
-            int alt206=2;
-            int LA206_0 = input.LA(1);
+            // InternalTableDSL.g:25149:2: ( rule__TableValue__UnorderedGroup_4__1 )?
+            int alt194=2;
+            int LA194_0 = input.LA(1);
 
-            if ( LA206_0 == 87 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0) ) {
-                alt206=1;
+            if ( LA194_0 == 87 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0) ) {
+                alt194=1;
             }
-            else if ( LA206_0 == 88 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 1) ) {
-                alt206=1;
+            else if ( LA194_0 == 88 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 1) ) {
+                alt194=1;
             }
-            switch (alt206) {
+            switch (alt194) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableValue__UnorderedGroup_4__1
                     {
@@ -86060,14 +82889,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__UnorderedGroup_4__1"
-    // InternalTableDSL.g:26048:1: rule__TableValue__UnorderedGroup_4__1 : rule__TableValue__UnorderedGroup_4__Impl ;
+    // InternalTableDSL.g:25155:1: rule__TableValue__UnorderedGroup_4__1 : rule__TableValue__UnorderedGroup_4__Impl ;
     public final void rule__TableValue__UnorderedGroup_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26052:1: ( rule__TableValue__UnorderedGroup_4__Impl )
-            // InternalTableDSL.g:26053:2: rule__TableValue__UnorderedGroup_4__Impl
+            // InternalTableDSL.g:25159:1: ( rule__TableValue__UnorderedGroup_4__Impl )
+            // InternalTableDSL.g:25160:2: rule__TableValue__UnorderedGroup_4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableValue__UnorderedGroup_4__Impl();
@@ -86093,30 +82922,30 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__UnorderedGroup_3"
-    // InternalTableDSL.g:26060:1: rule__TableImage__UnorderedGroup_3 : ( rule__TableImage__UnorderedGroup_3__0 )? ;
+    // InternalTableDSL.g:25167:1: rule__TableImage__UnorderedGroup_3 : ( rule__TableImage__UnorderedGroup_3__0 )? ;
     public final void rule__TableImage__UnorderedGroup_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getTableImageAccess().getUnorderedGroup_3());
         	
         try {
-            // InternalTableDSL.g:26065:1: ( ( rule__TableImage__UnorderedGroup_3__0 )? )
-            // InternalTableDSL.g:26066:2: ( rule__TableImage__UnorderedGroup_3__0 )?
+            // InternalTableDSL.g:25172:1: ( ( rule__TableImage__UnorderedGroup_3__0 )? )
+            // InternalTableDSL.g:25173:2: ( rule__TableImage__UnorderedGroup_3__0 )?
             {
-            // InternalTableDSL.g:26066:2: ( rule__TableImage__UnorderedGroup_3__0 )?
-            int alt207=2;
-            int LA207_0 = input.LA(1);
+            // InternalTableDSL.g:25173:2: ( rule__TableImage__UnorderedGroup_3__0 )?
+            int alt195=2;
+            int LA195_0 = input.LA(1);
 
-            if ( LA207_0 == 172 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0) ) {
-                alt207=1;
+            if ( LA195_0 == 171 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0) ) {
+                alt195=1;
             }
-            else if ( LA207_0 == 171 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1) ) {
-                alt207=1;
+            else if ( LA195_0 == 170 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1) ) {
+                alt195=1;
             }
-            else if ( LA207_0 == 173 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2) ) {
-                alt207=1;
+            else if ( LA195_0 == 172 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2) ) {
+                alt195=1;
             }
-            switch (alt207) {
+            switch (alt195) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableImage__UnorderedGroup_3__0
                     {
@@ -86151,60 +82980,60 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__UnorderedGroup_3__Impl"
-    // InternalTableDSL.g:26074:1: rule__TableImage__UnorderedGroup_3__Impl : ( ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__Group_3_2__0 ) ) ) ) ) ;
+    // InternalTableDSL.g:25181:1: rule__TableImage__UnorderedGroup_3__Impl : ( ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__Group_3_2__0 ) ) ) ) ) ;
     public final void rule__TableImage__UnorderedGroup_3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
         	
         try {
-            // InternalTableDSL.g:26079:1: ( ( ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__Group_3_2__0 ) ) ) ) ) )
-            // InternalTableDSL.g:26080:3: ( ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__Group_3_2__0 ) ) ) ) )
+            // InternalTableDSL.g:25186:1: ( ( ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__Group_3_2__0 ) ) ) ) ) )
+            // InternalTableDSL.g:25187:3: ( ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__Group_3_2__0 ) ) ) ) )
             {
-            // InternalTableDSL.g:26080:3: ( ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__Group_3_2__0 ) ) ) ) )
-            int alt208=3;
-            int LA208_0 = input.LA(1);
+            // InternalTableDSL.g:25187:3: ( ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) ) | ({...}? => ( ( ( rule__TableImage__Group_3_2__0 ) ) ) ) )
+            int alt196=3;
+            int LA196_0 = input.LA(1);
 
-            if ( LA208_0 == 172 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0) ) {
-                alt208=1;
+            if ( LA196_0 == 171 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0) ) {
+                alt196=1;
             }
-            else if ( LA208_0 == 171 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1) ) {
-                alt208=2;
+            else if ( LA196_0 == 170 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1) ) {
+                alt196=2;
             }
-            else if ( LA208_0 == 173 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2) ) {
-                alt208=3;
+            else if ( LA196_0 == 172 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2) ) {
+                alt196=3;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 208, 0, input);
+                    new NoViableAltException("", 196, 0, input);
 
                 throw nvae;
             }
-            switch (alt208) {
+            switch (alt196) {
                 case 1 :
-                    // InternalTableDSL.g:26081:3: ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) )
+                    // InternalTableDSL.g:25188:3: ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) )
                     {
-                    // InternalTableDSL.g:26081:3: ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) )
-                    // InternalTableDSL.g:26082:4: {...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) )
+                    // InternalTableDSL.g:25188:3: ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) )
+                    // InternalTableDSL.g:25189:4: {...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableImage__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0)");
                     }
-                    // InternalTableDSL.g:26082:106: ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) )
-                    // InternalTableDSL.g:26083:5: ( ( rule__TableImage__HasParameterAssignment_3_0 ) )
+                    // InternalTableDSL.g:25189:106: ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) )
+                    // InternalTableDSL.g:25190:5: ( ( rule__TableImage__HasParameterAssignment_3_0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0);
                     selected = true;
-                    // InternalTableDSL.g:26089:5: ( ( rule__TableImage__HasParameterAssignment_3_0 ) )
-                    // InternalTableDSL.g:26090:6: ( rule__TableImage__HasParameterAssignment_3_0 )
+                    // InternalTableDSL.g:25196:5: ( ( rule__TableImage__HasParameterAssignment_3_0 ) )
+                    // InternalTableDSL.g:25197:6: ( rule__TableImage__HasParameterAssignment_3_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableImageAccess().getHasParameterAssignment_3_0()); 
                     }
-                    // InternalTableDSL.g:26091:6: ( rule__TableImage__HasParameterAssignment_3_0 )
-                    // InternalTableDSL.g:26091:7: rule__TableImage__HasParameterAssignment_3_0
+                    // InternalTableDSL.g:25198:6: ( rule__TableImage__HasParameterAssignment_3_0 )
+                    // InternalTableDSL.g:25198:7: rule__TableImage__HasParameterAssignment_3_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableImage__HasParameterAssignment_3_0();
@@ -86230,28 +83059,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:26096:3: ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) )
+                    // InternalTableDSL.g:25203:3: ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) )
                     {
-                    // InternalTableDSL.g:26096:3: ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) )
-                    // InternalTableDSL.g:26097:4: {...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) )
+                    // InternalTableDSL.g:25203:3: ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) )
+                    // InternalTableDSL.g:25204:4: {...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableImage__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1)");
                     }
-                    // InternalTableDSL.g:26097:106: ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) )
-                    // InternalTableDSL.g:26098:5: ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) )
+                    // InternalTableDSL.g:25204:106: ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) )
+                    // InternalTableDSL.g:25205:5: ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1);
                     selected = true;
-                    // InternalTableDSL.g:26104:5: ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) )
-                    // InternalTableDSL.g:26105:6: ( rule__TableImage__HideImageLabelAssignment_3_1 )
+                    // InternalTableDSL.g:25211:5: ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) )
+                    // InternalTableDSL.g:25212:6: ( rule__TableImage__HideImageLabelAssignment_3_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableImageAccess().getHideImageLabelAssignment_3_1()); 
                     }
-                    // InternalTableDSL.g:26106:6: ( rule__TableImage__HideImageLabelAssignment_3_1 )
-                    // InternalTableDSL.g:26106:7: rule__TableImage__HideImageLabelAssignment_3_1
+                    // InternalTableDSL.g:25213:6: ( rule__TableImage__HideImageLabelAssignment_3_1 )
+                    // InternalTableDSL.g:25213:7: rule__TableImage__HideImageLabelAssignment_3_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableImage__HideImageLabelAssignment_3_1();
@@ -86277,28 +83106,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:26111:3: ({...}? => ( ( ( rule__TableImage__Group_3_2__0 ) ) ) )
+                    // InternalTableDSL.g:25218:3: ({...}? => ( ( ( rule__TableImage__Group_3_2__0 ) ) ) )
                     {
-                    // InternalTableDSL.g:26111:3: ({...}? => ( ( ( rule__TableImage__Group_3_2__0 ) ) ) )
-                    // InternalTableDSL.g:26112:4: {...}? => ( ( ( rule__TableImage__Group_3_2__0 ) ) )
+                    // InternalTableDSL.g:25218:3: ({...}? => ( ( ( rule__TableImage__Group_3_2__0 ) ) ) )
+                    // InternalTableDSL.g:25219:4: {...}? => ( ( ( rule__TableImage__Group_3_2__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableImage__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2)");
                     }
-                    // InternalTableDSL.g:26112:106: ( ( ( rule__TableImage__Group_3_2__0 ) ) )
-                    // InternalTableDSL.g:26113:5: ( ( rule__TableImage__Group_3_2__0 ) )
+                    // InternalTableDSL.g:25219:106: ( ( ( rule__TableImage__Group_3_2__0 ) ) )
+                    // InternalTableDSL.g:25220:5: ( ( rule__TableImage__Group_3_2__0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2);
                     selected = true;
-                    // InternalTableDSL.g:26119:5: ( ( rule__TableImage__Group_3_2__0 ) )
-                    // InternalTableDSL.g:26120:6: ( rule__TableImage__Group_3_2__0 )
+                    // InternalTableDSL.g:25226:5: ( ( rule__TableImage__Group_3_2__0 ) )
+                    // InternalTableDSL.g:25227:6: ( rule__TableImage__Group_3_2__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableImageAccess().getGroup_3_2()); 
                     }
-                    // InternalTableDSL.g:26121:6: ( rule__TableImage__Group_3_2__0 )
-                    // InternalTableDSL.g:26121:7: rule__TableImage__Group_3_2__0
+                    // InternalTableDSL.g:25228:6: ( rule__TableImage__Group_3_2__0 )
+                    // InternalTableDSL.g:25228:7: rule__TableImage__Group_3_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableImage__Group_3_2__0();
@@ -86347,34 +83176,34 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__UnorderedGroup_3__0"
-    // InternalTableDSL.g:26134:1: rule__TableImage__UnorderedGroup_3__0 : rule__TableImage__UnorderedGroup_3__Impl ( rule__TableImage__UnorderedGroup_3__1 )? ;
+    // InternalTableDSL.g:25241:1: rule__TableImage__UnorderedGroup_3__0 : rule__TableImage__UnorderedGroup_3__Impl ( rule__TableImage__UnorderedGroup_3__1 )? ;
     public final void rule__TableImage__UnorderedGroup_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26138:1: ( rule__TableImage__UnorderedGroup_3__Impl ( rule__TableImage__UnorderedGroup_3__1 )? )
-            // InternalTableDSL.g:26139:2: rule__TableImage__UnorderedGroup_3__Impl ( rule__TableImage__UnorderedGroup_3__1 )?
+            // InternalTableDSL.g:25245:1: ( rule__TableImage__UnorderedGroup_3__Impl ( rule__TableImage__UnorderedGroup_3__1 )? )
+            // InternalTableDSL.g:25246:2: rule__TableImage__UnorderedGroup_3__Impl ( rule__TableImage__UnorderedGroup_3__1 )?
             {
-            pushFollow(FOLLOW_187);
+            pushFollow(FOLLOW_186);
             rule__TableImage__UnorderedGroup_3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:26140:2: ( rule__TableImage__UnorderedGroup_3__1 )?
-            int alt209=2;
-            int LA209_0 = input.LA(1);
+            // InternalTableDSL.g:25247:2: ( rule__TableImage__UnorderedGroup_3__1 )?
+            int alt197=2;
+            int LA197_0 = input.LA(1);
 
-            if ( LA209_0 == 172 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0) ) {
-                alt209=1;
+            if ( LA197_0 == 171 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0) ) {
+                alt197=1;
             }
-            else if ( LA209_0 == 171 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1) ) {
-                alt209=1;
+            else if ( LA197_0 == 170 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1) ) {
+                alt197=1;
             }
-            else if ( LA209_0 == 173 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2) ) {
-                alt209=1;
+            else if ( LA197_0 == 172 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2) ) {
+                alt197=1;
             }
-            switch (alt209) {
+            switch (alt197) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableImage__UnorderedGroup_3__1
                     {
@@ -86408,34 +83237,34 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__UnorderedGroup_3__1"
-    // InternalTableDSL.g:26146:1: rule__TableImage__UnorderedGroup_3__1 : rule__TableImage__UnorderedGroup_3__Impl ( rule__TableImage__UnorderedGroup_3__2 )? ;
+    // InternalTableDSL.g:25253:1: rule__TableImage__UnorderedGroup_3__1 : rule__TableImage__UnorderedGroup_3__Impl ( rule__TableImage__UnorderedGroup_3__2 )? ;
     public final void rule__TableImage__UnorderedGroup_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26150:1: ( rule__TableImage__UnorderedGroup_3__Impl ( rule__TableImage__UnorderedGroup_3__2 )? )
-            // InternalTableDSL.g:26151:2: rule__TableImage__UnorderedGroup_3__Impl ( rule__TableImage__UnorderedGroup_3__2 )?
+            // InternalTableDSL.g:25257:1: ( rule__TableImage__UnorderedGroup_3__Impl ( rule__TableImage__UnorderedGroup_3__2 )? )
+            // InternalTableDSL.g:25258:2: rule__TableImage__UnorderedGroup_3__Impl ( rule__TableImage__UnorderedGroup_3__2 )?
             {
-            pushFollow(FOLLOW_187);
+            pushFollow(FOLLOW_186);
             rule__TableImage__UnorderedGroup_3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:26152:2: ( rule__TableImage__UnorderedGroup_3__2 )?
-            int alt210=2;
-            int LA210_0 = input.LA(1);
+            // InternalTableDSL.g:25259:2: ( rule__TableImage__UnorderedGroup_3__2 )?
+            int alt198=2;
+            int LA198_0 = input.LA(1);
 
-            if ( LA210_0 == 172 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0) ) {
-                alt210=1;
+            if ( LA198_0 == 171 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0) ) {
+                alt198=1;
             }
-            else if ( LA210_0 == 171 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1) ) {
-                alt210=1;
+            else if ( LA198_0 == 170 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1) ) {
+                alt198=1;
             }
-            else if ( LA210_0 == 173 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2) ) {
-                alt210=1;
+            else if ( LA198_0 == 172 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2) ) {
+                alt198=1;
             }
-            switch (alt210) {
+            switch (alt198) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableImage__UnorderedGroup_3__2
                     {
@@ -86469,14 +83298,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__UnorderedGroup_3__2"
-    // InternalTableDSL.g:26158:1: rule__TableImage__UnorderedGroup_3__2 : rule__TableImage__UnorderedGroup_3__Impl ;
+    // InternalTableDSL.g:25265:1: rule__TableImage__UnorderedGroup_3__2 : rule__TableImage__UnorderedGroup_3__Impl ;
     public final void rule__TableImage__UnorderedGroup_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26162:1: ( rule__TableImage__UnorderedGroup_3__Impl )
-            // InternalTableDSL.g:26163:2: rule__TableImage__UnorderedGroup_3__Impl
+            // InternalTableDSL.g:25269:1: ( rule__TableImage__UnorderedGroup_3__Impl )
+            // InternalTableDSL.g:25270:2: rule__TableImage__UnorderedGroup_3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableImage__UnorderedGroup_3__Impl();
@@ -86502,27 +83331,27 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__UnorderedGroup_2"
-    // InternalTableDSL.g:26170:1: rule__TableAxis__UnorderedGroup_2 : ( rule__TableAxis__UnorderedGroup_2__0 )? ;
+    // InternalTableDSL.g:25277:1: rule__TableAxis__UnorderedGroup_2 : ( rule__TableAxis__UnorderedGroup_2__0 )? ;
     public final void rule__TableAxis__UnorderedGroup_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getTableAxisAccess().getUnorderedGroup_2());
         	
         try {
-            // InternalTableDSL.g:26175:1: ( ( rule__TableAxis__UnorderedGroup_2__0 )? )
-            // InternalTableDSL.g:26176:2: ( rule__TableAxis__UnorderedGroup_2__0 )?
+            // InternalTableDSL.g:25282:1: ( ( rule__TableAxis__UnorderedGroup_2__0 )? )
+            // InternalTableDSL.g:25283:2: ( rule__TableAxis__UnorderedGroup_2__0 )?
             {
-            // InternalTableDSL.g:26176:2: ( rule__TableAxis__UnorderedGroup_2__0 )?
-            int alt211=2;
-            int LA211_0 = input.LA(1);
+            // InternalTableDSL.g:25283:2: ( rule__TableAxis__UnorderedGroup_2__0 )?
+            int alt199=2;
+            int LA199_0 = input.LA(1);
 
-            if ( LA211_0 == 174 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0) ) {
-                alt211=1;
+            if ( LA199_0 == 173 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0) ) {
+                alt199=1;
             }
-            else if ( LA211_0 == 84 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 1) ) {
-                alt211=1;
+            else if ( LA199_0 == 84 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 1) ) {
+                alt199=1;
             }
-            switch (alt211) {
+            switch (alt199) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableAxis__UnorderedGroup_2__0
                     {
@@ -86557,57 +83386,57 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__UnorderedGroup_2__Impl"
-    // InternalTableDSL.g:26184:1: rule__TableAxis__UnorderedGroup_2__Impl : ( ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) ) ) ) ;
+    // InternalTableDSL.g:25291:1: rule__TableAxis__UnorderedGroup_2__Impl : ( ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) ) ) ) ;
     public final void rule__TableAxis__UnorderedGroup_2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
         	
         try {
-            // InternalTableDSL.g:26189:1: ( ( ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) ) ) ) )
-            // InternalTableDSL.g:26190:3: ( ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) ) ) )
+            // InternalTableDSL.g:25296:1: ( ( ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) ) ) ) )
+            // InternalTableDSL.g:25297:3: ( ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) ) ) )
             {
-            // InternalTableDSL.g:26190:3: ( ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) ) ) )
-            int alt212=2;
-            int LA212_0 = input.LA(1);
+            // InternalTableDSL.g:25297:3: ( ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) ) ) )
+            int alt200=2;
+            int LA200_0 = input.LA(1);
 
-            if ( LA212_0 == 174 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0) ) {
-                alt212=1;
+            if ( LA200_0 == 173 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0) ) {
+                alt200=1;
             }
-            else if ( LA212_0 == 84 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 1) ) {
-                alt212=2;
+            else if ( LA200_0 == 84 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 1) ) {
+                alt200=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 212, 0, input);
+                    new NoViableAltException("", 200, 0, input);
 
                 throw nvae;
             }
-            switch (alt212) {
+            switch (alt200) {
                 case 1 :
-                    // InternalTableDSL.g:26191:3: ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) )
+                    // InternalTableDSL.g:25298:3: ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) )
                     {
-                    // InternalTableDSL.g:26191:3: ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) )
-                    // InternalTableDSL.g:26192:4: {...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) )
+                    // InternalTableDSL.g:25298:3: ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) )
+                    // InternalTableDSL.g:25299:4: {...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableAxis__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0)");
                     }
-                    // InternalTableDSL.g:26192:105: ( ( ( rule__TableAxis__Group_2_0__0 ) ) )
-                    // InternalTableDSL.g:26193:5: ( ( rule__TableAxis__Group_2_0__0 ) )
+                    // InternalTableDSL.g:25299:105: ( ( ( rule__TableAxis__Group_2_0__0 ) ) )
+                    // InternalTableDSL.g:25300:5: ( ( rule__TableAxis__Group_2_0__0 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0);
                     selected = true;
-                    // InternalTableDSL.g:26199:5: ( ( rule__TableAxis__Group_2_0__0 ) )
-                    // InternalTableDSL.g:26200:6: ( rule__TableAxis__Group_2_0__0 )
+                    // InternalTableDSL.g:25306:5: ( ( rule__TableAxis__Group_2_0__0 ) )
+                    // InternalTableDSL.g:25307:6: ( rule__TableAxis__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableAxisAccess().getGroup_2_0()); 
                     }
-                    // InternalTableDSL.g:26201:6: ( rule__TableAxis__Group_2_0__0 )
-                    // InternalTableDSL.g:26201:7: rule__TableAxis__Group_2_0__0
+                    // InternalTableDSL.g:25308:6: ( rule__TableAxis__Group_2_0__0 )
+                    // InternalTableDSL.g:25308:7: rule__TableAxis__Group_2_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableAxis__Group_2_0__0();
@@ -86633,28 +83462,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:26206:3: ({...}? => ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) ) )
+                    // InternalTableDSL.g:25313:3: ({...}? => ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) ) )
                     {
-                    // InternalTableDSL.g:26206:3: ({...}? => ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) ) )
-                    // InternalTableDSL.g:26207:4: {...}? => ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) )
+                    // InternalTableDSL.g:25313:3: ({...}? => ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) ) )
+                    // InternalTableDSL.g:25314:4: {...}? => ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 1) ) {
                         if (state.backtracking>0) {state.failed=true; return ;}
                         throw new FailedPredicateException(input, "rule__TableAxis__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 1)");
                     }
-                    // InternalTableDSL.g:26207:105: ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) )
-                    // InternalTableDSL.g:26208:5: ( ( rule__TableAxis__PreOrderAssignment_2_1 ) )
+                    // InternalTableDSL.g:25314:105: ( ( ( rule__TableAxis__PreOrderAssignment_2_1 ) ) )
+                    // InternalTableDSL.g:25315:5: ( ( rule__TableAxis__PreOrderAssignment_2_1 ) )
                     {
                     getUnorderedGroupHelper().select(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 1);
                     selected = true;
-                    // InternalTableDSL.g:26214:5: ( ( rule__TableAxis__PreOrderAssignment_2_1 ) )
-                    // InternalTableDSL.g:26215:6: ( rule__TableAxis__PreOrderAssignment_2_1 )
+                    // InternalTableDSL.g:25321:5: ( ( rule__TableAxis__PreOrderAssignment_2_1 ) )
+                    // InternalTableDSL.g:25322:6: ( rule__TableAxis__PreOrderAssignment_2_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTableAxisAccess().getPreOrderAssignment_2_1()); 
                     }
-                    // InternalTableDSL.g:26216:6: ( rule__TableAxis__PreOrderAssignment_2_1 )
-                    // InternalTableDSL.g:26216:7: rule__TableAxis__PreOrderAssignment_2_1
+                    // InternalTableDSL.g:25323:6: ( rule__TableAxis__PreOrderAssignment_2_1 )
+                    // InternalTableDSL.g:25323:7: rule__TableAxis__PreOrderAssignment_2_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__TableAxis__PreOrderAssignment_2_1();
@@ -86703,31 +83532,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__UnorderedGroup_2__0"
-    // InternalTableDSL.g:26229:1: rule__TableAxis__UnorderedGroup_2__0 : rule__TableAxis__UnorderedGroup_2__Impl ( rule__TableAxis__UnorderedGroup_2__1 )? ;
+    // InternalTableDSL.g:25336:1: rule__TableAxis__UnorderedGroup_2__0 : rule__TableAxis__UnorderedGroup_2__Impl ( rule__TableAxis__UnorderedGroup_2__1 )? ;
     public final void rule__TableAxis__UnorderedGroup_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26233:1: ( rule__TableAxis__UnorderedGroup_2__Impl ( rule__TableAxis__UnorderedGroup_2__1 )? )
-            // InternalTableDSL.g:26234:2: rule__TableAxis__UnorderedGroup_2__Impl ( rule__TableAxis__UnorderedGroup_2__1 )?
+            // InternalTableDSL.g:25340:1: ( rule__TableAxis__UnorderedGroup_2__Impl ( rule__TableAxis__UnorderedGroup_2__1 )? )
+            // InternalTableDSL.g:25341:2: rule__TableAxis__UnorderedGroup_2__Impl ( rule__TableAxis__UnorderedGroup_2__1 )?
             {
-            pushFollow(FOLLOW_188);
+            pushFollow(FOLLOW_187);
             rule__TableAxis__UnorderedGroup_2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            // InternalTableDSL.g:26235:2: ( rule__TableAxis__UnorderedGroup_2__1 )?
-            int alt213=2;
-            int LA213_0 = input.LA(1);
+            // InternalTableDSL.g:25342:2: ( rule__TableAxis__UnorderedGroup_2__1 )?
+            int alt201=2;
+            int LA201_0 = input.LA(1);
 
-            if ( LA213_0 == 174 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0) ) {
-                alt213=1;
+            if ( LA201_0 == 173 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0) ) {
+                alt201=1;
             }
-            else if ( LA213_0 == 84 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 1) ) {
-                alt213=1;
+            else if ( LA201_0 == 84 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 1) ) {
+                alt201=1;
             }
-            switch (alt213) {
+            switch (alt201) {
                 case 1 :
                     // InternalTableDSL.g:0:0: rule__TableAxis__UnorderedGroup_2__1
                     {
@@ -86761,14 +83590,14 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__UnorderedGroup_2__1"
-    // InternalTableDSL.g:26241:1: rule__TableAxis__UnorderedGroup_2__1 : rule__TableAxis__UnorderedGroup_2__Impl ;
+    // InternalTableDSL.g:25348:1: rule__TableAxis__UnorderedGroup_2__1 : rule__TableAxis__UnorderedGroup_2__Impl ;
     public final void rule__TableAxis__UnorderedGroup_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26245:1: ( rule__TableAxis__UnorderedGroup_2__Impl )
-            // InternalTableDSL.g:26246:2: rule__TableAxis__UnorderedGroup_2__Impl
+            // InternalTableDSL.g:25352:1: ( rule__TableAxis__UnorderedGroup_2__Impl )
+            // InternalTableDSL.g:25353:2: rule__TableAxis__UnorderedGroup_2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TableAxis__UnorderedGroup_2__Impl();
@@ -86793,842 +83622,18 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     // $ANTLR end "rule__TableAxis__UnorderedGroup_2__1"
 
 
-    // $ANTLR start "rule__TableGrid__UnorderedGroup_2"
-    // InternalTableDSL.g:26253:1: rule__TableGrid__UnorderedGroup_2 : ( rule__TableGrid__UnorderedGroup_2__0 )? ;
-    public final void rule__TableGrid__UnorderedGroup_2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        		getUnorderedGroupHelper().enter(grammarAccess.getTableGridAccess().getUnorderedGroup_2());
-        	
-        try {
-            // InternalTableDSL.g:26258:1: ( ( rule__TableGrid__UnorderedGroup_2__0 )? )
-            // InternalTableDSL.g:26259:2: ( rule__TableGrid__UnorderedGroup_2__0 )?
-            {
-            // InternalTableDSL.g:26259:2: ( rule__TableGrid__UnorderedGroup_2__0 )?
-            int alt214=2;
-            int LA214_0 = input.LA(1);
-
-            if ( LA214_0 == 177 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0) ) {
-                alt214=1;
-            }
-            else if ( LA214_0 == 114 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 1) ) {
-                alt214=1;
-            }
-            switch (alt214) {
-                case 1 :
-                    // InternalTableDSL.g:0:0: rule__TableGrid__UnorderedGroup_2__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableGrid__UnorderedGroup_2__0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	getUnorderedGroupHelper().leave(grammarAccess.getTableGridAccess().getUnorderedGroup_2());
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__UnorderedGroup_2"
-
-
-    // $ANTLR start "rule__TableGrid__UnorderedGroup_2__Impl"
-    // InternalTableDSL.g:26267:1: rule__TableGrid__UnorderedGroup_2__Impl : ( ({...}? => ( ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__Group_2_1__0 ) ) ) ) ) ;
-    public final void rule__TableGrid__UnorderedGroup_2__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        		boolean selected = false;
-        	
-        try {
-            // InternalTableDSL.g:26272:1: ( ( ({...}? => ( ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__Group_2_1__0 ) ) ) ) ) )
-            // InternalTableDSL.g:26273:3: ( ({...}? => ( ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__Group_2_1__0 ) ) ) ) )
-            {
-            // InternalTableDSL.g:26273:3: ( ({...}? => ( ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__Group_2_1__0 ) ) ) ) )
-            int alt215=2;
-            int LA215_0 = input.LA(1);
-
-            if ( LA215_0 == 177 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0) ) {
-                alt215=1;
-            }
-            else if ( LA215_0 == 114 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 1) ) {
-                alt215=2;
-            }
-            else {
-                if (state.backtracking>0) {state.failed=true; return ;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 215, 0, input);
-
-                throw nvae;
-            }
-            switch (alt215) {
-                case 1 :
-                    // InternalTableDSL.g:26274:3: ({...}? => ( ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) ) ) )
-                    {
-                    // InternalTableDSL.g:26274:3: ({...}? => ( ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) ) ) )
-                    // InternalTableDSL.g:26275:4: {...}? => ( ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) ) )
-                    {
-                    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
-                        throw new FailedPredicateException(input, "rule__TableGrid__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0)");
-                    }
-                    // InternalTableDSL.g:26275:105: ( ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) ) )
-                    // InternalTableDSL.g:26276:5: ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) )
-                    {
-                    getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0);
-                    selected = true;
-                    // InternalTableDSL.g:26282:5: ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) )
-                    // InternalTableDSL.g:26283:6: ( rule__TableGrid__SelectalwaysAssignment_2_0 )
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableGridAccess().getSelectalwaysAssignment_2_0()); 
-                    }
-                    // InternalTableDSL.g:26284:6: ( rule__TableGrid__SelectalwaysAssignment_2_0 )
-                    // InternalTableDSL.g:26284:7: rule__TableGrid__SelectalwaysAssignment_2_0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableGrid__SelectalwaysAssignment_2_0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableGridAccess().getSelectalwaysAssignment_2_0()); 
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // InternalTableDSL.g:26289:3: ({...}? => ( ( ( rule__TableGrid__Group_2_1__0 ) ) ) )
-                    {
-                    // InternalTableDSL.g:26289:3: ({...}? => ( ( ( rule__TableGrid__Group_2_1__0 ) ) ) )
-                    // InternalTableDSL.g:26290:4: {...}? => ( ( ( rule__TableGrid__Group_2_1__0 ) ) )
-                    {
-                    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 1) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
-                        throw new FailedPredicateException(input, "rule__TableGrid__UnorderedGroup_2__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 1)");
-                    }
-                    // InternalTableDSL.g:26290:105: ( ( ( rule__TableGrid__Group_2_1__0 ) ) )
-                    // InternalTableDSL.g:26291:5: ( ( rule__TableGrid__Group_2_1__0 ) )
-                    {
-                    getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 1);
-                    selected = true;
-                    // InternalTableDSL.g:26297:5: ( ( rule__TableGrid__Group_2_1__0 ) )
-                    // InternalTableDSL.g:26298:6: ( rule__TableGrid__Group_2_1__0 )
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableGridAccess().getGroup_2_1()); 
-                    }
-                    // InternalTableDSL.g:26299:6: ( rule__TableGrid__Group_2_1__0 )
-                    // InternalTableDSL.g:26299:7: rule__TableGrid__Group_2_1__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableGrid__Group_2_1__0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableGridAccess().getGroup_2_1()); 
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	if (selected)
-            		getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_2());
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__UnorderedGroup_2__Impl"
-
-
-    // $ANTLR start "rule__TableGrid__UnorderedGroup_2__0"
-    // InternalTableDSL.g:26312:1: rule__TableGrid__UnorderedGroup_2__0 : rule__TableGrid__UnorderedGroup_2__Impl ( rule__TableGrid__UnorderedGroup_2__1 )? ;
-    public final void rule__TableGrid__UnorderedGroup_2__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:26316:1: ( rule__TableGrid__UnorderedGroup_2__Impl ( rule__TableGrid__UnorderedGroup_2__1 )? )
-            // InternalTableDSL.g:26317:2: rule__TableGrid__UnorderedGroup_2__Impl ( rule__TableGrid__UnorderedGroup_2__1 )?
-            {
-            pushFollow(FOLLOW_189);
-            rule__TableGrid__UnorderedGroup_2__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            // InternalTableDSL.g:26318:2: ( rule__TableGrid__UnorderedGroup_2__1 )?
-            int alt216=2;
-            int LA216_0 = input.LA(1);
-
-            if ( LA216_0 == 177 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0) ) {
-                alt216=1;
-            }
-            else if ( LA216_0 == 114 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 1) ) {
-                alt216=1;
-            }
-            switch (alt216) {
-                case 1 :
-                    // InternalTableDSL.g:0:0: rule__TableGrid__UnorderedGroup_2__1
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableGrid__UnorderedGroup_2__1();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__UnorderedGroup_2__0"
-
-
-    // $ANTLR start "rule__TableGrid__UnorderedGroup_2__1"
-    // InternalTableDSL.g:26324:1: rule__TableGrid__UnorderedGroup_2__1 : rule__TableGrid__UnorderedGroup_2__Impl ;
-    public final void rule__TableGrid__UnorderedGroup_2__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:26328:1: ( rule__TableGrid__UnorderedGroup_2__Impl )
-            // InternalTableDSL.g:26329:2: rule__TableGrid__UnorderedGroup_2__Impl
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__UnorderedGroup_2__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__UnorderedGroup_2__1"
-
-
-    // $ANTLR start "rule__TableGrid__UnorderedGroup_3"
-    // InternalTableDSL.g:26336:1: rule__TableGrid__UnorderedGroup_3 : ( rule__TableGrid__UnorderedGroup_3__0 )? ;
-    public final void rule__TableGrid__UnorderedGroup_3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        		getUnorderedGroupHelper().enter(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-        	
-        try {
-            // InternalTableDSL.g:26341:1: ( ( rule__TableGrid__UnorderedGroup_3__0 )? )
-            // InternalTableDSL.g:26342:2: ( rule__TableGrid__UnorderedGroup_3__0 )?
-            {
-            // InternalTableDSL.g:26342:2: ( rule__TableGrid__UnorderedGroup_3__0 )?
-            int alt217=2;
-            int LA217_0 = input.LA(1);
-
-            if ( LA217_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0) ) {
-                alt217=1;
-            }
-            else if ( LA217_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1) ) {
-                alt217=1;
-            }
-            else if ( LA217_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2) ) {
-                alt217=1;
-            }
-            else if ( LA217_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3) ) {
-                alt217=1;
-            }
-            switch (alt217) {
-                case 1 :
-                    // InternalTableDSL.g:0:0: rule__TableGrid__UnorderedGroup_3__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableGrid__UnorderedGroup_3__0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	getUnorderedGroupHelper().leave(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__UnorderedGroup_3"
-
-
-    // $ANTLR start "rule__TableGrid__UnorderedGroup_3__Impl"
-    // InternalTableDSL.g:26350:1: rule__TableGrid__UnorderedGroup_3__Impl : ( ({...}? => ( ( ( rule__TableGrid__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__FilteringAssignment_3_1 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__Group_3_3__0 ) ) ) ) ) ;
-    public final void rule__TableGrid__UnorderedGroup_3__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        		boolean selected = false;
-        	
-        try {
-            // InternalTableDSL.g:26355:1: ( ( ({...}? => ( ( ( rule__TableGrid__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__FilteringAssignment_3_1 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__Group_3_3__0 ) ) ) ) ) )
-            // InternalTableDSL.g:26356:3: ( ({...}? => ( ( ( rule__TableGrid__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__FilteringAssignment_3_1 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__Group_3_3__0 ) ) ) ) )
-            {
-            // InternalTableDSL.g:26356:3: ( ({...}? => ( ( ( rule__TableGrid__Group_3_0__0 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__FilteringAssignment_3_1 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) ) ) ) | ({...}? => ( ( ( rule__TableGrid__Group_3_3__0 ) ) ) ) )
-            int alt218=4;
-            int LA218_0 = input.LA(1);
-
-            if ( LA218_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0) ) {
-                alt218=1;
-            }
-            else if ( LA218_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1) ) {
-                alt218=2;
-            }
-            else if ( LA218_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2) ) {
-                alt218=3;
-            }
-            else if ( LA218_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3) ) {
-                alt218=4;
-            }
-            else {
-                if (state.backtracking>0) {state.failed=true; return ;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 218, 0, input);
-
-                throw nvae;
-            }
-            switch (alt218) {
-                case 1 :
-                    // InternalTableDSL.g:26357:3: ({...}? => ( ( ( rule__TableGrid__Group_3_0__0 ) ) ) )
-                    {
-                    // InternalTableDSL.g:26357:3: ({...}? => ( ( ( rule__TableGrid__Group_3_0__0 ) ) ) )
-                    // InternalTableDSL.g:26358:4: {...}? => ( ( ( rule__TableGrid__Group_3_0__0 ) ) )
-                    {
-                    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
-                        throw new FailedPredicateException(input, "rule__TableGrid__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0)");
-                    }
-                    // InternalTableDSL.g:26358:105: ( ( ( rule__TableGrid__Group_3_0__0 ) ) )
-                    // InternalTableDSL.g:26359:5: ( ( rule__TableGrid__Group_3_0__0 ) )
-                    {
-                    getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0);
-                    selected = true;
-                    // InternalTableDSL.g:26365:5: ( ( rule__TableGrid__Group_3_0__0 ) )
-                    // InternalTableDSL.g:26366:6: ( rule__TableGrid__Group_3_0__0 )
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableGridAccess().getGroup_3_0()); 
-                    }
-                    // InternalTableDSL.g:26367:6: ( rule__TableGrid__Group_3_0__0 )
-                    // InternalTableDSL.g:26367:7: rule__TableGrid__Group_3_0__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableGrid__Group_3_0__0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableGridAccess().getGroup_3_0()); 
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // InternalTableDSL.g:26372:3: ({...}? => ( ( ( rule__TableGrid__FilteringAssignment_3_1 ) ) ) )
-                    {
-                    // InternalTableDSL.g:26372:3: ({...}? => ( ( ( rule__TableGrid__FilteringAssignment_3_1 ) ) ) )
-                    // InternalTableDSL.g:26373:4: {...}? => ( ( ( rule__TableGrid__FilteringAssignment_3_1 ) ) )
-                    {
-                    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
-                        throw new FailedPredicateException(input, "rule__TableGrid__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1)");
-                    }
-                    // InternalTableDSL.g:26373:105: ( ( ( rule__TableGrid__FilteringAssignment_3_1 ) ) )
-                    // InternalTableDSL.g:26374:5: ( ( rule__TableGrid__FilteringAssignment_3_1 ) )
-                    {
-                    getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1);
-                    selected = true;
-                    // InternalTableDSL.g:26380:5: ( ( rule__TableGrid__FilteringAssignment_3_1 ) )
-                    // InternalTableDSL.g:26381:6: ( rule__TableGrid__FilteringAssignment_3_1 )
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableGridAccess().getFilteringAssignment_3_1()); 
-                    }
-                    // InternalTableDSL.g:26382:6: ( rule__TableGrid__FilteringAssignment_3_1 )
-                    // InternalTableDSL.g:26382:7: rule__TableGrid__FilteringAssignment_3_1
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableGrid__FilteringAssignment_3_1();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableGridAccess().getFilteringAssignment_3_1()); 
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // InternalTableDSL.g:26387:3: ({...}? => ( ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) ) ) )
-                    {
-                    // InternalTableDSL.g:26387:3: ({...}? => ( ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) ) ) )
-                    // InternalTableDSL.g:26388:4: {...}? => ( ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) ) )
-                    {
-                    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
-                        throw new FailedPredicateException(input, "rule__TableGrid__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2)");
-                    }
-                    // InternalTableDSL.g:26388:105: ( ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) ) )
-                    // InternalTableDSL.g:26389:5: ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) )
-                    {
-                    getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2);
-                    selected = true;
-                    // InternalTableDSL.g:26395:5: ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) )
-                    // InternalTableDSL.g:26396:6: ( rule__TableGrid__EmbeddedAssignment_3_2 )
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableGridAccess().getEmbeddedAssignment_3_2()); 
-                    }
-                    // InternalTableDSL.g:26397:6: ( rule__TableGrid__EmbeddedAssignment_3_2 )
-                    // InternalTableDSL.g:26397:7: rule__TableGrid__EmbeddedAssignment_3_2
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableGrid__EmbeddedAssignment_3_2();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableGridAccess().getEmbeddedAssignment_3_2()); 
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // InternalTableDSL.g:26402:3: ({...}? => ( ( ( rule__TableGrid__Group_3_3__0 ) ) ) )
-                    {
-                    // InternalTableDSL.g:26402:3: ({...}? => ( ( ( rule__TableGrid__Group_3_3__0 ) ) ) )
-                    // InternalTableDSL.g:26403:4: {...}? => ( ( ( rule__TableGrid__Group_3_3__0 ) ) )
-                    {
-                    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3) ) {
-                        if (state.backtracking>0) {state.failed=true; return ;}
-                        throw new FailedPredicateException(input, "rule__TableGrid__UnorderedGroup_3__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3)");
-                    }
-                    // InternalTableDSL.g:26403:105: ( ( ( rule__TableGrid__Group_3_3__0 ) ) )
-                    // InternalTableDSL.g:26404:5: ( ( rule__TableGrid__Group_3_3__0 ) )
-                    {
-                    getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3);
-                    selected = true;
-                    // InternalTableDSL.g:26410:5: ( ( rule__TableGrid__Group_3_3__0 ) )
-                    // InternalTableDSL.g:26411:6: ( rule__TableGrid__Group_3_3__0 )
-                    {
-                    if ( state.backtracking==0 ) {
-                       before(grammarAccess.getTableGridAccess().getGroup_3_3()); 
-                    }
-                    // InternalTableDSL.g:26412:6: ( rule__TableGrid__Group_3_3__0 )
-                    // InternalTableDSL.g:26412:7: rule__TableGrid__Group_3_3__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableGrid__Group_3_3__0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-
-                    if ( state.backtracking==0 ) {
-                       after(grammarAccess.getTableGridAccess().getGroup_3_3()); 
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	if (selected)
-            		getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__UnorderedGroup_3__Impl"
-
-
-    // $ANTLR start "rule__TableGrid__UnorderedGroup_3__0"
-    // InternalTableDSL.g:26425:1: rule__TableGrid__UnorderedGroup_3__0 : rule__TableGrid__UnorderedGroup_3__Impl ( rule__TableGrid__UnorderedGroup_3__1 )? ;
-    public final void rule__TableGrid__UnorderedGroup_3__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:26429:1: ( rule__TableGrid__UnorderedGroup_3__Impl ( rule__TableGrid__UnorderedGroup_3__1 )? )
-            // InternalTableDSL.g:26430:2: rule__TableGrid__UnorderedGroup_3__Impl ( rule__TableGrid__UnorderedGroup_3__1 )?
-            {
-            pushFollow(FOLLOW_190);
-            rule__TableGrid__UnorderedGroup_3__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            // InternalTableDSL.g:26431:2: ( rule__TableGrid__UnorderedGroup_3__1 )?
-            int alt219=2;
-            int LA219_0 = input.LA(1);
-
-            if ( LA219_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0) ) {
-                alt219=1;
-            }
-            else if ( LA219_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1) ) {
-                alt219=1;
-            }
-            else if ( LA219_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2) ) {
-                alt219=1;
-            }
-            else if ( LA219_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3) ) {
-                alt219=1;
-            }
-            switch (alt219) {
-                case 1 :
-                    // InternalTableDSL.g:0:0: rule__TableGrid__UnorderedGroup_3__1
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableGrid__UnorderedGroup_3__1();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__UnorderedGroup_3__0"
-
-
-    // $ANTLR start "rule__TableGrid__UnorderedGroup_3__1"
-    // InternalTableDSL.g:26437:1: rule__TableGrid__UnorderedGroup_3__1 : rule__TableGrid__UnorderedGroup_3__Impl ( rule__TableGrid__UnorderedGroup_3__2 )? ;
-    public final void rule__TableGrid__UnorderedGroup_3__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:26441:1: ( rule__TableGrid__UnorderedGroup_3__Impl ( rule__TableGrid__UnorderedGroup_3__2 )? )
-            // InternalTableDSL.g:26442:2: rule__TableGrid__UnorderedGroup_3__Impl ( rule__TableGrid__UnorderedGroup_3__2 )?
-            {
-            pushFollow(FOLLOW_190);
-            rule__TableGrid__UnorderedGroup_3__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            // InternalTableDSL.g:26443:2: ( rule__TableGrid__UnorderedGroup_3__2 )?
-            int alt220=2;
-            int LA220_0 = input.LA(1);
-
-            if ( LA220_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0) ) {
-                alt220=1;
-            }
-            else if ( LA220_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1) ) {
-                alt220=1;
-            }
-            else if ( LA220_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2) ) {
-                alt220=1;
-            }
-            else if ( LA220_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3) ) {
-                alt220=1;
-            }
-            switch (alt220) {
-                case 1 :
-                    // InternalTableDSL.g:0:0: rule__TableGrid__UnorderedGroup_3__2
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableGrid__UnorderedGroup_3__2();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__UnorderedGroup_3__1"
-
-
-    // $ANTLR start "rule__TableGrid__UnorderedGroup_3__2"
-    // InternalTableDSL.g:26449:1: rule__TableGrid__UnorderedGroup_3__2 : rule__TableGrid__UnorderedGroup_3__Impl ( rule__TableGrid__UnorderedGroup_3__3 )? ;
-    public final void rule__TableGrid__UnorderedGroup_3__2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:26453:1: ( rule__TableGrid__UnorderedGroup_3__Impl ( rule__TableGrid__UnorderedGroup_3__3 )? )
-            // InternalTableDSL.g:26454:2: rule__TableGrid__UnorderedGroup_3__Impl ( rule__TableGrid__UnorderedGroup_3__3 )?
-            {
-            pushFollow(FOLLOW_190);
-            rule__TableGrid__UnorderedGroup_3__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            // InternalTableDSL.g:26455:2: ( rule__TableGrid__UnorderedGroup_3__3 )?
-            int alt221=2;
-            int LA221_0 = input.LA(1);
-
-            if ( LA221_0 == 164 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0) ) {
-                alt221=1;
-            }
-            else if ( LA221_0 == 165 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1) ) {
-                alt221=1;
-            }
-            else if ( LA221_0 == 166 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2) ) {
-                alt221=1;
-            }
-            else if ( LA221_0 == 81 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3) ) {
-                alt221=1;
-            }
-            switch (alt221) {
-                case 1 :
-                    // InternalTableDSL.g:0:0: rule__TableGrid__UnorderedGroup_3__3
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__TableGrid__UnorderedGroup_3__3();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__UnorderedGroup_3__2"
-
-
-    // $ANTLR start "rule__TableGrid__UnorderedGroup_3__3"
-    // InternalTableDSL.g:26461:1: rule__TableGrid__UnorderedGroup_3__3 : rule__TableGrid__UnorderedGroup_3__Impl ;
-    public final void rule__TableGrid__UnorderedGroup_3__3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:26465:1: ( rule__TableGrid__UnorderedGroup_3__Impl )
-            // InternalTableDSL.g:26466:2: rule__TableGrid__UnorderedGroup_3__Impl
-            {
-            pushFollow(FOLLOW_2);
-            rule__TableGrid__UnorderedGroup_3__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__UnorderedGroup_3__3"
-
-
     // $ANTLR start "rule__TableModel__ImportSectionAssignment_0"
-    // InternalTableDSL.g:26473:1: rule__TableModel__ImportSectionAssignment_0 : ( ruleXImportSection ) ;
+    // InternalTableDSL.g:25360:1: rule__TableModel__ImportSectionAssignment_0 : ( ruleXImportSection ) ;
     public final void rule__TableModel__ImportSectionAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26477:1: ( ( ruleXImportSection ) )
-            // InternalTableDSL.g:26478:2: ( ruleXImportSection )
+            // InternalTableDSL.g:25364:1: ( ( ruleXImportSection ) )
+            // InternalTableDSL.g:25365:2: ( ruleXImportSection )
             {
-            // InternalTableDSL.g:26478:2: ( ruleXImportSection )
-            // InternalTableDSL.g:26479:3: ruleXImportSection
+            // InternalTableDSL.g:25365:2: ( ruleXImportSection )
+            // InternalTableDSL.g:25366:3: ruleXImportSection
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableModelAccess().getImportSectionXImportSectionParserRuleCall_0_0()); 
@@ -87663,17 +83668,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableModel__PackagesAssignment_1"
-    // InternalTableDSL.g:26488:1: rule__TableModel__PackagesAssignment_1 : ( ruleTablePackage ) ;
+    // InternalTableDSL.g:25375:1: rule__TableModel__PackagesAssignment_1 : ( ruleTablePackage ) ;
     public final void rule__TableModel__PackagesAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26492:1: ( ( ruleTablePackage ) )
-            // InternalTableDSL.g:26493:2: ( ruleTablePackage )
+            // InternalTableDSL.g:25379:1: ( ( ruleTablePackage ) )
+            // InternalTableDSL.g:25380:2: ( ruleTablePackage )
             {
-            // InternalTableDSL.g:26493:2: ( ruleTablePackage )
-            // InternalTableDSL.g:26494:3: ruleTablePackage
+            // InternalTableDSL.g:25380:2: ( ruleTablePackage )
+            // InternalTableDSL.g:25381:3: ruleTablePackage
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableModelAccess().getPackagesTablePackageParserRuleCall_1_0()); 
@@ -87708,17 +83713,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TablePackage__NameAssignment_2"
-    // InternalTableDSL.g:26503:1: rule__TablePackage__NameAssignment_2 : ( ruleQualifiedName ) ;
+    // InternalTableDSL.g:25390:1: rule__TablePackage__NameAssignment_2 : ( ruleQualifiedName ) ;
     public final void rule__TablePackage__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26507:1: ( ( ruleQualifiedName ) )
-            // InternalTableDSL.g:26508:2: ( ruleQualifiedName )
+            // InternalTableDSL.g:25394:1: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:25395:2: ( ruleQualifiedName )
             {
-            // InternalTableDSL.g:26508:2: ( ruleQualifiedName )
-            // InternalTableDSL.g:26509:3: ruleQualifiedName
+            // InternalTableDSL.g:25395:2: ( ruleQualifiedName )
+            // InternalTableDSL.g:25396:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTablePackageAccess().getNameQualifiedNameParserRuleCall_2_0()); 
@@ -87753,17 +83758,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TablePackage__TablesAssignment_3_1"
-    // InternalTableDSL.g:26518:1: rule__TablePackage__TablesAssignment_3_1 : ( ruleTable ) ;
+    // InternalTableDSL.g:25405:1: rule__TablePackage__TablesAssignment_3_1 : ( ruleTable ) ;
     public final void rule__TablePackage__TablesAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26522:1: ( ( ruleTable ) )
-            // InternalTableDSL.g:26523:2: ( ruleTable )
+            // InternalTableDSL.g:25409:1: ( ( ruleTable ) )
+            // InternalTableDSL.g:25410:2: ( ruleTable )
             {
-            // InternalTableDSL.g:26523:2: ( ruleTable )
-            // InternalTableDSL.g:26524:3: ruleTable
+            // InternalTableDSL.g:25410:2: ( ruleTable )
+            // InternalTableDSL.g:25411:3: ruleTable
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTablePackageAccess().getTablesTableParserRuleCall_3_1_0()); 
@@ -87798,17 +83803,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Table__NameAssignment_2"
-    // InternalTableDSL.g:26533:1: rule__Table__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalTableDSL.g:25420:1: rule__Table__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__Table__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26537:1: ( ( RULE_ID ) )
-            // InternalTableDSL.g:26538:2: ( RULE_ID )
+            // InternalTableDSL.g:25424:1: ( ( RULE_ID ) )
+            // InternalTableDSL.g:25425:2: ( RULE_ID )
             {
-            // InternalTableDSL.g:26538:2: ( RULE_ID )
-            // InternalTableDSL.g:26539:3: RULE_ID
+            // InternalTableDSL.g:25425:2: ( RULE_ID )
+            // InternalTableDSL.g:25426:3: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAccess().getNameIDTerminalRuleCall_2_0()); 
@@ -87839,23 +83844,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Table__DescriptionAssignment_3_0"
-    // InternalTableDSL.g:26548:1: rule__Table__DescriptionAssignment_3_0 : ( ( 'describedBy' ) ) ;
+    // InternalTableDSL.g:25435:1: rule__Table__DescriptionAssignment_3_0 : ( ( 'describedBy' ) ) ;
     public final void rule__Table__DescriptionAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26552:1: ( ( ( 'describedBy' ) ) )
-            // InternalTableDSL.g:26553:2: ( ( 'describedBy' ) )
+            // InternalTableDSL.g:25439:1: ( ( ( 'describedBy' ) ) )
+            // InternalTableDSL.g:25440:2: ( ( 'describedBy' ) )
             {
-            // InternalTableDSL.g:26553:2: ( ( 'describedBy' ) )
-            // InternalTableDSL.g:26554:3: ( 'describedBy' )
+            // InternalTableDSL.g:25440:2: ( ( 'describedBy' ) )
+            // InternalTableDSL.g:25441:3: ( 'describedBy' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAccess().getDescriptionDescribedByKeyword_3_0_0()); 
             }
-            // InternalTableDSL.g:26555:3: ( 'describedBy' )
-            // InternalTableDSL.g:26556:4: 'describedBy'
+            // InternalTableDSL.g:25442:3: ( 'describedBy' )
+            // InternalTableDSL.g:25443:4: 'describedBy'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAccess().getDescriptionDescribedByKeyword_3_0_0()); 
@@ -87892,17 +83897,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Table__DescriptionValueAssignment_3_1"
-    // InternalTableDSL.g:26567:1: rule__Table__DescriptionValueAssignment_3_1 : ( ruleTRANSLATABLESTRING ) ;
+    // InternalTableDSL.g:25454:1: rule__Table__DescriptionValueAssignment_3_1 : ( ruleTRANSLATABLESTRING ) ;
     public final void rule__Table__DescriptionValueAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26571:1: ( ( ruleTRANSLATABLESTRING ) )
-            // InternalTableDSL.g:26572:2: ( ruleTRANSLATABLESTRING )
+            // InternalTableDSL.g:25458:1: ( ( ruleTRANSLATABLESTRING ) )
+            // InternalTableDSL.g:25459:2: ( ruleTRANSLATABLESTRING )
             {
-            // InternalTableDSL.g:26572:2: ( ruleTRANSLATABLESTRING )
-            // InternalTableDSL.g:26573:3: ruleTRANSLATABLESTRING
+            // InternalTableDSL.g:25459:2: ( ruleTRANSLATABLESTRING )
+            // InternalTableDSL.g:25460:3: ruleTRANSLATABLESTRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAccess().getDescriptionValueTRANSLATABLESTRINGParserRuleCall_3_1_0()); 
@@ -87937,17 +83942,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Table__TabletypeAssignment_5"
-    // InternalTableDSL.g:26582:1: rule__Table__TabletypeAssignment_5 : ( ruleTableOption ) ;
+    // InternalTableDSL.g:25469:1: rule__Table__TabletypeAssignment_5 : ( ruleTableOption ) ;
     public final void rule__Table__TabletypeAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26586:1: ( ( ruleTableOption ) )
-            // InternalTableDSL.g:26587:2: ( ruleTableOption )
+            // InternalTableDSL.g:25473:1: ( ( ruleTableOption ) )
+            // InternalTableDSL.g:25474:2: ( ruleTableOption )
             {
-            // InternalTableDSL.g:26587:2: ( ruleTableOption )
-            // InternalTableDSL.g:26588:3: ruleTableOption
+            // InternalTableDSL.g:25474:2: ( ruleTableOption )
+            // InternalTableDSL.g:25475:3: ruleTableOption
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAccess().getTabletypeTableOptionParserRuleCall_5_0()); 
@@ -87982,23 +83987,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableSelection__MultiSelectionAssignment_2_0"
-    // InternalTableDSL.g:26597:1: rule__TableSelection__MultiSelectionAssignment_2_0 : ( ( 'multiple' ) ) ;
+    // InternalTableDSL.g:25484:1: rule__TableSelection__MultiSelectionAssignment_2_0 : ( ( 'multiple' ) ) ;
     public final void rule__TableSelection__MultiSelectionAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26601:1: ( ( ( 'multiple' ) ) )
-            // InternalTableDSL.g:26602:2: ( ( 'multiple' ) )
+            // InternalTableDSL.g:25488:1: ( ( ( 'multiple' ) ) )
+            // InternalTableDSL.g:25489:2: ( ( 'multiple' ) )
             {
-            // InternalTableDSL.g:26602:2: ( ( 'multiple' ) )
-            // InternalTableDSL.g:26603:3: ( 'multiple' )
+            // InternalTableDSL.g:25489:2: ( ( 'multiple' ) )
+            // InternalTableDSL.g:25490:3: ( 'multiple' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableSelectionAccess().getMultiSelectionMultipleKeyword_2_0_0()); 
             }
-            // InternalTableDSL.g:26604:3: ( 'multiple' )
-            // InternalTableDSL.g:26605:4: 'multiple'
+            // InternalTableDSL.g:25491:3: ( 'multiple' )
+            // InternalTableDSL.g:25492:4: 'multiple'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableSelectionAccess().getMultiSelectionMultipleKeyword_2_0_0()); 
@@ -88035,23 +84040,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableSelection__SelectalwaysAssignment_3_0"
-    // InternalTableDSL.g:26616:1: rule__TableSelection__SelectalwaysAssignment_3_0 : ( ( 'alwaysSelected' ) ) ;
+    // InternalTableDSL.g:25503:1: rule__TableSelection__SelectalwaysAssignment_3_0 : ( ( 'alwaysSelected' ) ) ;
     public final void rule__TableSelection__SelectalwaysAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26620:1: ( ( ( 'alwaysSelected' ) ) )
-            // InternalTableDSL.g:26621:2: ( ( 'alwaysSelected' ) )
+            // InternalTableDSL.g:25507:1: ( ( ( 'alwaysSelected' ) ) )
+            // InternalTableDSL.g:25508:2: ( ( 'alwaysSelected' ) )
             {
-            // InternalTableDSL.g:26621:2: ( ( 'alwaysSelected' ) )
-            // InternalTableDSL.g:26622:3: ( 'alwaysSelected' )
+            // InternalTableDSL.g:25508:2: ( ( 'alwaysSelected' ) )
+            // InternalTableDSL.g:25509:3: ( 'alwaysSelected' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableSelectionAccess().getSelectalwaysAlwaysSelectedKeyword_3_0_0()); 
             }
-            // InternalTableDSL.g:26623:3: ( 'alwaysSelected' )
-            // InternalTableDSL.g:26624:4: 'alwaysSelected'
+            // InternalTableDSL.g:25510:3: ( 'alwaysSelected' )
+            // InternalTableDSL.g:25511:4: 'alwaysSelected'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableSelectionAccess().getSelectalwaysAlwaysSelectedKeyword_3_0_0()); 
@@ -88088,17 +84093,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableSelection__HeaderModeAssignment_3_1_1"
-    // InternalTableDSL.g:26635:1: rule__TableSelection__HeaderModeAssignment_3_1_1 : ( ruleRowHeaderMode ) ;
+    // InternalTableDSL.g:25522:1: rule__TableSelection__HeaderModeAssignment_3_1_1 : ( ruleRowHeaderMode ) ;
     public final void rule__TableSelection__HeaderModeAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26639:1: ( ( ruleRowHeaderMode ) )
-            // InternalTableDSL.g:26640:2: ( ruleRowHeaderMode )
+            // InternalTableDSL.g:25526:1: ( ( ruleRowHeaderMode ) )
+            // InternalTableDSL.g:25527:2: ( ruleRowHeaderMode )
             {
-            // InternalTableDSL.g:26640:2: ( ruleRowHeaderMode )
-            // InternalTableDSL.g:26641:3: ruleRowHeaderMode
+            // InternalTableDSL.g:25527:2: ( ruleRowHeaderMode )
+            // InternalTableDSL.g:25528:3: ruleRowHeaderMode
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableSelectionAccess().getHeaderModeRowHeaderModeEnumRuleCall_3_1_1_0()); 
@@ -88132,82 +84137,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     // $ANTLR end "rule__TableSelection__HeaderModeAssignment_3_1_1"
 
 
-    // $ANTLR start "rule__TableSelection__PollingAssignment_3_2_0"
-    // InternalTableDSL.g:26650:1: rule__TableSelection__PollingAssignment_3_2_0 : ( ( 'polling' ) ) ;
-    public final void rule__TableSelection__PollingAssignment_3_2_0() throws RecognitionException {
+    // $ANTLR start "rule__TableSelection__FilteringAssignment_3_2"
+    // InternalTableDSL.g:25537:1: rule__TableSelection__FilteringAssignment_3_2 : ( ( 'filtering' ) ) ;
+    public final void rule__TableSelection__FilteringAssignment_3_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26654:1: ( ( ( 'polling' ) ) )
-            // InternalTableDSL.g:26655:2: ( ( 'polling' ) )
+            // InternalTableDSL.g:25541:1: ( ( ( 'filtering' ) ) )
+            // InternalTableDSL.g:25542:2: ( ( 'filtering' ) )
             {
-            // InternalTableDSL.g:26655:2: ( ( 'polling' ) )
-            // InternalTableDSL.g:26656:3: ( 'polling' )
+            // InternalTableDSL.g:25542:2: ( ( 'filtering' ) )
+            // InternalTableDSL.g:25543:3: ( 'filtering' )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableSelectionAccess().getPollingPollingKeyword_3_2_0_0()); 
+               before(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_2_0()); 
             }
-            // InternalTableDSL.g:26657:3: ( 'polling' )
-            // InternalTableDSL.g:26658:4: 'polling'
+            // InternalTableDSL.g:25544:3: ( 'filtering' )
+            // InternalTableDSL.g:25545:4: 'filtering'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableSelectionAccess().getPollingPollingKeyword_3_2_0_0()); 
+               before(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_2_0()); 
             }
             match(input,164,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableSelectionAccess().getPollingPollingKeyword_3_2_0_0()); 
-            }
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableSelectionAccess().getPollingPollingKeyword_3_2_0_0()); 
-            }
-
+               after(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_2_0()); 
             }
 
-
             }
 
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableSelection__PollingAssignment_3_2_0"
-
-
-    // $ANTLR start "rule__TableSelection__PollingTimeAssignment_3_2_1"
-    // InternalTableDSL.g:26669:1: rule__TableSelection__PollingTimeAssignment_3_2_1 : ( ruleNumber ) ;
-    public final void rule__TableSelection__PollingTimeAssignment_3_2_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:26673:1: ( ( ruleNumber ) )
-            // InternalTableDSL.g:26674:2: ( ruleNumber )
-            {
-            // InternalTableDSL.g:26674:2: ( ruleNumber )
-            // InternalTableDSL.g:26675:3: ruleNumber
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableSelectionAccess().getPollingTimeNumberParserRuleCall_3_2_1_0()); 
-            }
-            pushFollow(FOLLOW_2);
-            ruleNumber();
-
-            state._fsp--;
-            if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableSelectionAccess().getPollingTimeNumberParserRuleCall_3_2_1_0()); 
+               after(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_2_0()); 
             }
 
             }
@@ -88227,40 +84187,40 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableSelection__PollingTimeAssignment_3_2_1"
+    // $ANTLR end "rule__TableSelection__FilteringAssignment_3_2"
 
 
-    // $ANTLR start "rule__TableSelection__FilteringAssignment_3_3"
-    // InternalTableDSL.g:26684:1: rule__TableSelection__FilteringAssignment_3_3 : ( ( 'filtering' ) ) ;
-    public final void rule__TableSelection__FilteringAssignment_3_3() throws RecognitionException {
+    // $ANTLR start "rule__TableSelection__EmbeddedAssignment_3_3"
+    // InternalTableDSL.g:25556:1: rule__TableSelection__EmbeddedAssignment_3_3 : ( ( 'embedded' ) ) ;
+    public final void rule__TableSelection__EmbeddedAssignment_3_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26688:1: ( ( ( 'filtering' ) ) )
-            // InternalTableDSL.g:26689:2: ( ( 'filtering' ) )
+            // InternalTableDSL.g:25560:1: ( ( ( 'embedded' ) ) )
+            // InternalTableDSL.g:25561:2: ( ( 'embedded' ) )
             {
-            // InternalTableDSL.g:26689:2: ( ( 'filtering' ) )
-            // InternalTableDSL.g:26690:3: ( 'filtering' )
+            // InternalTableDSL.g:25561:2: ( ( 'embedded' ) )
+            // InternalTableDSL.g:25562:3: ( 'embedded' )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_3_0()); 
+               before(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_3_0()); 
             }
-            // InternalTableDSL.g:26691:3: ( 'filtering' )
-            // InternalTableDSL.g:26692:4: 'filtering'
+            // InternalTableDSL.g:25563:3: ( 'embedded' )
+            // InternalTableDSL.g:25564:4: 'embedded'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_3_0()); 
+               before(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_3_0()); 
             }
             match(input,165,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_3_0()); 
+               after(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_3_0()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_3_0()); 
+               after(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_3_0()); 
             }
 
             }
@@ -88280,93 +84240,40 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableSelection__FilteringAssignment_3_3"
+    // $ANTLR end "rule__TableSelection__EmbeddedAssignment_3_3"
 
 
-    // $ANTLR start "rule__TableSelection__EmbeddedAssignment_3_4"
-    // InternalTableDSL.g:26703:1: rule__TableSelection__EmbeddedAssignment_3_4 : ( ( 'embedded' ) ) ;
-    public final void rule__TableSelection__EmbeddedAssignment_3_4() throws RecognitionException {
+    // $ANTLR start "rule__TableSelection__ToolbarAssignment_3_4_1"
+    // InternalTableDSL.g:25575:1: rule__TableSelection__ToolbarAssignment_3_4_1 : ( ( RULE_ID ) ) ;
+    public final void rule__TableSelection__ToolbarAssignment_3_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26707:1: ( ( ( 'embedded' ) ) )
-            // InternalTableDSL.g:26708:2: ( ( 'embedded' ) )
+            // InternalTableDSL.g:25579:1: ( ( ( RULE_ID ) ) )
+            // InternalTableDSL.g:25580:2: ( ( RULE_ID ) )
             {
-            // InternalTableDSL.g:26708:2: ( ( 'embedded' ) )
-            // InternalTableDSL.g:26709:3: ( 'embedded' )
+            // InternalTableDSL.g:25580:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:25581:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_4_0()); 
+               before(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarCrossReference_3_4_1_0()); 
             }
-            // InternalTableDSL.g:26710:3: ( 'embedded' )
-            // InternalTableDSL.g:26711:4: 'embedded'
+            // InternalTableDSL.g:25582:3: ( RULE_ID )
+            // InternalTableDSL.g:25583:4: RULE_ID
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_4_0()); 
-            }
-            match(input,166,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_4_0()); 
-            }
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_4_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableSelection__EmbeddedAssignment_3_4"
-
-
-    // $ANTLR start "rule__TableSelection__ToolbarAssignment_3_5_1"
-    // InternalTableDSL.g:26722:1: rule__TableSelection__ToolbarAssignment_3_5_1 : ( ( RULE_ID ) ) ;
-    public final void rule__TableSelection__ToolbarAssignment_3_5_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:26726:1: ( ( ( RULE_ID ) ) )
-            // InternalTableDSL.g:26727:2: ( ( RULE_ID ) )
-            {
-            // InternalTableDSL.g:26727:2: ( ( RULE_ID ) )
-            // InternalTableDSL.g:26728:3: ( RULE_ID )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarCrossReference_3_5_1_0()); 
-            }
-            // InternalTableDSL.g:26729:3: ( RULE_ID )
-            // InternalTableDSL.g:26730:4: RULE_ID
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarIDTerminalRuleCall_3_5_1_0_1()); 
+               before(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarIDTerminalRuleCall_3_4_1_0_1()); 
             }
             match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarIDTerminalRuleCall_3_5_1_0_1()); 
+               after(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarIDTerminalRuleCall_3_4_1_0_1()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarCrossReference_3_5_1_0()); 
+               after(grammarAccess.getTableSelectionAccess().getToolbarActionToolbarCrossReference_3_4_1_0()); 
             }
 
             }
@@ -88386,21 +84293,21 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableSelection__ToolbarAssignment_3_5_1"
+    // $ANTLR end "rule__TableSelection__ToolbarAssignment_3_4_1"
 
 
     // $ANTLR start "rule__TableSelection__SourceAssignment_4_1"
-    // InternalTableDSL.g:26741:1: rule__TableSelection__SourceAssignment_4_1 : ( ruleTableDatamart ) ;
+    // InternalTableDSL.g:25594:1: rule__TableSelection__SourceAssignment_4_1 : ( ruleTableDatamart ) ;
     public final void rule__TableSelection__SourceAssignment_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26745:1: ( ( ruleTableDatamart ) )
-            // InternalTableDSL.g:26746:2: ( ruleTableDatamart )
+            // InternalTableDSL.g:25598:1: ( ( ruleTableDatamart ) )
+            // InternalTableDSL.g:25599:2: ( ruleTableDatamart )
             {
-            // InternalTableDSL.g:26746:2: ( ruleTableDatamart )
-            // InternalTableDSL.g:26747:3: ruleTableDatamart
+            // InternalTableDSL.g:25599:2: ( ruleTableDatamart )
+            // InternalTableDSL.g:25600:3: ruleTableDatamart
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableSelectionAccess().getSourceTableDatamartParserRuleCall_4_1_0()); 
@@ -88435,23 +84342,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__SelectalwaysAssignment_2_0"
-    // InternalTableDSL.g:26756:1: rule__TableTable__SelectalwaysAssignment_2_0 : ( ( 'alwaysSelected' ) ) ;
+    // InternalTableDSL.g:25609:1: rule__TableTable__SelectalwaysAssignment_2_0 : ( ( 'alwaysSelected' ) ) ;
     public final void rule__TableTable__SelectalwaysAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26760:1: ( ( ( 'alwaysSelected' ) ) )
-            // InternalTableDSL.g:26761:2: ( ( 'alwaysSelected' ) )
+            // InternalTableDSL.g:25613:1: ( ( ( 'alwaysSelected' ) ) )
+            // InternalTableDSL.g:25614:2: ( ( 'alwaysSelected' ) )
             {
-            // InternalTableDSL.g:26761:2: ( ( 'alwaysSelected' ) )
-            // InternalTableDSL.g:26762:3: ( 'alwaysSelected' )
+            // InternalTableDSL.g:25614:2: ( ( 'alwaysSelected' ) )
+            // InternalTableDSL.g:25615:3: ( 'alwaysSelected' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTableAccess().getSelectalwaysAlwaysSelectedKeyword_2_0_0()); 
             }
-            // InternalTableDSL.g:26763:3: ( 'alwaysSelected' )
-            // InternalTableDSL.g:26764:4: 'alwaysSelected'
+            // InternalTableDSL.g:25616:3: ( 'alwaysSelected' )
+            // InternalTableDSL.g:25617:4: 'alwaysSelected'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTableAccess().getSelectalwaysAlwaysSelectedKeyword_2_0_0()); 
@@ -88488,28 +84395,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__SelectByIdAssignment_2_1"
-    // InternalTableDSL.g:26775:1: rule__TableTable__SelectByIdAssignment_2_1 : ( ( 'selectById' ) ) ;
+    // InternalTableDSL.g:25628:1: rule__TableTable__SelectByIdAssignment_2_1 : ( ( 'selectById' ) ) ;
     public final void rule__TableTable__SelectByIdAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26779:1: ( ( ( 'selectById' ) ) )
-            // InternalTableDSL.g:26780:2: ( ( 'selectById' ) )
+            // InternalTableDSL.g:25632:1: ( ( ( 'selectById' ) ) )
+            // InternalTableDSL.g:25633:2: ( ( 'selectById' ) )
             {
-            // InternalTableDSL.g:26780:2: ( ( 'selectById' ) )
-            // InternalTableDSL.g:26781:3: ( 'selectById' )
+            // InternalTableDSL.g:25633:2: ( ( 'selectById' ) )
+            // InternalTableDSL.g:25634:3: ( 'selectById' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTableAccess().getSelectByIdSelectByIdKeyword_2_1_0()); 
             }
-            // InternalTableDSL.g:26782:3: ( 'selectById' )
-            // InternalTableDSL.g:26783:4: 'selectById'
+            // InternalTableDSL.g:25635:3: ( 'selectById' )
+            // InternalTableDSL.g:25636:4: 'selectById'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTableAccess().getSelectByIdSelectByIdKeyword_2_1_0()); 
             }
-            match(input,167,FOLLOW_2); if (state.failed) return ;
+            match(input,166,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTableTableAccess().getSelectByIdSelectByIdKeyword_2_1_0()); 
             }
@@ -88541,17 +84448,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTable__HeaderModeAssignment_2_2_1"
-    // InternalTableDSL.g:26794:1: rule__TableTable__HeaderModeAssignment_2_2_1 : ( ruleRowHeaderMode ) ;
+    // InternalTableDSL.g:25647:1: rule__TableTable__HeaderModeAssignment_2_2_1 : ( ruleRowHeaderMode ) ;
     public final void rule__TableTable__HeaderModeAssignment_2_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26798:1: ( ( ruleRowHeaderMode ) )
-            // InternalTableDSL.g:26799:2: ( ruleRowHeaderMode )
+            // InternalTableDSL.g:25651:1: ( ( ruleRowHeaderMode ) )
+            // InternalTableDSL.g:25652:2: ( ruleRowHeaderMode )
             {
-            // InternalTableDSL.g:26799:2: ( ruleRowHeaderMode )
-            // InternalTableDSL.g:26800:3: ruleRowHeaderMode
+            // InternalTableDSL.g:25652:2: ( ruleRowHeaderMode )
+            // InternalTableDSL.g:25653:3: ruleRowHeaderMode
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTableAccess().getHeaderModeRowHeaderModeEnumRuleCall_2_2_1_0()); 
@@ -88585,37 +84492,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     // $ANTLR end "rule__TableTable__HeaderModeAssignment_2_2_1"
 
 
-    // $ANTLR start "rule__TableTable__PollingAssignment_2_3_0"
-    // InternalTableDSL.g:26809:1: rule__TableTable__PollingAssignment_2_3_0 : ( ( 'polling' ) ) ;
-    public final void rule__TableTable__PollingAssignment_2_3_0() throws RecognitionException {
+    // $ANTLR start "rule__TableTable__FilteringAssignment_2_3"
+    // InternalTableDSL.g:25662:1: rule__TableTable__FilteringAssignment_2_3 : ( ( 'filtering' ) ) ;
+    public final void rule__TableTable__FilteringAssignment_2_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26813:1: ( ( ( 'polling' ) ) )
-            // InternalTableDSL.g:26814:2: ( ( 'polling' ) )
+            // InternalTableDSL.g:25666:1: ( ( ( 'filtering' ) ) )
+            // InternalTableDSL.g:25667:2: ( ( 'filtering' ) )
             {
-            // InternalTableDSL.g:26814:2: ( ( 'polling' ) )
-            // InternalTableDSL.g:26815:3: ( 'polling' )
+            // InternalTableDSL.g:25667:2: ( ( 'filtering' ) )
+            // InternalTableDSL.g:25668:3: ( 'filtering' )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableTableAccess().getPollingPollingKeyword_2_3_0_0()); 
+               before(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_3_0()); 
             }
-            // InternalTableDSL.g:26816:3: ( 'polling' )
-            // InternalTableDSL.g:26817:4: 'polling'
+            // InternalTableDSL.g:25669:3: ( 'filtering' )
+            // InternalTableDSL.g:25670:4: 'filtering'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableTableAccess().getPollingPollingKeyword_2_3_0_0()); 
+               before(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_3_0()); 
             }
             match(input,164,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableTableAccess().getPollingPollingKeyword_2_3_0_0()); 
+               after(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_3_0()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableTableAccess().getPollingPollingKeyword_2_3_0_0()); 
+               after(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_3_0()); 
             }
 
             }
@@ -88635,85 +84542,40 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableTable__PollingAssignment_2_3_0"
+    // $ANTLR end "rule__TableTable__FilteringAssignment_2_3"
 
 
-    // $ANTLR start "rule__TableTable__PollingTimeAssignment_2_3_1"
-    // InternalTableDSL.g:26828:1: rule__TableTable__PollingTimeAssignment_2_3_1 : ( ruleNumber ) ;
-    public final void rule__TableTable__PollingTimeAssignment_2_3_1() throws RecognitionException {
+    // $ANTLR start "rule__TableTable__EmbeddedAssignment_2_4"
+    // InternalTableDSL.g:25681:1: rule__TableTable__EmbeddedAssignment_2_4 : ( ( 'embedded' ) ) ;
+    public final void rule__TableTable__EmbeddedAssignment_2_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26832:1: ( ( ruleNumber ) )
-            // InternalTableDSL.g:26833:2: ( ruleNumber )
+            // InternalTableDSL.g:25685:1: ( ( ( 'embedded' ) ) )
+            // InternalTableDSL.g:25686:2: ( ( 'embedded' ) )
             {
-            // InternalTableDSL.g:26833:2: ( ruleNumber )
-            // InternalTableDSL.g:26834:3: ruleNumber
+            // InternalTableDSL.g:25686:2: ( ( 'embedded' ) )
+            // InternalTableDSL.g:25687:3: ( 'embedded' )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableTableAccess().getPollingTimeNumberParserRuleCall_2_3_1_0()); 
+               before(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_4_0()); 
             }
-            pushFollow(FOLLOW_2);
-            ruleNumber();
-
-            state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableTableAccess().getPollingTimeNumberParserRuleCall_2_3_1_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableTable__PollingTimeAssignment_2_3_1"
-
-
-    // $ANTLR start "rule__TableTable__FilteringAssignment_2_4"
-    // InternalTableDSL.g:26843:1: rule__TableTable__FilteringAssignment_2_4 : ( ( 'filtering' ) ) ;
-    public final void rule__TableTable__FilteringAssignment_2_4() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:26847:1: ( ( ( 'filtering' ) ) )
-            // InternalTableDSL.g:26848:2: ( ( 'filtering' ) )
-            {
-            // InternalTableDSL.g:26848:2: ( ( 'filtering' ) )
-            // InternalTableDSL.g:26849:3: ( 'filtering' )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_4_0()); 
-            }
-            // InternalTableDSL.g:26850:3: ( 'filtering' )
-            // InternalTableDSL.g:26851:4: 'filtering'
+            // InternalTableDSL.g:25688:3: ( 'embedded' )
+            // InternalTableDSL.g:25689:4: 'embedded'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_4_0()); 
+               before(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_4_0()); 
             }
             match(input,165,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_4_0()); 
+               after(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_4_0()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_4_0()); 
+               after(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_4_0()); 
             }
 
             }
@@ -88733,93 +84595,40 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableTable__FilteringAssignment_2_4"
+    // $ANTLR end "rule__TableTable__EmbeddedAssignment_2_4"
 
 
-    // $ANTLR start "rule__TableTable__EmbeddedAssignment_2_5"
-    // InternalTableDSL.g:26862:1: rule__TableTable__EmbeddedAssignment_2_5 : ( ( 'embedded' ) ) ;
-    public final void rule__TableTable__EmbeddedAssignment_2_5() throws RecognitionException {
+    // $ANTLR start "rule__TableTable__ToolbarAssignment_2_5_1"
+    // InternalTableDSL.g:25700:1: rule__TableTable__ToolbarAssignment_2_5_1 : ( ( RULE_ID ) ) ;
+    public final void rule__TableTable__ToolbarAssignment_2_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26866:1: ( ( ( 'embedded' ) ) )
-            // InternalTableDSL.g:26867:2: ( ( 'embedded' ) )
+            // InternalTableDSL.g:25704:1: ( ( ( RULE_ID ) ) )
+            // InternalTableDSL.g:25705:2: ( ( RULE_ID ) )
             {
-            // InternalTableDSL.g:26867:2: ( ( 'embedded' ) )
-            // InternalTableDSL.g:26868:3: ( 'embedded' )
+            // InternalTableDSL.g:25705:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:25706:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_5_0()); 
+               before(grammarAccess.getTableTableAccess().getToolbarActionToolbarCrossReference_2_5_1_0()); 
             }
-            // InternalTableDSL.g:26869:3: ( 'embedded' )
-            // InternalTableDSL.g:26870:4: 'embedded'
+            // InternalTableDSL.g:25707:3: ( RULE_ID )
+            // InternalTableDSL.g:25708:4: RULE_ID
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_5_0()); 
-            }
-            match(input,166,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_5_0()); 
-            }
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_5_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableTable__EmbeddedAssignment_2_5"
-
-
-    // $ANTLR start "rule__TableTable__ToolbarAssignment_2_6_1"
-    // InternalTableDSL.g:26881:1: rule__TableTable__ToolbarAssignment_2_6_1 : ( ( RULE_ID ) ) ;
-    public final void rule__TableTable__ToolbarAssignment_2_6_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:26885:1: ( ( ( RULE_ID ) ) )
-            // InternalTableDSL.g:26886:2: ( ( RULE_ID ) )
-            {
-            // InternalTableDSL.g:26886:2: ( ( RULE_ID ) )
-            // InternalTableDSL.g:26887:3: ( RULE_ID )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableTableAccess().getToolbarActionToolbarCrossReference_2_6_1_0()); 
-            }
-            // InternalTableDSL.g:26888:3: ( RULE_ID )
-            // InternalTableDSL.g:26889:4: RULE_ID
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableTableAccess().getToolbarActionToolbarIDTerminalRuleCall_2_6_1_0_1()); 
+               before(grammarAccess.getTableTableAccess().getToolbarActionToolbarIDTerminalRuleCall_2_5_1_0_1()); 
             }
             match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableTableAccess().getToolbarActionToolbarIDTerminalRuleCall_2_6_1_0_1()); 
+               after(grammarAccess.getTableTableAccess().getToolbarActionToolbarIDTerminalRuleCall_2_5_1_0_1()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableTableAccess().getToolbarActionToolbarCrossReference_2_6_1_0()); 
+               after(grammarAccess.getTableTableAccess().getToolbarActionToolbarCrossReference_2_5_1_0()); 
             }
 
             }
@@ -88839,21 +84648,21 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableTable__ToolbarAssignment_2_6_1"
+    // $ANTLR end "rule__TableTable__ToolbarAssignment_2_5_1"
 
 
     // $ANTLR start "rule__TableTable__SourceAssignment_3_1"
-    // InternalTableDSL.g:26900:1: rule__TableTable__SourceAssignment_3_1 : ( ruleTableDatamart ) ;
+    // InternalTableDSL.g:25719:1: rule__TableTable__SourceAssignment_3_1 : ( ruleTableDatamart ) ;
     public final void rule__TableTable__SourceAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:26904:1: ( ( ruleTableDatamart ) )
-            // InternalTableDSL.g:26905:2: ( ruleTableDatamart )
+            // InternalTableDSL.g:25723:1: ( ( ruleTableDatamart ) )
+            // InternalTableDSL.g:25724:2: ( ruleTableDatamart )
             {
-            // InternalTableDSL.g:26905:2: ( ruleTableDatamart )
-            // InternalTableDSL.g:26906:3: ruleTableDatamart
+            // InternalTableDSL.g:25724:2: ( ruleTableDatamart )
+            // InternalTableDSL.g:25725:3: ruleTableDatamart
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTableAccess().getSourceTableDatamartParserRuleCall_3_1_0()); 
@@ -88887,471 +84696,18 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     // $ANTLR end "rule__TableTable__SourceAssignment_3_1"
 
 
-    // $ANTLR start "rule__TableBean__SelectalwaysAssignment_2_0"
-    // InternalTableDSL.g:26915:1: rule__TableBean__SelectalwaysAssignment_2_0 : ( ( 'alwaysSelected' ) ) ;
-    public final void rule__TableBean__SelectalwaysAssignment_2_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:26919:1: ( ( ( 'alwaysSelected' ) ) )
-            // InternalTableDSL.g:26920:2: ( ( 'alwaysSelected' ) )
-            {
-            // InternalTableDSL.g:26920:2: ( ( 'alwaysSelected' ) )
-            // InternalTableDSL.g:26921:3: ( 'alwaysSelected' )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getSelectalwaysAlwaysSelectedKeyword_2_0_0()); 
-            }
-            // InternalTableDSL.g:26922:3: ( 'alwaysSelected' )
-            // InternalTableDSL.g:26923:4: 'alwaysSelected'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getSelectalwaysAlwaysSelectedKeyword_2_0_0()); 
-            }
-            match(input,163,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getSelectalwaysAlwaysSelectedKeyword_2_0_0()); 
-            }
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getSelectalwaysAlwaysSelectedKeyword_2_0_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__SelectalwaysAssignment_2_0"
-
-
-    // $ANTLR start "rule__TableBean__SelectByIdAssignment_2_1"
-    // InternalTableDSL.g:26934:1: rule__TableBean__SelectByIdAssignment_2_1 : ( ( 'selectById' ) ) ;
-    public final void rule__TableBean__SelectByIdAssignment_2_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:26938:1: ( ( ( 'selectById' ) ) )
-            // InternalTableDSL.g:26939:2: ( ( 'selectById' ) )
-            {
-            // InternalTableDSL.g:26939:2: ( ( 'selectById' ) )
-            // InternalTableDSL.g:26940:3: ( 'selectById' )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getSelectByIdSelectByIdKeyword_2_1_0()); 
-            }
-            // InternalTableDSL.g:26941:3: ( 'selectById' )
-            // InternalTableDSL.g:26942:4: 'selectById'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getSelectByIdSelectByIdKeyword_2_1_0()); 
-            }
-            match(input,167,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getSelectByIdSelectByIdKeyword_2_1_0()); 
-            }
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getSelectByIdSelectByIdKeyword_2_1_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__SelectByIdAssignment_2_1"
-
-
-    // $ANTLR start "rule__TableBean__HeaderModeAssignment_2_2_1"
-    // InternalTableDSL.g:26953:1: rule__TableBean__HeaderModeAssignment_2_2_1 : ( ruleRowHeaderMode ) ;
-    public final void rule__TableBean__HeaderModeAssignment_2_2_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:26957:1: ( ( ruleRowHeaderMode ) )
-            // InternalTableDSL.g:26958:2: ( ruleRowHeaderMode )
-            {
-            // InternalTableDSL.g:26958:2: ( ruleRowHeaderMode )
-            // InternalTableDSL.g:26959:3: ruleRowHeaderMode
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getHeaderModeRowHeaderModeEnumRuleCall_2_2_1_0()); 
-            }
-            pushFollow(FOLLOW_2);
-            ruleRowHeaderMode();
-
-            state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getHeaderModeRowHeaderModeEnumRuleCall_2_2_1_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__HeaderModeAssignment_2_2_1"
-
-
-    // $ANTLR start "rule__TableBean__PollingAssignment_2_3_0"
-    // InternalTableDSL.g:26968:1: rule__TableBean__PollingAssignment_2_3_0 : ( ( 'polling' ) ) ;
-    public final void rule__TableBean__PollingAssignment_2_3_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:26972:1: ( ( ( 'polling' ) ) )
-            // InternalTableDSL.g:26973:2: ( ( 'polling' ) )
-            {
-            // InternalTableDSL.g:26973:2: ( ( 'polling' ) )
-            // InternalTableDSL.g:26974:3: ( 'polling' )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getPollingPollingKeyword_2_3_0_0()); 
-            }
-            // InternalTableDSL.g:26975:3: ( 'polling' )
-            // InternalTableDSL.g:26976:4: 'polling'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getPollingPollingKeyword_2_3_0_0()); 
-            }
-            match(input,164,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getPollingPollingKeyword_2_3_0_0()); 
-            }
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getPollingPollingKeyword_2_3_0_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__PollingAssignment_2_3_0"
-
-
-    // $ANTLR start "rule__TableBean__PollingTimeAssignment_2_3_1"
-    // InternalTableDSL.g:26987:1: rule__TableBean__PollingTimeAssignment_2_3_1 : ( ruleNumber ) ;
-    public final void rule__TableBean__PollingTimeAssignment_2_3_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:26991:1: ( ( ruleNumber ) )
-            // InternalTableDSL.g:26992:2: ( ruleNumber )
-            {
-            // InternalTableDSL.g:26992:2: ( ruleNumber )
-            // InternalTableDSL.g:26993:3: ruleNumber
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getPollingTimeNumberParserRuleCall_2_3_1_0()); 
-            }
-            pushFollow(FOLLOW_2);
-            ruleNumber();
-
-            state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getPollingTimeNumberParserRuleCall_2_3_1_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__PollingTimeAssignment_2_3_1"
-
-
-    // $ANTLR start "rule__TableBean__FilteringAssignment_2_4"
-    // InternalTableDSL.g:27002:1: rule__TableBean__FilteringAssignment_2_4 : ( ( 'filtering' ) ) ;
-    public final void rule__TableBean__FilteringAssignment_2_4() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:27006:1: ( ( ( 'filtering' ) ) )
-            // InternalTableDSL.g:27007:2: ( ( 'filtering' ) )
-            {
-            // InternalTableDSL.g:27007:2: ( ( 'filtering' ) )
-            // InternalTableDSL.g:27008:3: ( 'filtering' )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getFilteringFilteringKeyword_2_4_0()); 
-            }
-            // InternalTableDSL.g:27009:3: ( 'filtering' )
-            // InternalTableDSL.g:27010:4: 'filtering'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getFilteringFilteringKeyword_2_4_0()); 
-            }
-            match(input,165,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getFilteringFilteringKeyword_2_4_0()); 
-            }
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getFilteringFilteringKeyword_2_4_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__FilteringAssignment_2_4"
-
-
-    // $ANTLR start "rule__TableBean__EmbeddedAssignment_2_5"
-    // InternalTableDSL.g:27021:1: rule__TableBean__EmbeddedAssignment_2_5 : ( ( 'embedded' ) ) ;
-    public final void rule__TableBean__EmbeddedAssignment_2_5() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:27025:1: ( ( ( 'embedded' ) ) )
-            // InternalTableDSL.g:27026:2: ( ( 'embedded' ) )
-            {
-            // InternalTableDSL.g:27026:2: ( ( 'embedded' ) )
-            // InternalTableDSL.g:27027:3: ( 'embedded' )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getEmbeddedEmbeddedKeyword_2_5_0()); 
-            }
-            // InternalTableDSL.g:27028:3: ( 'embedded' )
-            // InternalTableDSL.g:27029:4: 'embedded'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getEmbeddedEmbeddedKeyword_2_5_0()); 
-            }
-            match(input,166,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getEmbeddedEmbeddedKeyword_2_5_0()); 
-            }
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getEmbeddedEmbeddedKeyword_2_5_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__EmbeddedAssignment_2_5"
-
-
-    // $ANTLR start "rule__TableBean__ToolbarAssignment_2_6_1"
-    // InternalTableDSL.g:27040:1: rule__TableBean__ToolbarAssignment_2_6_1 : ( ( RULE_ID ) ) ;
-    public final void rule__TableBean__ToolbarAssignment_2_6_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:27044:1: ( ( ( RULE_ID ) ) )
-            // InternalTableDSL.g:27045:2: ( ( RULE_ID ) )
-            {
-            // InternalTableDSL.g:27045:2: ( ( RULE_ID ) )
-            // InternalTableDSL.g:27046:3: ( RULE_ID )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getToolbarActionToolbarCrossReference_2_6_1_0()); 
-            }
-            // InternalTableDSL.g:27047:3: ( RULE_ID )
-            // InternalTableDSL.g:27048:4: RULE_ID
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getToolbarActionToolbarIDTerminalRuleCall_2_6_1_0_1()); 
-            }
-            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getToolbarActionToolbarIDTerminalRuleCall_2_6_1_0_1()); 
-            }
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getToolbarActionToolbarCrossReference_2_6_1_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__ToolbarAssignment_2_6_1"
-
-
-    // $ANTLR start "rule__TableBean__SourceAssignment_3_1"
-    // InternalTableDSL.g:27059:1: rule__TableBean__SourceAssignment_3_1 : ( ruleTableDatamart ) ;
-    public final void rule__TableBean__SourceAssignment_3_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:27063:1: ( ( ruleTableDatamart ) )
-            // InternalTableDSL.g:27064:2: ( ruleTableDatamart )
-            {
-            // InternalTableDSL.g:27064:2: ( ruleTableDatamart )
-            // InternalTableDSL.g:27065:3: ruleTableDatamart
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableBeanAccess().getSourceTableDatamartParserRuleCall_3_1_0()); 
-            }
-            pushFollow(FOLLOW_2);
-            ruleTableDatamart();
-
-            state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableBeanAccess().getSourceTableDatamartParserRuleCall_3_1_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableBean__SourceAssignment_3_1"
-
-
     // $ANTLR start "rule__TablePreorder__ColumnAssignment_2"
-    // InternalTableDSL.g:27074:1: rule__TablePreorder__ColumnAssignment_2 : ( ruleTableValueElement ) ;
+    // InternalTableDSL.g:25734:1: rule__TablePreorder__ColumnAssignment_2 : ( ruleTableValueElement ) ;
     public final void rule__TablePreorder__ColumnAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27078:1: ( ( ruleTableValueElement ) )
-            // InternalTableDSL.g:27079:2: ( ruleTableValueElement )
+            // InternalTableDSL.g:25738:1: ( ( ruleTableValueElement ) )
+            // InternalTableDSL.g:25739:2: ( ruleTableValueElement )
             {
-            // InternalTableDSL.g:27079:2: ( ruleTableValueElement )
-            // InternalTableDSL.g:27080:3: ruleTableValueElement
+            // InternalTableDSL.g:25739:2: ( ruleTableValueElement )
+            // InternalTableDSL.g:25740:3: ruleTableValueElement
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTablePreorderAccess().getColumnTableValueElementParserRuleCall_2_0()); 
@@ -89386,28 +84742,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TablePreorder__AscendingAssignment_3"
-    // InternalTableDSL.g:27089:1: rule__TablePreorder__AscendingAssignment_3 : ( ( 'ascending' ) ) ;
+    // InternalTableDSL.g:25749:1: rule__TablePreorder__AscendingAssignment_3 : ( ( 'ascending' ) ) ;
     public final void rule__TablePreorder__AscendingAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27093:1: ( ( ( 'ascending' ) ) )
-            // InternalTableDSL.g:27094:2: ( ( 'ascending' ) )
+            // InternalTableDSL.g:25753:1: ( ( ( 'ascending' ) ) )
+            // InternalTableDSL.g:25754:2: ( ( 'ascending' ) )
             {
-            // InternalTableDSL.g:27094:2: ( ( 'ascending' ) )
-            // InternalTableDSL.g:27095:3: ( 'ascending' )
+            // InternalTableDSL.g:25754:2: ( ( 'ascending' ) )
+            // InternalTableDSL.g:25755:3: ( 'ascending' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTablePreorderAccess().getAscendingAscendingKeyword_3_0()); 
             }
-            // InternalTableDSL.g:27096:3: ( 'ascending' )
-            // InternalTableDSL.g:27097:4: 'ascending'
+            // InternalTableDSL.g:25756:3: ( 'ascending' )
+            // InternalTableDSL.g:25757:4: 'ascending'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTablePreorderAccess().getAscendingAscendingKeyword_3_0()); 
             }
-            match(input,168,FOLLOW_2); if (state.failed) return ;
+            match(input,167,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTablePreorderAccess().getAscendingAscendingKeyword_3_0()); 
             }
@@ -89439,17 +84795,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__ColumnAssignment_2"
-    // InternalTableDSL.g:27108:1: rule__TableValue__ColumnAssignment_2 : ( ruleTableValueElement ) ;
+    // InternalTableDSL.g:25768:1: rule__TableValue__ColumnAssignment_2 : ( ruleTableValueElement ) ;
     public final void rule__TableValue__ColumnAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27112:1: ( ( ruleTableValueElement ) )
-            // InternalTableDSL.g:27113:2: ( ruleTableValueElement )
+            // InternalTableDSL.g:25772:1: ( ( ruleTableValueElement ) )
+            // InternalTableDSL.g:25773:2: ( ruleTableValueElement )
             {
-            // InternalTableDSL.g:27113:2: ( ruleTableValueElement )
-            // InternalTableDSL.g:27114:3: ruleTableValueElement
+            // InternalTableDSL.g:25773:2: ( ruleTableValueElement )
+            // InternalTableDSL.g:25774:3: ruleTableValueElement
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getColumnTableValueElementParserRuleCall_2_0()); 
@@ -89484,28 +84840,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__CollapsedAssignment_3_0"
-    // InternalTableDSL.g:27123:1: rule__TableValue__CollapsedAssignment_3_0 : ( ( 'collapse' ) ) ;
+    // InternalTableDSL.g:25783:1: rule__TableValue__CollapsedAssignment_3_0 : ( ( 'collapse' ) ) ;
     public final void rule__TableValue__CollapsedAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27127:1: ( ( ( 'collapse' ) ) )
-            // InternalTableDSL.g:27128:2: ( ( 'collapse' ) )
+            // InternalTableDSL.g:25787:1: ( ( ( 'collapse' ) ) )
+            // InternalTableDSL.g:25788:2: ( ( 'collapse' ) )
             {
-            // InternalTableDSL.g:27128:2: ( ( 'collapse' ) )
-            // InternalTableDSL.g:27129:3: ( 'collapse' )
+            // InternalTableDSL.g:25788:2: ( ( 'collapse' ) )
+            // InternalTableDSL.g:25789:3: ( 'collapse' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getCollapsedCollapseKeyword_3_0_0()); 
             }
-            // InternalTableDSL.g:27130:3: ( 'collapse' )
-            // InternalTableDSL.g:27131:4: 'collapse'
+            // InternalTableDSL.g:25790:3: ( 'collapse' )
+            // InternalTableDSL.g:25791:4: 'collapse'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getCollapsedCollapseKeyword_3_0_0()); 
             }
-            match(input,169,FOLLOW_2); if (state.failed) return ;
+            match(input,168,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTableValueAccess().getCollapsedCollapseKeyword_3_0_0()); 
             }
@@ -89537,17 +84893,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__IconNameAssignment_3_1_1"
-    // InternalTableDSL.g:27142:1: rule__TableValue__IconNameAssignment_3_1_1 : ( RULE_STRING ) ;
+    // InternalTableDSL.g:25802:1: rule__TableValue__IconNameAssignment_3_1_1 : ( RULE_STRING ) ;
     public final void rule__TableValue__IconNameAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27146:1: ( ( RULE_STRING ) )
-            // InternalTableDSL.g:27147:2: ( RULE_STRING )
+            // InternalTableDSL.g:25806:1: ( ( RULE_STRING ) )
+            // InternalTableDSL.g:25807:2: ( RULE_STRING )
             {
-            // InternalTableDSL.g:27147:2: ( RULE_STRING )
-            // InternalTableDSL.g:27148:3: RULE_STRING
+            // InternalTableDSL.g:25807:2: ( RULE_STRING )
+            // InternalTableDSL.g:25808:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getIconNameSTRINGTerminalRuleCall_3_1_1_0()); 
@@ -89578,17 +84934,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__FormatterAssignment_3_2"
-    // InternalTableDSL.g:27157:1: rule__TableValue__FormatterAssignment_3_2 : ( ruleTableFormatter ) ;
+    // InternalTableDSL.g:25817:1: rule__TableValue__FormatterAssignment_3_2 : ( ruleTableFormatter ) ;
     public final void rule__TableValue__FormatterAssignment_3_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27161:1: ( ( ruleTableFormatter ) )
-            // InternalTableDSL.g:27162:2: ( ruleTableFormatter )
+            // InternalTableDSL.g:25821:1: ( ( ruleTableFormatter ) )
+            // InternalTableDSL.g:25822:2: ( ruleTableFormatter )
             {
-            // InternalTableDSL.g:27162:2: ( ruleTableFormatter )
-            // InternalTableDSL.g:27163:3: ruleTableFormatter
+            // InternalTableDSL.g:25822:2: ( ruleTableFormatter )
+            // InternalTableDSL.g:25823:3: ruleTableFormatter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getFormatterTableFormatterParserRuleCall_3_2_0()); 
@@ -89623,28 +84979,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__HasImageAssignment_3_3_0"
-    // InternalTableDSL.g:27172:1: rule__TableValue__HasImageAssignment_3_3_0 : ( ( 'image' ) ) ;
+    // InternalTableDSL.g:25832:1: rule__TableValue__HasImageAssignment_3_3_0 : ( ( 'image' ) ) ;
     public final void rule__TableValue__HasImageAssignment_3_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27176:1: ( ( ( 'image' ) ) )
-            // InternalTableDSL.g:27177:2: ( ( 'image' ) )
+            // InternalTableDSL.g:25836:1: ( ( ( 'image' ) ) )
+            // InternalTableDSL.g:25837:2: ( ( 'image' ) )
             {
-            // InternalTableDSL.g:27177:2: ( ( 'image' ) )
-            // InternalTableDSL.g:27178:3: ( 'image' )
+            // InternalTableDSL.g:25837:2: ( ( 'image' ) )
+            // InternalTableDSL.g:25838:3: ( 'image' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getHasImageImageKeyword_3_3_0_0()); 
             }
-            // InternalTableDSL.g:27179:3: ( 'image' )
-            // InternalTableDSL.g:27180:4: 'image'
+            // InternalTableDSL.g:25839:3: ( 'image' )
+            // InternalTableDSL.g:25840:4: 'image'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getHasImageImageKeyword_3_3_0_0()); 
             }
-            match(input,170,FOLLOW_2); if (state.failed) return ;
+            match(input,169,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTableValueAccess().getHasImageImageKeyword_3_3_0_0()); 
             }
@@ -89676,17 +85032,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__ImageAssignment_3_3_1"
-    // InternalTableDSL.g:27191:1: rule__TableValue__ImageAssignment_3_3_1 : ( ruleTableImage ) ;
+    // InternalTableDSL.g:25851:1: rule__TableValue__ImageAssignment_3_3_1 : ( ruleTableImage ) ;
     public final void rule__TableValue__ImageAssignment_3_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27195:1: ( ( ruleTableImage ) )
-            // InternalTableDSL.g:27196:2: ( ruleTableImage )
+            // InternalTableDSL.g:25855:1: ( ( ruleTableImage ) )
+            // InternalTableDSL.g:25856:2: ( ruleTableImage )
             {
-            // InternalTableDSL.g:27196:2: ( ruleTableImage )
-            // InternalTableDSL.g:27197:3: ruleTableImage
+            // InternalTableDSL.g:25856:2: ( ruleTableImage )
+            // InternalTableDSL.g:25857:3: ruleTableImage
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getImageTableImageParserRuleCall_3_3_1_0()); 
@@ -89721,17 +85077,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__TooltipPatternAssignment_3_4"
-    // InternalTableDSL.g:27206:1: rule__TableValue__TooltipPatternAssignment_3_4 : ( ruleTableTooltipPattern ) ;
+    // InternalTableDSL.g:25866:1: rule__TableValue__TooltipPatternAssignment_3_4 : ( ruleTableTooltipPattern ) ;
     public final void rule__TableValue__TooltipPatternAssignment_3_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27210:1: ( ( ruleTableTooltipPattern ) )
-            // InternalTableDSL.g:27211:2: ( ruleTableTooltipPattern )
+            // InternalTableDSL.g:25870:1: ( ( ruleTableTooltipPattern ) )
+            // InternalTableDSL.g:25871:2: ( ruleTableTooltipPattern )
             {
-            // InternalTableDSL.g:27211:2: ( ruleTableTooltipPattern )
-            // InternalTableDSL.g:27212:3: ruleTableTooltipPattern
+            // InternalTableDSL.g:25871:2: ( ruleTableTooltipPattern )
+            // InternalTableDSL.g:25872:3: ruleTableTooltipPattern
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getTooltipPatternTableTooltipPatternParserRuleCall_3_4_0()); 
@@ -89766,28 +85122,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__HideLabelIntervalAssignment_4_0_1"
-    // InternalTableDSL.g:27221:1: rule__TableValue__HideLabelIntervalAssignment_4_0_1 : ( ( 'hidelabel' ) ) ;
+    // InternalTableDSL.g:25881:1: rule__TableValue__HideLabelIntervalAssignment_4_0_1 : ( ( 'hidelabel' ) ) ;
     public final void rule__TableValue__HideLabelIntervalAssignment_4_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27225:1: ( ( ( 'hidelabel' ) ) )
-            // InternalTableDSL.g:27226:2: ( ( 'hidelabel' ) )
+            // InternalTableDSL.g:25885:1: ( ( ( 'hidelabel' ) ) )
+            // InternalTableDSL.g:25886:2: ( ( 'hidelabel' ) )
             {
-            // InternalTableDSL.g:27226:2: ( ( 'hidelabel' ) )
-            // InternalTableDSL.g:27227:3: ( 'hidelabel' )
+            // InternalTableDSL.g:25886:2: ( ( 'hidelabel' ) )
+            // InternalTableDSL.g:25887:3: ( 'hidelabel' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getHideLabelIntervalHidelabelKeyword_4_0_1_0()); 
             }
-            // InternalTableDSL.g:27228:3: ( 'hidelabel' )
-            // InternalTableDSL.g:27229:4: 'hidelabel'
+            // InternalTableDSL.g:25888:3: ( 'hidelabel' )
+            // InternalTableDSL.g:25889:4: 'hidelabel'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getHideLabelIntervalHidelabelKeyword_4_0_1_0()); 
             }
-            match(input,171,FOLLOW_2); if (state.failed) return ;
+            match(input,170,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTableValueAccess().getHideLabelIntervalHidelabelKeyword_4_0_1_0()); 
             }
@@ -89819,17 +85175,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__IntervalsAssignment_4_0_3"
-    // InternalTableDSL.g:27240:1: rule__TableValue__IntervalsAssignment_4_0_3 : ( ruleTableInterval ) ;
+    // InternalTableDSL.g:25900:1: rule__TableValue__IntervalsAssignment_4_0_3 : ( ruleTableInterval ) ;
     public final void rule__TableValue__IntervalsAssignment_4_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27244:1: ( ( ruleTableInterval ) )
-            // InternalTableDSL.g:27245:2: ( ruleTableInterval )
+            // InternalTableDSL.g:25904:1: ( ( ruleTableInterval ) )
+            // InternalTableDSL.g:25905:2: ( ruleTableInterval )
             {
-            // InternalTableDSL.g:27245:2: ( ruleTableInterval )
-            // InternalTableDSL.g:27246:3: ruleTableInterval
+            // InternalTableDSL.g:25905:2: ( ruleTableInterval )
+            // InternalTableDSL.g:25906:3: ruleTableInterval
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getIntervalsTableIntervalParserRuleCall_4_0_3_0()); 
@@ -89864,28 +85220,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__HideLabelLookupAssignment_4_1_1"
-    // InternalTableDSL.g:27255:1: rule__TableValue__HideLabelLookupAssignment_4_1_1 : ( ( 'hidelabel' ) ) ;
+    // InternalTableDSL.g:25915:1: rule__TableValue__HideLabelLookupAssignment_4_1_1 : ( ( 'hidelabel' ) ) ;
     public final void rule__TableValue__HideLabelLookupAssignment_4_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27259:1: ( ( ( 'hidelabel' ) ) )
-            // InternalTableDSL.g:27260:2: ( ( 'hidelabel' ) )
+            // InternalTableDSL.g:25919:1: ( ( ( 'hidelabel' ) ) )
+            // InternalTableDSL.g:25920:2: ( ( 'hidelabel' ) )
             {
-            // InternalTableDSL.g:27260:2: ( ( 'hidelabel' ) )
-            // InternalTableDSL.g:27261:3: ( 'hidelabel' )
+            // InternalTableDSL.g:25920:2: ( ( 'hidelabel' ) )
+            // InternalTableDSL.g:25921:3: ( 'hidelabel' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getHideLabelLookupHidelabelKeyword_4_1_1_0()); 
             }
-            // InternalTableDSL.g:27262:3: ( 'hidelabel' )
-            // InternalTableDSL.g:27263:4: 'hidelabel'
+            // InternalTableDSL.g:25922:3: ( 'hidelabel' )
+            // InternalTableDSL.g:25923:4: 'hidelabel'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getHideLabelLookupHidelabelKeyword_4_1_1_0()); 
             }
-            match(input,171,FOLLOW_2); if (state.failed) return ;
+            match(input,170,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTableValueAccess().getHideLabelLookupHidelabelKeyword_4_1_1_0()); 
             }
@@ -89917,17 +85273,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableValue__LookupsAssignment_4_1_3"
-    // InternalTableDSL.g:27274:1: rule__TableValue__LookupsAssignment_4_1_3 : ( ruleTableLookup ) ;
+    // InternalTableDSL.g:25934:1: rule__TableValue__LookupsAssignment_4_1_3 : ( ruleTableLookup ) ;
     public final void rule__TableValue__LookupsAssignment_4_1_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27278:1: ( ( ruleTableLookup ) )
-            // InternalTableDSL.g:27279:2: ( ruleTableLookup )
+            // InternalTableDSL.g:25938:1: ( ( ruleTableLookup ) )
+            // InternalTableDSL.g:25939:2: ( ruleTableLookup )
             {
-            // InternalTableDSL.g:27279:2: ( ruleTableLookup )
-            // InternalTableDSL.g:27280:3: ruleTableLookup
+            // InternalTableDSL.g:25939:2: ( ruleTableLookup )
+            // InternalTableDSL.g:25940:3: ruleTableLookup
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableValueAccess().getLookupsTableLookupParserRuleCall_4_1_3_0()); 
@@ -89962,17 +85318,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableFormatter__FormatAssignment_2"
-    // InternalTableDSL.g:27289:1: rule__TableFormatter__FormatAssignment_2 : ( RULE_STRING ) ;
+    // InternalTableDSL.g:25949:1: rule__TableFormatter__FormatAssignment_2 : ( RULE_STRING ) ;
     public final void rule__TableFormatter__FormatAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27293:1: ( ( RULE_STRING ) )
-            // InternalTableDSL.g:27294:2: ( RULE_STRING )
+            // InternalTableDSL.g:25953:1: ( ( RULE_STRING ) )
+            // InternalTableDSL.g:25954:2: ( RULE_STRING )
             {
-            // InternalTableDSL.g:27294:2: ( RULE_STRING )
-            // InternalTableDSL.g:27295:3: RULE_STRING
+            // InternalTableDSL.g:25954:2: ( RULE_STRING )
+            // InternalTableDSL.g:25955:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableFormatterAccess().getFormatSTRINGTerminalRuleCall_2_0()); 
@@ -90003,17 +85359,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__ImagePathPatternAssignment_2"
-    // InternalTableDSL.g:27304:1: rule__TableImage__ImagePathPatternAssignment_2 : ( RULE_STRING ) ;
+    // InternalTableDSL.g:25964:1: rule__TableImage__ImagePathPatternAssignment_2 : ( RULE_STRING ) ;
     public final void rule__TableImage__ImagePathPatternAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27308:1: ( ( RULE_STRING ) )
-            // InternalTableDSL.g:27309:2: ( RULE_STRING )
+            // InternalTableDSL.g:25968:1: ( ( RULE_STRING ) )
+            // InternalTableDSL.g:25969:2: ( RULE_STRING )
             {
-            // InternalTableDSL.g:27309:2: ( RULE_STRING )
-            // InternalTableDSL.g:27310:3: RULE_STRING
+            // InternalTableDSL.g:25969:2: ( RULE_STRING )
+            // InternalTableDSL.g:25970:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageAccess().getImagePathPatternSTRINGTerminalRuleCall_2_0()); 
@@ -90044,28 +85400,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__HasParameterAssignment_3_0"
-    // InternalTableDSL.g:27319:1: rule__TableImage__HasParameterAssignment_3_0 : ( ( 'dynamic' ) ) ;
+    // InternalTableDSL.g:25979:1: rule__TableImage__HasParameterAssignment_3_0 : ( ( 'dynamic' ) ) ;
     public final void rule__TableImage__HasParameterAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27323:1: ( ( ( 'dynamic' ) ) )
-            // InternalTableDSL.g:27324:2: ( ( 'dynamic' ) )
+            // InternalTableDSL.g:25983:1: ( ( ( 'dynamic' ) ) )
+            // InternalTableDSL.g:25984:2: ( ( 'dynamic' ) )
             {
-            // InternalTableDSL.g:27324:2: ( ( 'dynamic' ) )
-            // InternalTableDSL.g:27325:3: ( 'dynamic' )
+            // InternalTableDSL.g:25984:2: ( ( 'dynamic' ) )
+            // InternalTableDSL.g:25985:3: ( 'dynamic' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageAccess().getHasParameterDynamicKeyword_3_0_0()); 
             }
-            // InternalTableDSL.g:27326:3: ( 'dynamic' )
-            // InternalTableDSL.g:27327:4: 'dynamic'
+            // InternalTableDSL.g:25986:3: ( 'dynamic' )
+            // InternalTableDSL.g:25987:4: 'dynamic'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageAccess().getHasParameterDynamicKeyword_3_0_0()); 
             }
-            match(input,172,FOLLOW_2); if (state.failed) return ;
+            match(input,171,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTableImageAccess().getHasParameterDynamicKeyword_3_0_0()); 
             }
@@ -90097,28 +85453,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__HideImageLabelAssignment_3_1"
-    // InternalTableDSL.g:27338:1: rule__TableImage__HideImageLabelAssignment_3_1 : ( ( 'hidelabel' ) ) ;
+    // InternalTableDSL.g:25998:1: rule__TableImage__HideImageLabelAssignment_3_1 : ( ( 'hidelabel' ) ) ;
     public final void rule__TableImage__HideImageLabelAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27342:1: ( ( ( 'hidelabel' ) ) )
-            // InternalTableDSL.g:27343:2: ( ( 'hidelabel' ) )
+            // InternalTableDSL.g:26002:1: ( ( ( 'hidelabel' ) ) )
+            // InternalTableDSL.g:26003:2: ( ( 'hidelabel' ) )
             {
-            // InternalTableDSL.g:27343:2: ( ( 'hidelabel' ) )
-            // InternalTableDSL.g:27344:3: ( 'hidelabel' )
+            // InternalTableDSL.g:26003:2: ( ( 'hidelabel' ) )
+            // InternalTableDSL.g:26004:3: ( 'hidelabel' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageAccess().getHideImageLabelHidelabelKeyword_3_1_0()); 
             }
-            // InternalTableDSL.g:27345:3: ( 'hidelabel' )
-            // InternalTableDSL.g:27346:4: 'hidelabel'
+            // InternalTableDSL.g:26005:3: ( 'hidelabel' )
+            // InternalTableDSL.g:26006:4: 'hidelabel'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageAccess().getHideImageLabelHidelabelKeyword_3_1_0()); 
             }
-            match(input,171,FOLLOW_2); if (state.failed) return ;
+            match(input,170,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTableImageAccess().getHideImageLabelHidelabelKeyword_3_1_0()); 
             }
@@ -90150,28 +85506,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__ResizeAssignment_3_2_0"
-    // InternalTableDSL.g:27357:1: rule__TableImage__ResizeAssignment_3_2_0 : ( ( 'resize' ) ) ;
+    // InternalTableDSL.g:26017:1: rule__TableImage__ResizeAssignment_3_2_0 : ( ( 'resize' ) ) ;
     public final void rule__TableImage__ResizeAssignment_3_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27361:1: ( ( ( 'resize' ) ) )
-            // InternalTableDSL.g:27362:2: ( ( 'resize' ) )
+            // InternalTableDSL.g:26021:1: ( ( ( 'resize' ) ) )
+            // InternalTableDSL.g:26022:2: ( ( 'resize' ) )
             {
-            // InternalTableDSL.g:27362:2: ( ( 'resize' ) )
-            // InternalTableDSL.g:27363:3: ( 'resize' )
+            // InternalTableDSL.g:26022:2: ( ( 'resize' ) )
+            // InternalTableDSL.g:26023:3: ( 'resize' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageAccess().getResizeResizeKeyword_3_2_0_0()); 
             }
-            // InternalTableDSL.g:27364:3: ( 'resize' )
-            // InternalTableDSL.g:27365:4: 'resize'
+            // InternalTableDSL.g:26024:3: ( 'resize' )
+            // InternalTableDSL.g:26025:4: 'resize'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageAccess().getResizeResizeKeyword_3_2_0_0()); 
             }
-            match(input,173,FOLLOW_2); if (state.failed) return ;
+            match(input,172,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTableImageAccess().getResizeResizeKeyword_3_2_0_0()); 
             }
@@ -90203,17 +85559,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableImage__ResizeStringAssignment_3_2_1"
-    // InternalTableDSL.g:27376:1: rule__TableImage__ResizeStringAssignment_3_2_1 : ( RULE_STRING ) ;
+    // InternalTableDSL.g:26036:1: rule__TableImage__ResizeStringAssignment_3_2_1 : ( RULE_STRING ) ;
     public final void rule__TableImage__ResizeStringAssignment_3_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27380:1: ( ( RULE_STRING ) )
-            // InternalTableDSL.g:27381:2: ( RULE_STRING )
+            // InternalTableDSL.g:26040:1: ( ( RULE_STRING ) )
+            // InternalTableDSL.g:26041:2: ( RULE_STRING )
             {
-            // InternalTableDSL.g:27381:2: ( RULE_STRING )
-            // InternalTableDSL.g:27382:3: RULE_STRING
+            // InternalTableDSL.g:26041:2: ( RULE_STRING )
+            // InternalTableDSL.g:26042:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableImageAccess().getResizeStringSTRINGTerminalRuleCall_3_2_1_0()); 
@@ -90244,17 +85600,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTooltipPattern__TooltipPatternAssignment_2"
-    // InternalTableDSL.g:27391:1: rule__TableTooltipPattern__TooltipPatternAssignment_2 : ( ruleTRANSLATABLESTRING ) ;
+    // InternalTableDSL.g:26051:1: rule__TableTooltipPattern__TooltipPatternAssignment_2 : ( ruleTRANSLATABLESTRING ) ;
     public final void rule__TableTooltipPattern__TooltipPatternAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27395:1: ( ( ruleTRANSLATABLESTRING ) )
-            // InternalTableDSL.g:27396:2: ( ruleTRANSLATABLESTRING )
+            // InternalTableDSL.g:26055:1: ( ( ruleTRANSLATABLESTRING ) )
+            // InternalTableDSL.g:26056:2: ( ruleTRANSLATABLESTRING )
             {
-            // InternalTableDSL.g:27396:2: ( ruleTRANSLATABLESTRING )
-            // InternalTableDSL.g:27397:3: ruleTRANSLATABLESTRING
+            // InternalTableDSL.g:26056:2: ( ruleTRANSLATABLESTRING )
+            // InternalTableDSL.g:26057:3: ruleTRANSLATABLESTRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTooltipPatternAccess().getTooltipPatternTRANSLATABLESTRINGParserRuleCall_2_0()); 
@@ -90289,17 +85645,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableOrdinal__ValueRefAssignment_1"
-    // InternalTableDSL.g:27406:1: rule__TableOrdinal__ValueRefAssignment_1 : ( ruleNumber ) ;
+    // InternalTableDSL.g:26066:1: rule__TableOrdinal__ValueRefAssignment_1 : ( ruleNumber ) ;
     public final void rule__TableOrdinal__ValueRefAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27410:1: ( ( ruleNumber ) )
-            // InternalTableDSL.g:27411:2: ( ruleNumber )
+            // InternalTableDSL.g:26070:1: ( ( ruleNumber ) )
+            // InternalTableDSL.g:26071:2: ( ruleNumber )
             {
-            // InternalTableDSL.g:27411:2: ( ruleNumber )
-            // InternalTableDSL.g:27412:3: ruleNumber
+            // InternalTableDSL.g:26071:2: ( ruleNumber )
+            // InternalTableDSL.g:26072:3: ruleNumber
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableOrdinalAccess().getValueRefNumberParserRuleCall_1_0()); 
@@ -90334,23 +85690,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableColumn__ValueRefAssignment_1"
-    // InternalTableDSL.g:27421:1: rule__TableColumn__ValueRefAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalTableDSL.g:26081:1: rule__TableColumn__ValueRefAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__TableColumn__ValueRefAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27425:1: ( ( ( RULE_ID ) ) )
-            // InternalTableDSL.g:27426:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26085:1: ( ( ( RULE_ID ) ) )
+            // InternalTableDSL.g:26086:2: ( ( RULE_ID ) )
             {
-            // InternalTableDSL.g:27426:2: ( ( RULE_ID ) )
-            // InternalTableDSL.g:27427:3: ( RULE_ID )
+            // InternalTableDSL.g:26086:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26087:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableColumnAccess().getValueRefDatamartColumnCrossReference_1_0()); 
             }
-            // InternalTableDSL.g:27428:3: ( RULE_ID )
-            // InternalTableDSL.g:27429:4: RULE_ID
+            // InternalTableDSL.g:26088:3: ( RULE_ID )
+            // InternalTableDSL.g:26089:4: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableColumnAccess().getValueRefDatamartColumnIDTerminalRuleCall_1_0_1()); 
@@ -90387,23 +85743,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableMeasure__ValueRefAssignment_1"
-    // InternalTableDSL.g:27440:1: rule__TableMeasure__ValueRefAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalTableDSL.g:26100:1: rule__TableMeasure__ValueRefAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__TableMeasure__ValueRefAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27444:1: ( ( ( RULE_ID ) ) )
-            // InternalTableDSL.g:27445:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26104:1: ( ( ( RULE_ID ) ) )
+            // InternalTableDSL.g:26105:2: ( ( RULE_ID ) )
             {
-            // InternalTableDSL.g:27445:2: ( ( RULE_ID ) )
-            // InternalTableDSL.g:27446:3: ( RULE_ID )
+            // InternalTableDSL.g:26105:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26106:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableMeasureAccess().getValueRefDatamartMeasureCrossReference_1_0()); 
             }
-            // InternalTableDSL.g:27447:3: ( RULE_ID )
-            // InternalTableDSL.g:27448:4: RULE_ID
+            // InternalTableDSL.g:26107:3: ( RULE_ID )
+            // InternalTableDSL.g:26108:4: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableMeasureAccess().getValueRefDatamartMeasureIDTerminalRuleCall_1_0_1()); 
@@ -90440,23 +85796,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDerived__ValueRefAssignment_1"
-    // InternalTableDSL.g:27459:1: rule__TableDerived__ValueRefAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalTableDSL.g:26119:1: rule__TableDerived__ValueRefAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__TableDerived__ValueRefAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27463:1: ( ( ( RULE_ID ) ) )
-            // InternalTableDSL.g:27464:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26123:1: ( ( ( RULE_ID ) ) )
+            // InternalTableDSL.g:26124:2: ( ( RULE_ID ) )
             {
-            // InternalTableDSL.g:27464:2: ( ( RULE_ID ) )
-            // InternalTableDSL.g:27465:3: ( RULE_ID )
+            // InternalTableDSL.g:26124:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26125:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDerivedAccess().getValueRefDatamartDerivedMeasureCrossReference_1_0()); 
             }
-            // InternalTableDSL.g:27466:3: ( RULE_ID )
-            // InternalTableDSL.g:27467:4: RULE_ID
+            // InternalTableDSL.g:26126:3: ( RULE_ID )
+            // InternalTableDSL.g:26127:4: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDerivedAccess().getValueRefDatamartDerivedMeasureIDTerminalRuleCall_1_0_1()); 
@@ -90493,23 +85849,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableHierarchy__ValueRefAssignment_1"
-    // InternalTableDSL.g:27478:1: rule__TableHierarchy__ValueRefAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalTableDSL.g:26138:1: rule__TableHierarchy__ValueRefAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__TableHierarchy__ValueRefAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27482:1: ( ( ( RULE_ID ) ) )
-            // InternalTableDSL.g:27483:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26142:1: ( ( ( RULE_ID ) ) )
+            // InternalTableDSL.g:26143:2: ( ( RULE_ID ) )
             {
-            // InternalTableDSL.g:27483:2: ( ( RULE_ID ) )
-            // InternalTableDSL.g:27484:3: ( RULE_ID )
+            // InternalTableDSL.g:26143:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26144:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableHierarchyAccess().getValueRefCubeLevelCrossReference_1_0()); 
             }
-            // InternalTableDSL.g:27485:3: ( RULE_ID )
-            // InternalTableDSL.g:27486:4: RULE_ID
+            // InternalTableDSL.g:26145:3: ( RULE_ID )
+            // InternalTableDSL.g:26146:4: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableHierarchyAccess().getValueRefCubeLevelIDTerminalRuleCall_1_0_1()); 
@@ -90546,23 +85902,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAttribute__ValueRefAssignment_2"
-    // InternalTableDSL.g:27497:1: rule__TableAttribute__ValueRefAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalTableDSL.g:26157:1: rule__TableAttribute__ValueRefAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__TableAttribute__ValueRefAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27501:1: ( ( ( RULE_ID ) ) )
-            // InternalTableDSL.g:27502:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26161:1: ( ( ( RULE_ID ) ) )
+            // InternalTableDSL.g:26162:2: ( ( RULE_ID ) )
             {
-            // InternalTableDSL.g:27502:2: ( ( RULE_ID ) )
-            // InternalTableDSL.g:27503:3: ( RULE_ID )
+            // InternalTableDSL.g:26162:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26163:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAttributeAccess().getValueRefDatamartAttributeCrossReference_2_0()); 
             }
-            // InternalTableDSL.g:27504:3: ( RULE_ID )
-            // InternalTableDSL.g:27505:4: RULE_ID
+            // InternalTableDSL.g:26164:3: ( RULE_ID )
+            // InternalTableDSL.g:26165:4: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAttributeAccess().getValueRefDatamartAttributeIDTerminalRuleCall_2_0_1()); 
@@ -90599,23 +85955,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAggregation__ValueRefAssignment_1"
-    // InternalTableDSL.g:27516:1: rule__TableAggregation__ValueRefAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalTableDSL.g:26176:1: rule__TableAggregation__ValueRefAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__TableAggregation__ValueRefAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27520:1: ( ( ( RULE_ID ) ) )
-            // InternalTableDSL.g:27521:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26180:1: ( ( ( RULE_ID ) ) )
+            // InternalTableDSL.g:26181:2: ( ( RULE_ID ) )
             {
-            // InternalTableDSL.g:27521:2: ( ( RULE_ID ) )
-            // InternalTableDSL.g:27522:3: ( RULE_ID )
+            // InternalTableDSL.g:26181:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26182:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAggregationAccess().getValueRefDatamartSetAggregationFunctionCrossReference_1_0()); 
             }
-            // InternalTableDSL.g:27523:3: ( RULE_ID )
-            // InternalTableDSL.g:27524:4: RULE_ID
+            // InternalTableDSL.g:26183:3: ( RULE_ID )
+            // InternalTableDSL.g:26184:4: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAggregationAccess().getValueRefDatamartSetAggregationFunctionIDTerminalRuleCall_1_0_1()); 
@@ -90652,17 +86008,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberInterval__NumberIntervalValueAssignment_2"
-    // InternalTableDSL.g:27535:1: rule__TableNumberInterval__NumberIntervalValueAssignment_2 : ( ruleSignedNumber ) ;
+    // InternalTableDSL.g:26195:1: rule__TableNumberInterval__NumberIntervalValueAssignment_2 : ( ruleSignedNumber ) ;
     public final void rule__TableNumberInterval__NumberIntervalValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27539:1: ( ( ruleSignedNumber ) )
-            // InternalTableDSL.g:27540:2: ( ruleSignedNumber )
+            // InternalTableDSL.g:26199:1: ( ( ruleSignedNumber ) )
+            // InternalTableDSL.g:26200:2: ( ruleSignedNumber )
             {
-            // InternalTableDSL.g:27540:2: ( ruleSignedNumber )
-            // InternalTableDSL.g:27541:3: ruleSignedNumber
+            // InternalTableDSL.g:26200:2: ( ruleSignedNumber )
+            // InternalTableDSL.g:26201:3: ruleSignedNumber
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberIntervalAccess().getNumberIntervalValueSignedNumberParserRuleCall_2_0()); 
@@ -90697,17 +86053,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberInterval__NumberRangeAssignment_3"
-    // InternalTableDSL.g:27550:1: rule__TableNumberInterval__NumberRangeAssignment_3 : ( ruleTableRangeElement ) ;
+    // InternalTableDSL.g:26210:1: rule__TableNumberInterval__NumberRangeAssignment_3 : ( ruleTableRangeElement ) ;
     public final void rule__TableNumberInterval__NumberRangeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27554:1: ( ( ruleTableRangeElement ) )
-            // InternalTableDSL.g:27555:2: ( ruleTableRangeElement )
+            // InternalTableDSL.g:26214:1: ( ( ruleTableRangeElement ) )
+            // InternalTableDSL.g:26215:2: ( ruleTableRangeElement )
             {
-            // InternalTableDSL.g:27555:2: ( ruleTableRangeElement )
-            // InternalTableDSL.g:27556:3: ruleTableRangeElement
+            // InternalTableDSL.g:26215:2: ( ruleTableRangeElement )
+            // InternalTableDSL.g:26216:3: ruleTableRangeElement
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberIntervalAccess().getNumberRangeTableRangeElementParserRuleCall_3_0()); 
@@ -90742,17 +86098,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntInterval__IntIntervalValueAssignment_2"
-    // InternalTableDSL.g:27565:1: rule__TableIntInterval__IntIntervalValueAssignment_2 : ( ruleSignedInt ) ;
+    // InternalTableDSL.g:26225:1: rule__TableIntInterval__IntIntervalValueAssignment_2 : ( ruleSignedInt ) ;
     public final void rule__TableIntInterval__IntIntervalValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27569:1: ( ( ruleSignedInt ) )
-            // InternalTableDSL.g:27570:2: ( ruleSignedInt )
+            // InternalTableDSL.g:26229:1: ( ( ruleSignedInt ) )
+            // InternalTableDSL.g:26230:2: ( ruleSignedInt )
             {
-            // InternalTableDSL.g:27570:2: ( ruleSignedInt )
-            // InternalTableDSL.g:27571:3: ruleSignedInt
+            // InternalTableDSL.g:26230:2: ( ruleSignedInt )
+            // InternalTableDSL.g:26231:3: ruleSignedInt
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntIntervalAccess().getIntIntervalValueSignedIntParserRuleCall_2_0()); 
@@ -90787,17 +86143,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntInterval__IntRangeAssignment_3"
-    // InternalTableDSL.g:27580:1: rule__TableIntInterval__IntRangeAssignment_3 : ( ruleTableRangeElement ) ;
+    // InternalTableDSL.g:26240:1: rule__TableIntInterval__IntRangeAssignment_3 : ( ruleTableRangeElement ) ;
     public final void rule__TableIntInterval__IntRangeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27584:1: ( ( ruleTableRangeElement ) )
-            // InternalTableDSL.g:27585:2: ( ruleTableRangeElement )
+            // InternalTableDSL.g:26244:1: ( ( ruleTableRangeElement ) )
+            // InternalTableDSL.g:26245:2: ( ruleTableRangeElement )
             {
-            // InternalTableDSL.g:27585:2: ( ruleTableRangeElement )
-            // InternalTableDSL.g:27586:3: ruleTableRangeElement
+            // InternalTableDSL.g:26245:2: ( ruleTableRangeElement )
+            // InternalTableDSL.g:26246:3: ruleTableRangeElement
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntIntervalAccess().getIntRangeTableRangeElementParserRuleCall_3_0()); 
@@ -90832,17 +86188,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayInterval__DateIntervalValueAssignment_2"
-    // InternalTableDSL.g:27595:1: rule__TableDateDayInterval__DateIntervalValueAssignment_2 : ( ruleSignedInt ) ;
+    // InternalTableDSL.g:26255:1: rule__TableDateDayInterval__DateIntervalValueAssignment_2 : ( ruleSignedInt ) ;
     public final void rule__TableDateDayInterval__DateIntervalValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27599:1: ( ( ruleSignedInt ) )
-            // InternalTableDSL.g:27600:2: ( ruleSignedInt )
+            // InternalTableDSL.g:26259:1: ( ( ruleSignedInt ) )
+            // InternalTableDSL.g:26260:2: ( ruleSignedInt )
             {
-            // InternalTableDSL.g:27600:2: ( ruleSignedInt )
-            // InternalTableDSL.g:27601:3: ruleSignedInt
+            // InternalTableDSL.g:26260:2: ( ruleSignedInt )
+            // InternalTableDSL.g:26261:3: ruleSignedInt
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayIntervalAccess().getDateIntervalValueSignedIntParserRuleCall_2_0()); 
@@ -90877,17 +86233,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayInterval__DateRangeAssignment_3"
-    // InternalTableDSL.g:27610:1: rule__TableDateDayInterval__DateRangeAssignment_3 : ( ruleTableRangeElement ) ;
+    // InternalTableDSL.g:26270:1: rule__TableDateDayInterval__DateRangeAssignment_3 : ( ruleTableRangeElement ) ;
     public final void rule__TableDateDayInterval__DateRangeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27614:1: ( ( ruleTableRangeElement ) )
-            // InternalTableDSL.g:27615:2: ( ruleTableRangeElement )
+            // InternalTableDSL.g:26274:1: ( ( ruleTableRangeElement ) )
+            // InternalTableDSL.g:26275:2: ( ruleTableRangeElement )
             {
-            // InternalTableDSL.g:27615:2: ( ruleTableRangeElement )
-            // InternalTableDSL.g:27616:3: ruleTableRangeElement
+            // InternalTableDSL.g:26275:2: ( ruleTableRangeElement )
+            // InternalTableDSL.g:26276:3: ruleTableRangeElement
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayIntervalAccess().getDateRangeTableRangeElementParserRuleCall_3_0()); 
@@ -90922,17 +86278,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntLookup__LookupValueAssignment_2"
-    // InternalTableDSL.g:27625:1: rule__TableIntLookup__LookupValueAssignment_2 : ( ruleSignedInt ) ;
+    // InternalTableDSL.g:26285:1: rule__TableIntLookup__LookupValueAssignment_2 : ( ruleSignedInt ) ;
     public final void rule__TableIntLookup__LookupValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27629:1: ( ( ruleSignedInt ) )
-            // InternalTableDSL.g:27630:2: ( ruleSignedInt )
+            // InternalTableDSL.g:26289:1: ( ( ruleSignedInt ) )
+            // InternalTableDSL.g:26290:2: ( ruleSignedInt )
             {
-            // InternalTableDSL.g:27630:2: ( ruleSignedInt )
-            // InternalTableDSL.g:27631:3: ruleSignedInt
+            // InternalTableDSL.g:26290:2: ( ruleSignedInt )
+            // InternalTableDSL.g:26291:3: ruleSignedInt
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntLookupAccess().getLookupValueSignedIntParserRuleCall_2_0()); 
@@ -90967,17 +86323,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIntLookup__DiscreteAssignment_3"
-    // InternalTableDSL.g:27640:1: rule__TableIntLookup__DiscreteAssignment_3 : ( ruleTableRangeElement ) ;
+    // InternalTableDSL.g:26300:1: rule__TableIntLookup__DiscreteAssignment_3 : ( ruleTableRangeElement ) ;
     public final void rule__TableIntLookup__DiscreteAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27644:1: ( ( ruleTableRangeElement ) )
-            // InternalTableDSL.g:27645:2: ( ruleTableRangeElement )
+            // InternalTableDSL.g:26304:1: ( ( ruleTableRangeElement ) )
+            // InternalTableDSL.g:26305:2: ( ruleTableRangeElement )
             {
-            // InternalTableDSL.g:27645:2: ( ruleTableRangeElement )
-            // InternalTableDSL.g:27646:3: ruleTableRangeElement
+            // InternalTableDSL.g:26305:2: ( ruleTableRangeElement )
+            // InternalTableDSL.g:26306:3: ruleTableRangeElement
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIntLookupAccess().getDiscreteTableRangeElementParserRuleCall_3_0()); 
@@ -91012,17 +86368,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberLookup__LookupValueAssignment_2"
-    // InternalTableDSL.g:27655:1: rule__TableNumberLookup__LookupValueAssignment_2 : ( ruleSignedNumber ) ;
+    // InternalTableDSL.g:26315:1: rule__TableNumberLookup__LookupValueAssignment_2 : ( ruleSignedNumber ) ;
     public final void rule__TableNumberLookup__LookupValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27659:1: ( ( ruleSignedNumber ) )
-            // InternalTableDSL.g:27660:2: ( ruleSignedNumber )
+            // InternalTableDSL.g:26319:1: ( ( ruleSignedNumber ) )
+            // InternalTableDSL.g:26320:2: ( ruleSignedNumber )
             {
-            // InternalTableDSL.g:27660:2: ( ruleSignedNumber )
-            // InternalTableDSL.g:27661:3: ruleSignedNumber
+            // InternalTableDSL.g:26320:2: ( ruleSignedNumber )
+            // InternalTableDSL.g:26321:3: ruleSignedNumber
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberLookupAccess().getLookupValueSignedNumberParserRuleCall_2_0()); 
@@ -91057,17 +86413,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableNumberLookup__DiscreteAssignment_3"
-    // InternalTableDSL.g:27670:1: rule__TableNumberLookup__DiscreteAssignment_3 : ( ruleTableRangeElement ) ;
+    // InternalTableDSL.g:26330:1: rule__TableNumberLookup__DiscreteAssignment_3 : ( ruleTableRangeElement ) ;
     public final void rule__TableNumberLookup__DiscreteAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27674:1: ( ( ruleTableRangeElement ) )
-            // InternalTableDSL.g:27675:2: ( ruleTableRangeElement )
+            // InternalTableDSL.g:26334:1: ( ( ruleTableRangeElement ) )
+            // InternalTableDSL.g:26335:2: ( ruleTableRangeElement )
             {
-            // InternalTableDSL.g:27675:2: ( ruleTableRangeElement )
-            // InternalTableDSL.g:27676:3: ruleTableRangeElement
+            // InternalTableDSL.g:26335:2: ( ruleTableRangeElement )
+            // InternalTableDSL.g:26336:3: ruleTableRangeElement
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableNumberLookupAccess().getDiscreteTableRangeElementParserRuleCall_3_0()); 
@@ -91102,17 +86458,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableStringLookup__LookupValueAssignment_2"
-    // InternalTableDSL.g:27685:1: rule__TableStringLookup__LookupValueAssignment_2 : ( RULE_STRING ) ;
+    // InternalTableDSL.g:26345:1: rule__TableStringLookup__LookupValueAssignment_2 : ( RULE_STRING ) ;
     public final void rule__TableStringLookup__LookupValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27689:1: ( ( RULE_STRING ) )
-            // InternalTableDSL.g:27690:2: ( RULE_STRING )
+            // InternalTableDSL.g:26349:1: ( ( RULE_STRING ) )
+            // InternalTableDSL.g:26350:2: ( RULE_STRING )
             {
-            // InternalTableDSL.g:27690:2: ( RULE_STRING )
-            // InternalTableDSL.g:27691:3: RULE_STRING
+            // InternalTableDSL.g:26350:2: ( RULE_STRING )
+            // InternalTableDSL.g:26351:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableStringLookupAccess().getLookupValueSTRINGTerminalRuleCall_2_0()); 
@@ -91143,17 +86499,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableStringLookup__DiscreteAssignment_3"
-    // InternalTableDSL.g:27700:1: rule__TableStringLookup__DiscreteAssignment_3 : ( ruleTableRangeElement ) ;
+    // InternalTableDSL.g:26360:1: rule__TableStringLookup__DiscreteAssignment_3 : ( ruleTableRangeElement ) ;
     public final void rule__TableStringLookup__DiscreteAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27704:1: ( ( ruleTableRangeElement ) )
-            // InternalTableDSL.g:27705:2: ( ruleTableRangeElement )
+            // InternalTableDSL.g:26364:1: ( ( ruleTableRangeElement ) )
+            // InternalTableDSL.g:26365:2: ( ruleTableRangeElement )
             {
-            // InternalTableDSL.g:27705:2: ( ruleTableRangeElement )
-            // InternalTableDSL.g:27706:3: ruleTableRangeElement
+            // InternalTableDSL.g:26365:2: ( ruleTableRangeElement )
+            // InternalTableDSL.g:26366:3: ruleTableRangeElement
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableStringLookupAccess().getDiscreteTableRangeElementParserRuleCall_3_0()); 
@@ -91188,17 +86544,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayLookup__LookupValueAssignment_2"
-    // InternalTableDSL.g:27715:1: rule__TableDateDayLookup__LookupValueAssignment_2 : ( ruleSignedInt ) ;
+    // InternalTableDSL.g:26375:1: rule__TableDateDayLookup__LookupValueAssignment_2 : ( ruleSignedInt ) ;
     public final void rule__TableDateDayLookup__LookupValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27719:1: ( ( ruleSignedInt ) )
-            // InternalTableDSL.g:27720:2: ( ruleSignedInt )
+            // InternalTableDSL.g:26379:1: ( ( ruleSignedInt ) )
+            // InternalTableDSL.g:26380:2: ( ruleSignedInt )
             {
-            // InternalTableDSL.g:27720:2: ( ruleSignedInt )
-            // InternalTableDSL.g:27721:3: ruleSignedInt
+            // InternalTableDSL.g:26380:2: ( ruleSignedInt )
+            // InternalTableDSL.g:26381:3: ruleSignedInt
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayLookupAccess().getLookupValueSignedIntParserRuleCall_2_0()); 
@@ -91233,17 +86589,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDateDayLookup__DiscreteAssignment_3"
-    // InternalTableDSL.g:27730:1: rule__TableDateDayLookup__DiscreteAssignment_3 : ( ruleTableRangeElement ) ;
+    // InternalTableDSL.g:26390:1: rule__TableDateDayLookup__DiscreteAssignment_3 : ( ruleTableRangeElement ) ;
     public final void rule__TableDateDayLookup__DiscreteAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27734:1: ( ( ruleTableRangeElement ) )
-            // InternalTableDSL.g:27735:2: ( ruleTableRangeElement )
+            // InternalTableDSL.g:26394:1: ( ( ruleTableRangeElement ) )
+            // InternalTableDSL.g:26395:2: ( ruleTableRangeElement )
             {
-            // InternalTableDSL.g:27735:2: ( ruleTableRangeElement )
-            // InternalTableDSL.g:27736:3: ruleTableRangeElement
+            // InternalTableDSL.g:26395:2: ( ruleTableRangeElement )
+            // InternalTableDSL.g:26396:3: ruleTableRangeElement
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDateDayLookupAccess().getDiscreteTableRangeElementParserRuleCall_3_0()); 
@@ -91278,23 +86634,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDatamart__DatamartRefAssignment_1"
-    // InternalTableDSL.g:27745:1: rule__TableDatamart__DatamartRefAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalTableDSL.g:26405:1: rule__TableDatamart__DatamartRefAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__TableDatamart__DatamartRefAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27749:1: ( ( ( RULE_ID ) ) )
-            // InternalTableDSL.g:27750:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26409:1: ( ( ( RULE_ID ) ) )
+            // InternalTableDSL.g:26410:2: ( ( RULE_ID ) )
             {
-            // InternalTableDSL.g:27750:2: ( ( RULE_ID ) )
-            // InternalTableDSL.g:27751:3: ( RULE_ID )
+            // InternalTableDSL.g:26410:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26411:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDatamartAccess().getDatamartRefDatamartDefinitionCrossReference_1_0()); 
             }
-            // InternalTableDSL.g:27752:3: ( RULE_ID )
-            // InternalTableDSL.g:27753:4: RULE_ID
+            // InternalTableDSL.g:26412:3: ( RULE_ID )
+            // InternalTableDSL.g:26413:4: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDatamartAccess().getDatamartRefDatamartDefinitionIDTerminalRuleCall_1_0_1()); 
@@ -91331,17 +86687,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDatamart__ElementsAssignment_2_1"
-    // InternalTableDSL.g:27764:1: rule__TableDatamart__ElementsAssignment_2_1 : ( ruleTableElement ) ;
+    // InternalTableDSL.g:26424:1: rule__TableDatamart__ElementsAssignment_2_1 : ( ruleTableElement ) ;
     public final void rule__TableDatamart__ElementsAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27768:1: ( ( ruleTableElement ) )
-            // InternalTableDSL.g:27769:2: ( ruleTableElement )
+            // InternalTableDSL.g:26428:1: ( ( ruleTableElement ) )
+            // InternalTableDSL.g:26429:2: ( ruleTableElement )
             {
-            // InternalTableDSL.g:27769:2: ( ruleTableElement )
-            // InternalTableDSL.g:27770:3: ruleTableElement
+            // InternalTableDSL.g:26429:2: ( ruleTableElement )
+            // InternalTableDSL.g:26430:3: ruleTableElement
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDatamartAccess().getElementsTableElementParserRuleCall_2_1_0()); 
@@ -91376,17 +86732,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableEvent__SourceAssignment"
-    // InternalTableDSL.g:27779:1: rule__TableEvent__SourceAssignment : ( ruleTableValueElement ) ;
+    // InternalTableDSL.g:26439:1: rule__TableEvent__SourceAssignment : ( ruleTableValueElement ) ;
     public final void rule__TableEvent__SourceAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27783:1: ( ( ruleTableValueElement ) )
-            // InternalTableDSL.g:27784:2: ( ruleTableValueElement )
+            // InternalTableDSL.g:26443:1: ( ( ruleTableValueElement ) )
+            // InternalTableDSL.g:26444:2: ( ruleTableValueElement )
             {
-            // InternalTableDSL.g:27784:2: ( ruleTableValueElement )
-            // InternalTableDSL.g:27785:3: ruleTableValueElement
+            // InternalTableDSL.g:26444:2: ( ruleTableValueElement )
+            // InternalTableDSL.g:26445:3: ruleTableValueElement
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableEventAccess().getSourceTableValueElementParserRuleCall_0()); 
@@ -91421,17 +86777,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__AxisAssignment_1"
-    // InternalTableDSL.g:27794:1: rule__TableAxis__AxisAssignment_1 : ( ruleAxisEnum ) ;
+    // InternalTableDSL.g:26454:1: rule__TableAxis__AxisAssignment_1 : ( ruleAxisEnum ) ;
     public final void rule__TableAxis__AxisAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27798:1: ( ( ruleAxisEnum ) )
-            // InternalTableDSL.g:27799:2: ( ruleAxisEnum )
+            // InternalTableDSL.g:26458:1: ( ( ruleAxisEnum ) )
+            // InternalTableDSL.g:26459:2: ( ruleAxisEnum )
             {
-            // InternalTableDSL.g:27799:2: ( ruleAxisEnum )
-            // InternalTableDSL.g:27800:3: ruleAxisEnum
+            // InternalTableDSL.g:26459:2: ( ruleAxisEnum )
+            // InternalTableDSL.g:26460:3: ruleAxisEnum
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getAxisAxisEnumEnumRuleCall_1_0()); 
@@ -91466,28 +86822,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__HasRowHeightAssignment_2_0_0"
-    // InternalTableDSL.g:27809:1: rule__TableAxis__HasRowHeightAssignment_2_0_0 : ( ( 'rowheight' ) ) ;
+    // InternalTableDSL.g:26469:1: rule__TableAxis__HasRowHeightAssignment_2_0_0 : ( ( 'rowheight' ) ) ;
     public final void rule__TableAxis__HasRowHeightAssignment_2_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27813:1: ( ( ( 'rowheight' ) ) )
-            // InternalTableDSL.g:27814:2: ( ( 'rowheight' ) )
+            // InternalTableDSL.g:26473:1: ( ( ( 'rowheight' ) ) )
+            // InternalTableDSL.g:26474:2: ( ( 'rowheight' ) )
             {
-            // InternalTableDSL.g:27814:2: ( ( 'rowheight' ) )
-            // InternalTableDSL.g:27815:3: ( 'rowheight' )
+            // InternalTableDSL.g:26474:2: ( ( 'rowheight' ) )
+            // InternalTableDSL.g:26475:3: ( 'rowheight' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getHasRowHeightRowheightKeyword_2_0_0_0()); 
             }
-            // InternalTableDSL.g:27816:3: ( 'rowheight' )
-            // InternalTableDSL.g:27817:4: 'rowheight'
+            // InternalTableDSL.g:26476:3: ( 'rowheight' )
+            // InternalTableDSL.g:26477:4: 'rowheight'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getHasRowHeightRowheightKeyword_2_0_0_0()); 
             }
-            match(input,174,FOLLOW_2); if (state.failed) return ;
+            match(input,173,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTableAxisAccess().getHasRowHeightRowheightKeyword_2_0_0_0()); 
             }
@@ -91519,17 +86875,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__RowHeightAssignment_2_0_1"
-    // InternalTableDSL.g:27828:1: rule__TableAxis__RowHeightAssignment_2_0_1 : ( ruleNumber ) ;
+    // InternalTableDSL.g:26488:1: rule__TableAxis__RowHeightAssignment_2_0_1 : ( ruleNumber ) ;
     public final void rule__TableAxis__RowHeightAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27832:1: ( ( ruleNumber ) )
-            // InternalTableDSL.g:27833:2: ( ruleNumber )
+            // InternalTableDSL.g:26492:1: ( ( ruleNumber ) )
+            // InternalTableDSL.g:26493:2: ( ruleNumber )
             {
-            // InternalTableDSL.g:27833:2: ( ruleNumber )
-            // InternalTableDSL.g:27834:3: ruleNumber
+            // InternalTableDSL.g:26493:2: ( ruleNumber )
+            // InternalTableDSL.g:26494:3: ruleNumber
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getRowHeightNumberParserRuleCall_2_0_1_0()); 
@@ -91564,17 +86920,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__PreOrderAssignment_2_1"
-    // InternalTableDSL.g:27843:1: rule__TableAxis__PreOrderAssignment_2_1 : ( ruleTablePreorder ) ;
+    // InternalTableDSL.g:26503:1: rule__TableAxis__PreOrderAssignment_2_1 : ( ruleTablePreorder ) ;
     public final void rule__TableAxis__PreOrderAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27847:1: ( ( ruleTablePreorder ) )
-            // InternalTableDSL.g:27848:2: ( ruleTablePreorder )
+            // InternalTableDSL.g:26507:1: ( ( ruleTablePreorder ) )
+            // InternalTableDSL.g:26508:2: ( ruleTablePreorder )
             {
-            // InternalTableDSL.g:27848:2: ( ruleTablePreorder )
-            // InternalTableDSL.g:27849:3: ruleTablePreorder
+            // InternalTableDSL.g:26508:2: ( ruleTablePreorder )
+            // InternalTableDSL.g:26509:3: ruleTablePreorder
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getPreOrderTablePreorderParserRuleCall_2_1_0()); 
@@ -91609,28 +86965,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__HasDetailsAssignment_3_0"
-    // InternalTableDSL.g:27858:1: rule__TableAxis__HasDetailsAssignment_3_0 : ( ( 'details' ) ) ;
+    // InternalTableDSL.g:26518:1: rule__TableAxis__HasDetailsAssignment_3_0 : ( ( 'details' ) ) ;
     public final void rule__TableAxis__HasDetailsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27862:1: ( ( ( 'details' ) ) )
-            // InternalTableDSL.g:27863:2: ( ( 'details' ) )
+            // InternalTableDSL.g:26522:1: ( ( ( 'details' ) ) )
+            // InternalTableDSL.g:26523:2: ( ( 'details' ) )
             {
-            // InternalTableDSL.g:27863:2: ( ( 'details' ) )
-            // InternalTableDSL.g:27864:3: ( 'details' )
+            // InternalTableDSL.g:26523:2: ( ( 'details' ) )
+            // InternalTableDSL.g:26524:3: ( 'details' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getHasDetailsDetailsKeyword_3_0_0()); 
             }
-            // InternalTableDSL.g:27865:3: ( 'details' )
-            // InternalTableDSL.g:27866:4: 'details'
+            // InternalTableDSL.g:26525:3: ( 'details' )
+            // InternalTableDSL.g:26526:4: 'details'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getHasDetailsDetailsKeyword_3_0_0()); 
             }
-            match(input,175,FOLLOW_2); if (state.failed) return ;
+            match(input,174,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTableAxisAccess().getHasDetailsDetailsKeyword_3_0_0()); 
             }
@@ -91662,17 +87018,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__ValuesAssignment_3_2"
-    // InternalTableDSL.g:27877:1: rule__TableAxis__ValuesAssignment_3_2 : ( ruleTableValue ) ;
+    // InternalTableDSL.g:26537:1: rule__TableAxis__ValuesAssignment_3_2 : ( ruleTableValue ) ;
     public final void rule__TableAxis__ValuesAssignment_3_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27881:1: ( ( ruleTableValue ) )
-            // InternalTableDSL.g:27882:2: ( ruleTableValue )
+            // InternalTableDSL.g:26541:1: ( ( ruleTableValue ) )
+            // InternalTableDSL.g:26542:2: ( ruleTableValue )
             {
-            // InternalTableDSL.g:27882:2: ( ruleTableValue )
-            // InternalTableDSL.g:27883:3: ruleTableValue
+            // InternalTableDSL.g:26542:2: ( ruleTableValue )
+            // InternalTableDSL.g:26543:3: ruleTableValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getValuesTableValueParserRuleCall_3_2_0()); 
@@ -91707,28 +87063,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__HasEventsAssignment_4_0"
-    // InternalTableDSL.g:27892:1: rule__TableAxis__HasEventsAssignment_4_0 : ( ( 'notifyOnSelect' ) ) ;
+    // InternalTableDSL.g:26552:1: rule__TableAxis__HasEventsAssignment_4_0 : ( ( 'notifyOnSelect' ) ) ;
     public final void rule__TableAxis__HasEventsAssignment_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27896:1: ( ( ( 'notifyOnSelect' ) ) )
-            // InternalTableDSL.g:27897:2: ( ( 'notifyOnSelect' ) )
+            // InternalTableDSL.g:26556:1: ( ( ( 'notifyOnSelect' ) ) )
+            // InternalTableDSL.g:26557:2: ( ( 'notifyOnSelect' ) )
             {
-            // InternalTableDSL.g:27897:2: ( ( 'notifyOnSelect' ) )
-            // InternalTableDSL.g:27898:3: ( 'notifyOnSelect' )
+            // InternalTableDSL.g:26557:2: ( ( 'notifyOnSelect' ) )
+            // InternalTableDSL.g:26558:3: ( 'notifyOnSelect' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getHasEventsNotifyOnSelectKeyword_4_0_0()); 
             }
-            // InternalTableDSL.g:27899:3: ( 'notifyOnSelect' )
-            // InternalTableDSL.g:27900:4: 'notifyOnSelect'
+            // InternalTableDSL.g:26559:3: ( 'notifyOnSelect' )
+            // InternalTableDSL.g:26560:4: 'notifyOnSelect'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getHasEventsNotifyOnSelectKeyword_4_0_0()); 
             }
-            match(input,176,FOLLOW_2); if (state.failed) return ;
+            match(input,175,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTableAxisAccess().getHasEventsNotifyOnSelectKeyword_4_0_0()); 
             }
@@ -91760,17 +87116,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableAxis__EventsAssignment_4_2"
-    // InternalTableDSL.g:27911:1: rule__TableAxis__EventsAssignment_4_2 : ( ruleTableEvent ) ;
+    // InternalTableDSL.g:26571:1: rule__TableAxis__EventsAssignment_4_2 : ( ruleTableEvent ) ;
     public final void rule__TableAxis__EventsAssignment_4_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27915:1: ( ( ruleTableEvent ) )
-            // InternalTableDSL.g:27916:2: ( ruleTableEvent )
+            // InternalTableDSL.g:26575:1: ( ( ruleTableEvent ) )
+            // InternalTableDSL.g:26576:2: ( ruleTableEvent )
             {
-            // InternalTableDSL.g:27916:2: ( ruleTableEvent )
-            // InternalTableDSL.g:27917:3: ruleTableEvent
+            // InternalTableDSL.g:26576:2: ( ruleTableEvent )
+            // InternalTableDSL.g:26577:3: ruleTableEvent
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableAxisAccess().getEventsTableEventParserRuleCall_4_2_0()); 
@@ -91805,17 +87161,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTextColor__RgbAssignment_1"
-    // InternalTableDSL.g:27926:1: rule__TableTextColor__RgbAssignment_1 : ( RULE_STRING ) ;
+    // InternalTableDSL.g:26586:1: rule__TableTextColor__RgbAssignment_1 : ( RULE_STRING ) ;
     public final void rule__TableTextColor__RgbAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27930:1: ( ( RULE_STRING ) )
-            // InternalTableDSL.g:27931:2: ( RULE_STRING )
+            // InternalTableDSL.g:26590:1: ( ( RULE_STRING ) )
+            // InternalTableDSL.g:26591:2: ( RULE_STRING )
             {
-            // InternalTableDSL.g:27931:2: ( RULE_STRING )
-            // InternalTableDSL.g:27932:3: RULE_STRING
+            // InternalTableDSL.g:26591:2: ( RULE_STRING )
+            // InternalTableDSL.g:26592:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTextColorAccess().getRgbSTRINGTerminalRuleCall_1_0()); 
@@ -91846,17 +87202,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableCellColor__RgbAssignment_1"
-    // InternalTableDSL.g:27941:1: rule__TableCellColor__RgbAssignment_1 : ( RULE_STRING ) ;
+    // InternalTableDSL.g:26601:1: rule__TableCellColor__RgbAssignment_1 : ( RULE_STRING ) ;
     public final void rule__TableCellColor__RgbAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27945:1: ( ( RULE_STRING ) )
-            // InternalTableDSL.g:27946:2: ( RULE_STRING )
+            // InternalTableDSL.g:26605:1: ( ( RULE_STRING ) )
+            // InternalTableDSL.g:26606:2: ( RULE_STRING )
             {
-            // InternalTableDSL.g:27946:2: ( RULE_STRING )
-            // InternalTableDSL.g:27947:3: RULE_STRING
+            // InternalTableDSL.g:26606:2: ( RULE_STRING )
+            // InternalTableDSL.g:26607:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableCellColorAccess().getRgbSTRINGTerminalRuleCall_1_0()); 
@@ -91887,17 +87243,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableIcon__IconAssignment_1"
-    // InternalTableDSL.g:27956:1: rule__TableIcon__IconAssignment_1 : ( RULE_STRING ) ;
+    // InternalTableDSL.g:26616:1: rule__TableIcon__IconAssignment_1 : ( RULE_STRING ) ;
     public final void rule__TableIcon__IconAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27960:1: ( ( RULE_STRING ) )
-            // InternalTableDSL.g:27961:2: ( RULE_STRING )
+            // InternalTableDSL.g:26620:1: ( ( RULE_STRING ) )
+            // InternalTableDSL.g:26621:2: ( RULE_STRING )
             {
-            // InternalTableDSL.g:27961:2: ( RULE_STRING )
-            // InternalTableDSL.g:27962:3: RULE_STRING
+            // InternalTableDSL.g:26621:2: ( RULE_STRING )
+            // InternalTableDSL.g:26622:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableIconAccess().getIconSTRINGTerminalRuleCall_1_0()); 
@@ -91928,17 +87284,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTrend__IconAssignment_1"
-    // InternalTableDSL.g:27971:1: rule__TableTrend__IconAssignment_1 : ( ruleTrendIconEnum ) ;
+    // InternalTableDSL.g:26631:1: rule__TableTrend__IconAssignment_1 : ( ruleTrendIconEnum ) ;
     public final void rule__TableTrend__IconAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27975:1: ( ( ruleTrendIconEnum ) )
-            // InternalTableDSL.g:27976:2: ( ruleTrendIconEnum )
+            // InternalTableDSL.g:26635:1: ( ( ruleTrendIconEnum ) )
+            // InternalTableDSL.g:26636:2: ( ruleTrendIconEnum )
             {
-            // InternalTableDSL.g:27976:2: ( ruleTrendIconEnum )
-            // InternalTableDSL.g:27977:3: ruleTrendIconEnum
+            // InternalTableDSL.g:26636:2: ( ruleTrendIconEnum )
+            // InternalTableDSL.g:26637:3: ruleTrendIconEnum
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTrendAccess().getIconTrendIconEnumEnumRuleCall_1_0()); 
@@ -91973,17 +87329,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableTooltip__TooltipAssignment_1"
-    // InternalTableDSL.g:27986:1: rule__TableTooltip__TooltipAssignment_1 : ( ruleTRANSLATABLESTRING ) ;
+    // InternalTableDSL.g:26646:1: rule__TableTooltip__TooltipAssignment_1 : ( ruleTRANSLATABLESTRING ) ;
     public final void rule__TableTooltip__TooltipAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:27990:1: ( ( ruleTRANSLATABLESTRING ) )
-            // InternalTableDSL.g:27991:2: ( ruleTRANSLATABLESTRING )
+            // InternalTableDSL.g:26650:1: ( ( ruleTRANSLATABLESTRING ) )
+            // InternalTableDSL.g:26651:2: ( ruleTRANSLATABLESTRING )
             {
-            // InternalTableDSL.g:27991:2: ( ruleTRANSLATABLESTRING )
-            // InternalTableDSL.g:27992:3: ruleTRANSLATABLESTRING
+            // InternalTableDSL.g:26651:2: ( ruleTRANSLATABLESTRING )
+            // InternalTableDSL.g:26652:3: ruleTRANSLATABLESTRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableTooltipAccess().getTooltipTRANSLATABLESTRINGParserRuleCall_1_0()); 
@@ -92017,376 +87373,21 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     // $ANTLR end "rule__TableTooltip__TooltipAssignment_1"
 
 
-    // $ANTLR start "rule__TableGrid__SelectalwaysAssignment_2_0"
-    // InternalTableDSL.g:28001:1: rule__TableGrid__SelectalwaysAssignment_2_0 : ( ( 'selectalways' ) ) ;
-    public final void rule__TableGrid__SelectalwaysAssignment_2_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:28005:1: ( ( ( 'selectalways' ) ) )
-            // InternalTableDSL.g:28006:2: ( ( 'selectalways' ) )
-            {
-            // InternalTableDSL.g:28006:2: ( ( 'selectalways' ) )
-            // InternalTableDSL.g:28007:3: ( 'selectalways' )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getSelectalwaysSelectalwaysKeyword_2_0_0()); 
-            }
-            // InternalTableDSL.g:28008:3: ( 'selectalways' )
-            // InternalTableDSL.g:28009:4: 'selectalways'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getSelectalwaysSelectalwaysKeyword_2_0_0()); 
-            }
-            match(input,177,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getSelectalwaysSelectalwaysKeyword_2_0_0()); 
-            }
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getSelectalwaysSelectalwaysKeyword_2_0_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__SelectalwaysAssignment_2_0"
-
-
-    // $ANTLR start "rule__TableGrid__HeaderModeAssignment_2_1_1"
-    // InternalTableDSL.g:28020:1: rule__TableGrid__HeaderModeAssignment_2_1_1 : ( ruleRowHeaderMode ) ;
-    public final void rule__TableGrid__HeaderModeAssignment_2_1_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:28024:1: ( ( ruleRowHeaderMode ) )
-            // InternalTableDSL.g:28025:2: ( ruleRowHeaderMode )
-            {
-            // InternalTableDSL.g:28025:2: ( ruleRowHeaderMode )
-            // InternalTableDSL.g:28026:3: ruleRowHeaderMode
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getHeaderModeRowHeaderModeEnumRuleCall_2_1_1_0()); 
-            }
-            pushFollow(FOLLOW_2);
-            ruleRowHeaderMode();
-
-            state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getHeaderModeRowHeaderModeEnumRuleCall_2_1_1_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__HeaderModeAssignment_2_1_1"
-
-
-    // $ANTLR start "rule__TableGrid__PollingAssignment_3_0_0"
-    // InternalTableDSL.g:28035:1: rule__TableGrid__PollingAssignment_3_0_0 : ( ( 'polling' ) ) ;
-    public final void rule__TableGrid__PollingAssignment_3_0_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:28039:1: ( ( ( 'polling' ) ) )
-            // InternalTableDSL.g:28040:2: ( ( 'polling' ) )
-            {
-            // InternalTableDSL.g:28040:2: ( ( 'polling' ) )
-            // InternalTableDSL.g:28041:3: ( 'polling' )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getPollingPollingKeyword_3_0_0_0()); 
-            }
-            // InternalTableDSL.g:28042:3: ( 'polling' )
-            // InternalTableDSL.g:28043:4: 'polling'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getPollingPollingKeyword_3_0_0_0()); 
-            }
-            match(input,164,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getPollingPollingKeyword_3_0_0_0()); 
-            }
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getPollingPollingKeyword_3_0_0_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__PollingAssignment_3_0_0"
-
-
-    // $ANTLR start "rule__TableGrid__PollingTimeAssignment_3_0_1"
-    // InternalTableDSL.g:28054:1: rule__TableGrid__PollingTimeAssignment_3_0_1 : ( ruleNumber ) ;
-    public final void rule__TableGrid__PollingTimeAssignment_3_0_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:28058:1: ( ( ruleNumber ) )
-            // InternalTableDSL.g:28059:2: ( ruleNumber )
-            {
-            // InternalTableDSL.g:28059:2: ( ruleNumber )
-            // InternalTableDSL.g:28060:3: ruleNumber
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getPollingTimeNumberParserRuleCall_3_0_1_0()); 
-            }
-            pushFollow(FOLLOW_2);
-            ruleNumber();
-
-            state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getPollingTimeNumberParserRuleCall_3_0_1_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__PollingTimeAssignment_3_0_1"
-
-
-    // $ANTLR start "rule__TableGrid__FilteringAssignment_3_1"
-    // InternalTableDSL.g:28069:1: rule__TableGrid__FilteringAssignment_3_1 : ( ( 'filtering' ) ) ;
-    public final void rule__TableGrid__FilteringAssignment_3_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:28073:1: ( ( ( 'filtering' ) ) )
-            // InternalTableDSL.g:28074:2: ( ( 'filtering' ) )
-            {
-            // InternalTableDSL.g:28074:2: ( ( 'filtering' ) )
-            // InternalTableDSL.g:28075:3: ( 'filtering' )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getFilteringFilteringKeyword_3_1_0()); 
-            }
-            // InternalTableDSL.g:28076:3: ( 'filtering' )
-            // InternalTableDSL.g:28077:4: 'filtering'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getFilteringFilteringKeyword_3_1_0()); 
-            }
-            match(input,165,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getFilteringFilteringKeyword_3_1_0()); 
-            }
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getFilteringFilteringKeyword_3_1_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__FilteringAssignment_3_1"
-
-
-    // $ANTLR start "rule__TableGrid__EmbeddedAssignment_3_2"
-    // InternalTableDSL.g:28088:1: rule__TableGrid__EmbeddedAssignment_3_2 : ( ( 'embedded' ) ) ;
-    public final void rule__TableGrid__EmbeddedAssignment_3_2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:28092:1: ( ( ( 'embedded' ) ) )
-            // InternalTableDSL.g:28093:2: ( ( 'embedded' ) )
-            {
-            // InternalTableDSL.g:28093:2: ( ( 'embedded' ) )
-            // InternalTableDSL.g:28094:3: ( 'embedded' )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getEmbeddedEmbeddedKeyword_3_2_0()); 
-            }
-            // InternalTableDSL.g:28095:3: ( 'embedded' )
-            // InternalTableDSL.g:28096:4: 'embedded'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getEmbeddedEmbeddedKeyword_3_2_0()); 
-            }
-            match(input,166,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getEmbeddedEmbeddedKeyword_3_2_0()); 
-            }
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getEmbeddedEmbeddedKeyword_3_2_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__EmbeddedAssignment_3_2"
-
-
-    // $ANTLR start "rule__TableGrid__ToolbarAssignment_3_3_1"
-    // InternalTableDSL.g:28107:1: rule__TableGrid__ToolbarAssignment_3_3_1 : ( ( RULE_ID ) ) ;
-    public final void rule__TableGrid__ToolbarAssignment_3_3_1() throws RecognitionException {
+    // $ANTLR start "rule__TableGrid__SourceAssignment_3"
+    // InternalTableDSL.g:26661:1: rule__TableGrid__SourceAssignment_3 : ( ruleTableDtoDatasource ) ;
+    public final void rule__TableGrid__SourceAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28111:1: ( ( ( RULE_ID ) ) )
-            // InternalTableDSL.g:28112:2: ( ( RULE_ID ) )
-            {
-            // InternalTableDSL.g:28112:2: ( ( RULE_ID ) )
-            // InternalTableDSL.g:28113:3: ( RULE_ID )
+            // InternalTableDSL.g:26665:1: ( ( ruleTableDtoDatasource ) )
+            // InternalTableDSL.g:26666:2: ( ruleTableDtoDatasource )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getToolbarActionToolbarCrossReference_3_3_1_0()); 
-            }
-            // InternalTableDSL.g:28114:3: ( RULE_ID )
-            // InternalTableDSL.g:28115:4: RULE_ID
+            // InternalTableDSL.g:26666:2: ( ruleTableDtoDatasource )
+            // InternalTableDSL.g:26667:3: ruleTableDtoDatasource
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getToolbarActionToolbarIDTerminalRuleCall_3_3_1_0_1()); 
-            }
-            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getToolbarActionToolbarIDTerminalRuleCall_3_3_1_0_1()); 
-            }
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getToolbarActionToolbarCrossReference_3_3_1_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__TableGrid__ToolbarAssignment_3_3_1"
-
-
-    // $ANTLR start "rule__TableGrid__SourceAssignment_4_1"
-    // InternalTableDSL.g:28126:1: rule__TableGrid__SourceAssignment_4_1 : ( ruleTableDtoDatasource ) ;
-    public final void rule__TableGrid__SourceAssignment_4_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-            // InternalTableDSL.g:28130:1: ( ( ruleTableDtoDatasource ) )
-            // InternalTableDSL.g:28131:2: ( ruleTableDtoDatasource )
-            {
-            // InternalTableDSL.g:28131:2: ( ruleTableDtoDatasource )
-            // InternalTableDSL.g:28132:3: ruleTableDtoDatasource
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getTableGridAccess().getSourceTableDtoDatasourceParserRuleCall_4_1_0()); 
+               before(grammarAccess.getTableGridAccess().getSourceTableDtoDatasourceParserRuleCall_3_0()); 
             }
             pushFollow(FOLLOW_2);
             ruleTableDtoDatasource();
@@ -92394,7 +87395,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             state._fsp--;
             if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getTableGridAccess().getSourceTableDtoDatasourceParserRuleCall_4_1_0()); 
+               after(grammarAccess.getTableGridAccess().getSourceTableDtoDatasourceParserRuleCall_3_0()); 
             }
 
             }
@@ -92414,32 +87415,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
         return ;
     }
-    // $ANTLR end "rule__TableGrid__SourceAssignment_4_1"
+    // $ANTLR end "rule__TableGrid__SourceAssignment_3"
 
 
     // $ANTLR start "rule__Property__EditableAssignment_0"
-    // InternalTableDSL.g:28141:1: rule__Property__EditableAssignment_0 : ( ( 'editable' ) ) ;
+    // InternalTableDSL.g:26676:1: rule__Property__EditableAssignment_0 : ( ( 'editable' ) ) ;
     public final void rule__Property__EditableAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28145:1: ( ( ( 'editable' ) ) )
-            // InternalTableDSL.g:28146:2: ( ( 'editable' ) )
+            // InternalTableDSL.g:26680:1: ( ( ( 'editable' ) ) )
+            // InternalTableDSL.g:26681:2: ( ( 'editable' ) )
             {
-            // InternalTableDSL.g:28146:2: ( ( 'editable' ) )
-            // InternalTableDSL.g:28147:3: ( 'editable' )
+            // InternalTableDSL.g:26681:2: ( ( 'editable' ) )
+            // InternalTableDSL.g:26682:3: ( 'editable' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyAccess().getEditableEditableKeyword_0_0()); 
             }
-            // InternalTableDSL.g:28148:3: ( 'editable' )
-            // InternalTableDSL.g:28149:4: 'editable'
+            // InternalTableDSL.g:26683:3: ( 'editable' )
+            // InternalTableDSL.g:26684:4: 'editable'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyAccess().getEditableEditableKeyword_0_0()); 
             }
-            match(input,178,FOLLOW_2); if (state.failed) return ;
+            match(input,113,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPropertyAccess().getEditableEditableKeyword_0_0()); 
             }
@@ -92471,17 +87472,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Property__PathAssignment_2"
-    // InternalTableDSL.g:28160:1: rule__Property__PathAssignment_2 : ( ruleNestedField ) ;
+    // InternalTableDSL.g:26695:1: rule__Property__PathAssignment_2 : ( ruleNestedField ) ;
     public final void rule__Property__PathAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28164:1: ( ( ruleNestedField ) )
-            // InternalTableDSL.g:28165:2: ( ruleNestedField )
+            // InternalTableDSL.g:26699:1: ( ( ruleNestedField ) )
+            // InternalTableDSL.g:26700:2: ( ruleNestedField )
             {
-            // InternalTableDSL.g:28165:2: ( ruleNestedField )
-            // InternalTableDSL.g:28166:3: ruleNestedField
+            // InternalTableDSL.g:26700:2: ( ruleNestedField )
+            // InternalTableDSL.g:26701:3: ruleNestedField
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyAccess().getPathNestedFieldParserRuleCall_2_0()); 
@@ -92516,17 +87517,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__Property__StyleAssignment_4"
-    // InternalTableDSL.g:28175:1: rule__Property__StyleAssignment_4 : ( rulePropertyStyle ) ;
+    // InternalTableDSL.g:26710:1: rule__Property__StyleAssignment_4 : ( rulePropertyStyle ) ;
     public final void rule__Property__StyleAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28179:1: ( ( rulePropertyStyle ) )
-            // InternalTableDSL.g:28180:2: ( rulePropertyStyle )
+            // InternalTableDSL.g:26714:1: ( ( rulePropertyStyle ) )
+            // InternalTableDSL.g:26715:2: ( rulePropertyStyle )
             {
-            // InternalTableDSL.g:28180:2: ( rulePropertyStyle )
-            // InternalTableDSL.g:28181:3: rulePropertyStyle
+            // InternalTableDSL.g:26715:2: ( rulePropertyStyle )
+            // InternalTableDSL.g:26716:3: rulePropertyStyle
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyAccess().getStylePropertyStyleParserRuleCall_4_0()); 
@@ -92561,23 +87562,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDtoDatasource__DtoSourceAssignment_1"
-    // InternalTableDSL.g:28190:1: rule__TableDtoDatasource__DtoSourceAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalTableDSL.g:26725:1: rule__TableDtoDatasource__DtoSourceAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__TableDtoDatasource__DtoSourceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28194:1: ( ( ( RULE_ID ) ) )
-            // InternalTableDSL.g:28195:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26729:1: ( ( ( RULE_ID ) ) )
+            // InternalTableDSL.g:26730:2: ( ( RULE_ID ) )
             {
-            // InternalTableDSL.g:28195:2: ( ( RULE_ID ) )
-            // InternalTableDSL.g:28196:3: ( RULE_ID )
+            // InternalTableDSL.g:26730:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26731:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDtoDatasourceAccess().getDtoSourceLDtoCrossReference_1_0()); 
             }
-            // InternalTableDSL.g:28197:3: ( RULE_ID )
-            // InternalTableDSL.g:28198:4: RULE_ID
+            // InternalTableDSL.g:26732:3: ( RULE_ID )
+            // InternalTableDSL.g:26733:4: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDtoDatasourceAccess().getDtoSourceLDtoIDTerminalRuleCall_1_0_1()); 
@@ -92614,17 +87615,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__TableDtoDatasource__PropertiesAssignment_2_1"
-    // InternalTableDSL.g:28209:1: rule__TableDtoDatasource__PropertiesAssignment_2_1 : ( ruleProperty ) ;
+    // InternalTableDSL.g:26744:1: rule__TableDtoDatasource__PropertiesAssignment_2_1 : ( ruleProperty ) ;
     public final void rule__TableDtoDatasource__PropertiesAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28213:1: ( ( ruleProperty ) )
-            // InternalTableDSL.g:28214:2: ( ruleProperty )
+            // InternalTableDSL.g:26748:1: ( ( ruleProperty ) )
+            // InternalTableDSL.g:26749:2: ( ruleProperty )
             {
-            // InternalTableDSL.g:28214:2: ( ruleProperty )
-            // InternalTableDSL.g:28215:3: ruleProperty
+            // InternalTableDSL.g:26749:2: ( ruleProperty )
+            // InternalTableDSL.g:26750:3: ruleProperty
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTableDtoDatasourceAccess().getPropertiesPropertyParserRuleCall_2_1_0()); 
@@ -92659,23 +87660,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedField__FieldAssignment_1"
-    // InternalTableDSL.g:28224:1: rule__NestedField__FieldAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalTableDSL.g:26759:1: rule__NestedField__FieldAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__NestedField__FieldAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28228:1: ( ( ( RULE_ID ) ) )
-            // InternalTableDSL.g:28229:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26763:1: ( ( ( RULE_ID ) ) )
+            // InternalTableDSL.g:26764:2: ( ( RULE_ID ) )
             {
-            // InternalTableDSL.g:28229:2: ( ( RULE_ID ) )
-            // InternalTableDSL.g:28230:3: ( RULE_ID )
+            // InternalTableDSL.g:26764:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26765:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedFieldAccess().getFieldJvmOperationCrossReference_1_0()); 
             }
-            // InternalTableDSL.g:28231:3: ( RULE_ID )
-            // InternalTableDSL.g:28232:4: RULE_ID
+            // InternalTableDSL.g:26766:3: ( RULE_ID )
+            // InternalTableDSL.g:26767:4: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedFieldAccess().getFieldJvmOperationIDTerminalRuleCall_1_0_1()); 
@@ -92712,17 +87713,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedField__PathAssignment_2"
-    // InternalTableDSL.g:28243:1: rule__NestedField__PathAssignment_2 : ( ruleNestedPath ) ;
+    // InternalTableDSL.g:26778:1: rule__NestedField__PathAssignment_2 : ( ruleNestedPath ) ;
     public final void rule__NestedField__PathAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28247:1: ( ( ruleNestedPath ) )
-            // InternalTableDSL.g:28248:2: ( ruleNestedPath )
+            // InternalTableDSL.g:26782:1: ( ( ruleNestedPath ) )
+            // InternalTableDSL.g:26783:2: ( ruleNestedPath )
             {
-            // InternalTableDSL.g:28248:2: ( ruleNestedPath )
-            // InternalTableDSL.g:28249:3: ruleNestedPath
+            // InternalTableDSL.g:26783:2: ( ruleNestedPath )
+            // InternalTableDSL.g:26784:3: ruleNestedPath
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedFieldAccess().getPathNestedPathParserRuleCall_2_0()); 
@@ -92757,23 +87758,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedPath__FieldAssignment_2"
-    // InternalTableDSL.g:28258:1: rule__NestedPath__FieldAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalTableDSL.g:26793:1: rule__NestedPath__FieldAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__NestedPath__FieldAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28262:1: ( ( ( RULE_ID ) ) )
-            // InternalTableDSL.g:28263:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26797:1: ( ( ( RULE_ID ) ) )
+            // InternalTableDSL.g:26798:2: ( ( RULE_ID ) )
             {
-            // InternalTableDSL.g:28263:2: ( ( RULE_ID ) )
-            // InternalTableDSL.g:28264:3: ( RULE_ID )
+            // InternalTableDSL.g:26798:2: ( ( RULE_ID ) )
+            // InternalTableDSL.g:26799:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedPathAccess().getFieldJvmOperationCrossReference_2_0()); 
             }
-            // InternalTableDSL.g:28265:3: ( RULE_ID )
-            // InternalTableDSL.g:28266:4: RULE_ID
+            // InternalTableDSL.g:26800:3: ( RULE_ID )
+            // InternalTableDSL.g:26801:4: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedPathAccess().getFieldJvmOperationIDTerminalRuleCall_2_0_1()); 
@@ -92810,17 +87811,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NestedPath__PathAssignment_3"
-    // InternalTableDSL.g:28277:1: rule__NestedPath__PathAssignment_3 : ( ruleNestedPath ) ;
+    // InternalTableDSL.g:26812:1: rule__NestedPath__PathAssignment_3 : ( ruleNestedPath ) ;
     public final void rule__NestedPath__PathAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28281:1: ( ( ruleNestedPath ) )
-            // InternalTableDSL.g:28282:2: ( ruleNestedPath )
+            // InternalTableDSL.g:26816:1: ( ( ruleNestedPath ) )
+            // InternalTableDSL.g:26817:2: ( ruleNestedPath )
             {
-            // InternalTableDSL.g:28282:2: ( ruleNestedPath )
-            // InternalTableDSL.g:28283:3: ruleNestedPath
+            // InternalTableDSL.g:26817:2: ( ruleNestedPath )
+            // InternalTableDSL.g:26818:3: ruleNestedPath
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNestedPathAccess().getPathNestedPathParserRuleCall_3_0()); 
@@ -92855,17 +87856,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyButtonStyle__EventTopicAssignment_3"
-    // InternalTableDSL.g:28292:1: rule__PropertyButtonStyle__EventTopicAssignment_3 : ( RULE_STRING ) ;
+    // InternalTableDSL.g:26827:1: rule__PropertyButtonStyle__EventTopicAssignment_3 : ( RULE_STRING ) ;
     public final void rule__PropertyButtonStyle__EventTopicAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28296:1: ( ( RULE_STRING ) )
-            // InternalTableDSL.g:28297:2: ( RULE_STRING )
+            // InternalTableDSL.g:26831:1: ( ( RULE_STRING ) )
+            // InternalTableDSL.g:26832:2: ( RULE_STRING )
             {
-            // InternalTableDSL.g:28297:2: ( RULE_STRING )
-            // InternalTableDSL.g:28298:3: RULE_STRING
+            // InternalTableDSL.g:26832:2: ( RULE_STRING )
+            // InternalTableDSL.g:26833:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyButtonStyleAccess().getEventTopicSTRINGTerminalRuleCall_3_0()); 
@@ -92896,17 +87897,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyDateStyle__DateFormatAssignment_3"
-    // InternalTableDSL.g:28307:1: rule__PropertyDateStyle__DateFormatAssignment_3 : ( RULE_STRING ) ;
+    // InternalTableDSL.g:26842:1: rule__PropertyDateStyle__DateFormatAssignment_3 : ( RULE_STRING ) ;
     public final void rule__PropertyDateStyle__DateFormatAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28311:1: ( ( RULE_STRING ) )
-            // InternalTableDSL.g:28312:2: ( RULE_STRING )
+            // InternalTableDSL.g:26846:1: ( ( RULE_STRING ) )
+            // InternalTableDSL.g:26847:2: ( RULE_STRING )
             {
-            // InternalTableDSL.g:28312:2: ( RULE_STRING )
-            // InternalTableDSL.g:28313:3: RULE_STRING
+            // InternalTableDSL.g:26847:2: ( RULE_STRING )
+            // InternalTableDSL.g:26848:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyDateStyleAccess().getDateFormatSTRINGTerminalRuleCall_3_0()); 
@@ -92937,17 +87938,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyNumberStyle__NumberFormatAssignment_3"
-    // InternalTableDSL.g:28322:1: rule__PropertyNumberStyle__NumberFormatAssignment_3 : ( RULE_STRING ) ;
+    // InternalTableDSL.g:26857:1: rule__PropertyNumberStyle__NumberFormatAssignment_3 : ( RULE_STRING ) ;
     public final void rule__PropertyNumberStyle__NumberFormatAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28326:1: ( ( RULE_STRING ) )
-            // InternalTableDSL.g:28327:2: ( RULE_STRING )
+            // InternalTableDSL.g:26861:1: ( ( RULE_STRING ) )
+            // InternalTableDSL.g:26862:2: ( RULE_STRING )
             {
-            // InternalTableDSL.g:28327:2: ( RULE_STRING )
-            // InternalTableDSL.g:28328:3: RULE_STRING
+            // InternalTableDSL.g:26862:2: ( RULE_STRING )
+            // InternalTableDSL.g:26863:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyNumberStyleAccess().getNumberFormatSTRINGTerminalRuleCall_3_0()); 
@@ -92978,17 +87979,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyProgressbarStyle__MaxValueAssignment_3"
-    // InternalTableDSL.g:28337:1: rule__PropertyProgressbarStyle__MaxValueAssignment_3 : ( ruleLDouble ) ;
+    // InternalTableDSL.g:26872:1: rule__PropertyProgressbarStyle__MaxValueAssignment_3 : ( ruleLDouble ) ;
     public final void rule__PropertyProgressbarStyle__MaxValueAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28341:1: ( ( ruleLDouble ) )
-            // InternalTableDSL.g:28342:2: ( ruleLDouble )
+            // InternalTableDSL.g:26876:1: ( ( ruleLDouble ) )
+            // InternalTableDSL.g:26877:2: ( ruleLDouble )
             {
-            // InternalTableDSL.g:28342:2: ( ruleLDouble )
-            // InternalTableDSL.g:28343:3: ruleLDouble
+            // InternalTableDSL.g:26877:2: ( ruleLDouble )
+            // InternalTableDSL.g:26878:3: ruleLDouble
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyProgressbarStyleAccess().getMaxValueLDoubleParserRuleCall_3_0()); 
@@ -93023,17 +88024,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__GridPropIndicatorStyle__GreenStartsAssignment_3"
-    // InternalTableDSL.g:28352:1: rule__GridPropIndicatorStyle__GreenStartsAssignment_3 : ( ruleLDouble ) ;
+    // InternalTableDSL.g:26887:1: rule__GridPropIndicatorStyle__GreenStartsAssignment_3 : ( ruleLDouble ) ;
     public final void rule__GridPropIndicatorStyle__GreenStartsAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28356:1: ( ( ruleLDouble ) )
-            // InternalTableDSL.g:28357:2: ( ruleLDouble )
+            // InternalTableDSL.g:26891:1: ( ( ruleLDouble ) )
+            // InternalTableDSL.g:26892:2: ( ruleLDouble )
             {
-            // InternalTableDSL.g:28357:2: ( ruleLDouble )
-            // InternalTableDSL.g:28358:3: ruleLDouble
+            // InternalTableDSL.g:26892:2: ( ruleLDouble )
+            // InternalTableDSL.g:26893:3: ruleLDouble
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGridPropIndicatorStyleAccess().getGreenStartsLDoubleParserRuleCall_3_0()); 
@@ -93068,17 +88069,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__GridPropIndicatorStyle__RedEndsAssignment_5"
-    // InternalTableDSL.g:28367:1: rule__GridPropIndicatorStyle__RedEndsAssignment_5 : ( ruleLDouble ) ;
+    // InternalTableDSL.g:26902:1: rule__GridPropIndicatorStyle__RedEndsAssignment_5 : ( ruleLDouble ) ;
     public final void rule__GridPropIndicatorStyle__RedEndsAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28371:1: ( ( ruleLDouble ) )
-            // InternalTableDSL.g:28372:2: ( ruleLDouble )
+            // InternalTableDSL.g:26906:1: ( ( ruleLDouble ) )
+            // InternalTableDSL.g:26907:2: ( ruleLDouble )
             {
-            // InternalTableDSL.g:28372:2: ( ruleLDouble )
-            // InternalTableDSL.g:28373:3: ruleLDouble
+            // InternalTableDSL.g:26907:2: ( ruleLDouble )
+            // InternalTableDSL.g:26908:3: ruleLDouble
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGridPropIndicatorStyleAccess().getRedEndsLDoubleParserRuleCall_5_0()); 
@@ -93113,17 +88114,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__EventTopicAssignment_2_1"
-    // InternalTableDSL.g:28382:1: rule__PropertyImageStyle__EventTopicAssignment_2_1 : ( RULE_STRING ) ;
+    // InternalTableDSL.g:26917:1: rule__PropertyImageStyle__EventTopicAssignment_2_1 : ( RULE_STRING ) ;
     public final void rule__PropertyImageStyle__EventTopicAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28386:1: ( ( RULE_STRING ) )
-            // InternalTableDSL.g:28387:2: ( RULE_STRING )
+            // InternalTableDSL.g:26921:1: ( ( RULE_STRING ) )
+            // InternalTableDSL.g:26922:2: ( RULE_STRING )
             {
-            // InternalTableDSL.g:28387:2: ( RULE_STRING )
-            // InternalTableDSL.g:28388:3: RULE_STRING
+            // InternalTableDSL.g:26922:2: ( RULE_STRING )
+            // InternalTableDSL.g:26923:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyImageStyleAccess().getEventTopicSTRINGTerminalRuleCall_2_1_0()); 
@@ -93154,17 +88155,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__PropertyImageStyle__ConfigsAssignment_4"
-    // InternalTableDSL.g:28397:1: rule__PropertyImageStyle__ConfigsAssignment_4 : ( ruleStyleConfig ) ;
+    // InternalTableDSL.g:26932:1: rule__PropertyImageStyle__ConfigsAssignment_4 : ( ruleStyleConfig ) ;
     public final void rule__PropertyImageStyle__ConfigsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28401:1: ( ( ruleStyleConfig ) )
-            // InternalTableDSL.g:28402:2: ( ruleStyleConfig )
+            // InternalTableDSL.g:26936:1: ( ( ruleStyleConfig ) )
+            // InternalTableDSL.g:26937:2: ( ruleStyleConfig )
             {
-            // InternalTableDSL.g:28402:2: ( ruleStyleConfig )
-            // InternalTableDSL.g:28403:3: ruleStyleConfig
+            // InternalTableDSL.g:26937:2: ( ruleStyleConfig )
+            // InternalTableDSL.g:26938:3: ruleStyleConfig
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPropertyImageStyleAccess().getConfigsStyleConfigParserRuleCall_4_0()); 
@@ -93199,17 +88200,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NumericToResourceStyleConfig__CompareAssignment_1"
-    // InternalTableDSL.g:28412:1: rule__NumericToResourceStyleConfig__CompareAssignment_1 : ( ruleStyleCompare ) ;
+    // InternalTableDSL.g:26947:1: rule__NumericToResourceStyleConfig__CompareAssignment_1 : ( ruleStyleCompare ) ;
     public final void rule__NumericToResourceStyleConfig__CompareAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28416:1: ( ( ruleStyleCompare ) )
-            // InternalTableDSL.g:28417:2: ( ruleStyleCompare )
+            // InternalTableDSL.g:26951:1: ( ( ruleStyleCompare ) )
+            // InternalTableDSL.g:26952:2: ( ruleStyleCompare )
             {
-            // InternalTableDSL.g:28417:2: ( ruleStyleCompare )
-            // InternalTableDSL.g:28418:3: ruleStyleCompare
+            // InternalTableDSL.g:26952:2: ( ruleStyleCompare )
+            // InternalTableDSL.g:26953:3: ruleStyleCompare
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumericToResourceStyleConfigAccess().getCompareStyleCompareEnumRuleCall_1_0()); 
@@ -93244,17 +88245,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NumericToResourceStyleConfig__ValueAssignment_2"
-    // InternalTableDSL.g:28427:1: rule__NumericToResourceStyleConfig__ValueAssignment_2 : ( ruleLDouble ) ;
+    // InternalTableDSL.g:26962:1: rule__NumericToResourceStyleConfig__ValueAssignment_2 : ( ruleLDouble ) ;
     public final void rule__NumericToResourceStyleConfig__ValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28431:1: ( ( ruleLDouble ) )
-            // InternalTableDSL.g:28432:2: ( ruleLDouble )
+            // InternalTableDSL.g:26966:1: ( ( ruleLDouble ) )
+            // InternalTableDSL.g:26967:2: ( ruleLDouble )
             {
-            // InternalTableDSL.g:28432:2: ( ruleLDouble )
-            // InternalTableDSL.g:28433:3: ruleLDouble
+            // InternalTableDSL.g:26967:2: ( ruleLDouble )
+            // InternalTableDSL.g:26968:3: ruleLDouble
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumericToResourceStyleConfigAccess().getValueLDoubleParserRuleCall_2_0()); 
@@ -93289,17 +88290,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4"
-    // InternalTableDSL.g:28442:1: rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4 : ( RULE_THEME_RESOURCE ) ;
+    // InternalTableDSL.g:26977:1: rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4 : ( RULE_THEME_RESOURCE ) ;
     public final void rule__NumericToResourceStyleConfig__ResourceThemePathAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28446:1: ( ( RULE_THEME_RESOURCE ) )
-            // InternalTableDSL.g:28447:2: ( RULE_THEME_RESOURCE )
+            // InternalTableDSL.g:26981:1: ( ( RULE_THEME_RESOURCE ) )
+            // InternalTableDSL.g:26982:2: ( RULE_THEME_RESOURCE )
             {
-            // InternalTableDSL.g:28447:2: ( RULE_THEME_RESOURCE )
-            // InternalTableDSL.g:28448:3: RULE_THEME_RESOURCE
+            // InternalTableDSL.g:26982:2: ( RULE_THEME_RESOURCE )
+            // InternalTableDSL.g:26983:3: RULE_THEME_RESOURCE
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumericToResourceStyleConfigAccess().getResourceThemePathTHEME_RESOURCETerminalRuleCall_4_0()); 
@@ -93330,17 +88331,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__StringToResourceStyleConfig__CompareAssignment_1"
-    // InternalTableDSL.g:28457:1: rule__StringToResourceStyleConfig__CompareAssignment_1 : ( ruleStyleCompare ) ;
+    // InternalTableDSL.g:26992:1: rule__StringToResourceStyleConfig__CompareAssignment_1 : ( ruleStyleCompare ) ;
     public final void rule__StringToResourceStyleConfig__CompareAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28461:1: ( ( ruleStyleCompare ) )
-            // InternalTableDSL.g:28462:2: ( ruleStyleCompare )
+            // InternalTableDSL.g:26996:1: ( ( ruleStyleCompare ) )
+            // InternalTableDSL.g:26997:2: ( ruleStyleCompare )
             {
-            // InternalTableDSL.g:28462:2: ( ruleStyleCompare )
-            // InternalTableDSL.g:28463:3: ruleStyleCompare
+            // InternalTableDSL.g:26997:2: ( ruleStyleCompare )
+            // InternalTableDSL.g:26998:3: ruleStyleCompare
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringToResourceStyleConfigAccess().getCompareStyleCompareEnumRuleCall_1_0()); 
@@ -93375,17 +88376,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__StringToResourceStyleConfig__ValueAssignment_2"
-    // InternalTableDSL.g:28472:1: rule__StringToResourceStyleConfig__ValueAssignment_2 : ( RULE_STRING ) ;
+    // InternalTableDSL.g:27007:1: rule__StringToResourceStyleConfig__ValueAssignment_2 : ( RULE_STRING ) ;
     public final void rule__StringToResourceStyleConfig__ValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28476:1: ( ( RULE_STRING ) )
-            // InternalTableDSL.g:28477:2: ( RULE_STRING )
+            // InternalTableDSL.g:27011:1: ( ( RULE_STRING ) )
+            // InternalTableDSL.g:27012:2: ( RULE_STRING )
             {
-            // InternalTableDSL.g:28477:2: ( RULE_STRING )
-            // InternalTableDSL.g:28478:3: RULE_STRING
+            // InternalTableDSL.g:27012:2: ( RULE_STRING )
+            // InternalTableDSL.g:27013:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringToResourceStyleConfigAccess().getValueSTRINGTerminalRuleCall_2_0()); 
@@ -93416,17 +88417,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4"
-    // InternalTableDSL.g:28487:1: rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4 : ( RULE_THEME_RESOURCE ) ;
+    // InternalTableDSL.g:27022:1: rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4 : ( RULE_THEME_RESOURCE ) ;
     public final void rule__StringToResourceStyleConfig__ResourceThemePathAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28491:1: ( ( RULE_THEME_RESOURCE ) )
-            // InternalTableDSL.g:28492:2: ( RULE_THEME_RESOURCE )
+            // InternalTableDSL.g:27026:1: ( ( RULE_THEME_RESOURCE ) )
+            // InternalTableDSL.g:27027:2: ( RULE_THEME_RESOURCE )
             {
-            // InternalTableDSL.g:28492:2: ( RULE_THEME_RESOURCE )
-            // InternalTableDSL.g:28493:3: RULE_THEME_RESOURCE
+            // InternalTableDSL.g:27027:2: ( RULE_THEME_RESOURCE )
+            // InternalTableDSL.g:27028:3: RULE_THEME_RESOURCE
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringToResourceStyleConfigAccess().getResourceThemePathTHEME_RESOURCETerminalRuleCall_4_0()); 
@@ -93457,23 +88458,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__StaticAssignment_2_0_0"
-    // InternalTableDSL.g:28502:1: rule__XImportDeclaration__StaticAssignment_2_0_0 : ( ( 'static' ) ) ;
+    // InternalTableDSL.g:27037:1: rule__XImportDeclaration__StaticAssignment_2_0_0 : ( ( 'static' ) ) ;
     public final void rule__XImportDeclaration__StaticAssignment_2_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28506:1: ( ( ( 'static' ) ) )
-            // InternalTableDSL.g:28507:2: ( ( 'static' ) )
+            // InternalTableDSL.g:27041:1: ( ( ( 'static' ) ) )
+            // InternalTableDSL.g:27042:2: ( ( 'static' ) )
             {
-            // InternalTableDSL.g:28507:2: ( ( 'static' ) )
-            // InternalTableDSL.g:28508:3: ( 'static' )
+            // InternalTableDSL.g:27042:2: ( ( 'static' ) )
+            // InternalTableDSL.g:27043:3: ( 'static' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getStaticStaticKeyword_2_0_0_0()); 
             }
-            // InternalTableDSL.g:28509:3: ( 'static' )
-            // InternalTableDSL.g:28510:4: 'static'
+            // InternalTableDSL.g:27044:3: ( 'static' )
+            // InternalTableDSL.g:27045:4: 'static'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getStaticStaticKeyword_2_0_0_0()); 
@@ -93510,23 +88511,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__ExtensionAssignment_2_0_1"
-    // InternalTableDSL.g:28521:1: rule__XImportDeclaration__ExtensionAssignment_2_0_1 : ( ( 'extension' ) ) ;
+    // InternalTableDSL.g:27056:1: rule__XImportDeclaration__ExtensionAssignment_2_0_1 : ( ( 'extension' ) ) ;
     public final void rule__XImportDeclaration__ExtensionAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28525:1: ( ( ( 'extension' ) ) )
-            // InternalTableDSL.g:28526:2: ( ( 'extension' ) )
+            // InternalTableDSL.g:27060:1: ( ( ( 'extension' ) ) )
+            // InternalTableDSL.g:27061:2: ( ( 'extension' ) )
             {
-            // InternalTableDSL.g:28526:2: ( ( 'extension' ) )
-            // InternalTableDSL.g:28527:3: ( 'extension' )
+            // InternalTableDSL.g:27061:2: ( ( 'extension' ) )
+            // InternalTableDSL.g:27062:3: ( 'extension' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getExtensionExtensionKeyword_2_0_1_0()); 
             }
-            // InternalTableDSL.g:28528:3: ( 'extension' )
-            // InternalTableDSL.g:28529:4: 'extension'
+            // InternalTableDSL.g:27063:3: ( 'extension' )
+            // InternalTableDSL.g:27064:4: 'extension'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getExtensionExtensionKeyword_2_0_1_0()); 
@@ -93563,23 +88564,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedTypeAssignment_2_0_2"
-    // InternalTableDSL.g:28540:1: rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 : ( ( ruleQualifiedNameInStaticImport ) ) ;
+    // InternalTableDSL.g:27075:1: rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 : ( ( ruleQualifiedNameInStaticImport ) ) ;
     public final void rule__XImportDeclaration__ImportedTypeAssignment_2_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28544:1: ( ( ( ruleQualifiedNameInStaticImport ) ) )
-            // InternalTableDSL.g:28545:2: ( ( ruleQualifiedNameInStaticImport ) )
+            // InternalTableDSL.g:27079:1: ( ( ( ruleQualifiedNameInStaticImport ) ) )
+            // InternalTableDSL.g:27080:2: ( ( ruleQualifiedNameInStaticImport ) )
             {
-            // InternalTableDSL.g:28545:2: ( ( ruleQualifiedNameInStaticImport ) )
-            // InternalTableDSL.g:28546:3: ( ruleQualifiedNameInStaticImport )
+            // InternalTableDSL.g:27080:2: ( ( ruleQualifiedNameInStaticImport ) )
+            // InternalTableDSL.g:27081:3: ( ruleQualifiedNameInStaticImport )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_2_0_2_0()); 
             }
-            // InternalTableDSL.g:28547:3: ( ruleQualifiedNameInStaticImport )
-            // InternalTableDSL.g:28548:4: ruleQualifiedNameInStaticImport
+            // InternalTableDSL.g:27082:3: ( ruleQualifiedNameInStaticImport )
+            // InternalTableDSL.g:27083:4: ruleQualifiedNameInStaticImport
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeQualifiedNameInStaticImportParserRuleCall_2_0_2_0_1()); 
@@ -93620,23 +88621,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__WildcardAssignment_2_0_3_0"
-    // InternalTableDSL.g:28559:1: rule__XImportDeclaration__WildcardAssignment_2_0_3_0 : ( ( '*' ) ) ;
+    // InternalTableDSL.g:27094:1: rule__XImportDeclaration__WildcardAssignment_2_0_3_0 : ( ( '*' ) ) ;
     public final void rule__XImportDeclaration__WildcardAssignment_2_0_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28563:1: ( ( ( '*' ) ) )
-            // InternalTableDSL.g:28564:2: ( ( '*' ) )
+            // InternalTableDSL.g:27098:1: ( ( ( '*' ) ) )
+            // InternalTableDSL.g:27099:2: ( ( '*' ) )
             {
-            // InternalTableDSL.g:28564:2: ( ( '*' ) )
-            // InternalTableDSL.g:28565:3: ( '*' )
+            // InternalTableDSL.g:27099:2: ( ( '*' ) )
+            // InternalTableDSL.g:27100:3: ( '*' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getWildcardAsteriskKeyword_2_0_3_0_0()); 
             }
-            // InternalTableDSL.g:28566:3: ( '*' )
-            // InternalTableDSL.g:28567:4: '*'
+            // InternalTableDSL.g:27101:3: ( '*' )
+            // InternalTableDSL.g:27102:4: '*'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getWildcardAsteriskKeyword_2_0_3_0_0()); 
@@ -93673,17 +88674,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__MemberNameAssignment_2_0_3_1"
-    // InternalTableDSL.g:28578:1: rule__XImportDeclaration__MemberNameAssignment_2_0_3_1 : ( ruleValidID ) ;
+    // InternalTableDSL.g:27113:1: rule__XImportDeclaration__MemberNameAssignment_2_0_3_1 : ( ruleValidID ) ;
     public final void rule__XImportDeclaration__MemberNameAssignment_2_0_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28582:1: ( ( ruleValidID ) )
-            // InternalTableDSL.g:28583:2: ( ruleValidID )
+            // InternalTableDSL.g:27117:1: ( ( ruleValidID ) )
+            // InternalTableDSL.g:27118:2: ( ruleValidID )
             {
-            // InternalTableDSL.g:28583:2: ( ruleValidID )
-            // InternalTableDSL.g:28584:3: ruleValidID
+            // InternalTableDSL.g:27118:2: ( ruleValidID )
+            // InternalTableDSL.g:27119:3: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getMemberNameValidIDParserRuleCall_2_0_3_1_0()); 
@@ -93718,23 +88719,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedTypeAssignment_2_1"
-    // InternalTableDSL.g:28593:1: rule__XImportDeclaration__ImportedTypeAssignment_2_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalTableDSL.g:27128:1: rule__XImportDeclaration__ImportedTypeAssignment_2_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XImportDeclaration__ImportedTypeAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28597:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalTableDSL.g:28598:2: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:27132:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalTableDSL.g:27133:2: ( ( ruleQualifiedName ) )
             {
-            // InternalTableDSL.g:28598:2: ( ( ruleQualifiedName ) )
-            // InternalTableDSL.g:28599:3: ( ruleQualifiedName )
+            // InternalTableDSL.g:27133:2: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:27134:3: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_2_1_0()); 
             }
-            // InternalTableDSL.g:28600:3: ( ruleQualifiedName )
-            // InternalTableDSL.g:28601:4: ruleQualifiedName
+            // InternalTableDSL.g:27135:3: ( ruleQualifiedName )
+            // InternalTableDSL.g:27136:4: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeQualifiedNameParserRuleCall_2_1_0_1()); 
@@ -93775,17 +88776,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedNamespaceAssignment_2_2"
-    // InternalTableDSL.g:28612:1: rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 : ( ruleQualifiedNameWithWildcard ) ;
+    // InternalTableDSL.g:27147:1: rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 : ( ruleQualifiedNameWithWildcard ) ;
     public final void rule__XImportDeclaration__ImportedNamespaceAssignment_2_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28616:1: ( ( ruleQualifiedNameWithWildcard ) )
-            // InternalTableDSL.g:28617:2: ( ruleQualifiedNameWithWildcard )
+            // InternalTableDSL.g:27151:1: ( ( ruleQualifiedNameWithWildcard ) )
+            // InternalTableDSL.g:27152:2: ( ruleQualifiedNameWithWildcard )
             {
-            // InternalTableDSL.g:28617:2: ( ruleQualifiedNameWithWildcard )
-            // InternalTableDSL.g:28618:3: ruleQualifiedNameWithWildcard
+            // InternalTableDSL.g:27152:2: ( ruleQualifiedNameWithWildcard )
+            // InternalTableDSL.g:27153:3: ruleQualifiedNameWithWildcard
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceQualifiedNameWithWildcardParserRuleCall_2_2_0()); 
@@ -93820,28 +88821,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__FqnImportAssignment_2_3_0"
-    // InternalTableDSL.g:28627:1: rule__XImportDeclaration__FqnImportAssignment_2_3_0 : ( ( 'ns' ) ) ;
+    // InternalTableDSL.g:27162:1: rule__XImportDeclaration__FqnImportAssignment_2_3_0 : ( ( 'ns' ) ) ;
     public final void rule__XImportDeclaration__FqnImportAssignment_2_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28631:1: ( ( ( 'ns' ) ) )
-            // InternalTableDSL.g:28632:2: ( ( 'ns' ) )
+            // InternalTableDSL.g:27166:1: ( ( ( 'ns' ) ) )
+            // InternalTableDSL.g:27167:2: ( ( 'ns' ) )
             {
-            // InternalTableDSL.g:28632:2: ( ( 'ns' ) )
-            // InternalTableDSL.g:28633:3: ( 'ns' )
+            // InternalTableDSL.g:27167:2: ( ( 'ns' ) )
+            // InternalTableDSL.g:27168:3: ( 'ns' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getFqnImportNsKeyword_2_3_0_0()); 
             }
-            // InternalTableDSL.g:28634:3: ( 'ns' )
-            // InternalTableDSL.g:28635:4: 'ns'
+            // InternalTableDSL.g:27169:3: ( 'ns' )
+            // InternalTableDSL.g:27170:4: 'ns'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getFqnImportNsKeyword_2_3_0_0()); 
             }
-            match(input,179,FOLLOW_2); if (state.failed) return ;
+            match(input,176,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportDeclarationAccess().getFqnImportNsKeyword_2_3_0_0()); 
             }
@@ -93873,17 +88874,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1"
-    // InternalTableDSL.g:28646:1: rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 : ( ruleQualifiedName ) ;
+    // InternalTableDSL.g:27181:1: rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 : ( ruleQualifiedName ) ;
     public final void rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28650:1: ( ( ruleQualifiedName ) )
-            // InternalTableDSL.g:28651:2: ( ruleQualifiedName )
+            // InternalTableDSL.g:27185:1: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:27186:2: ( ruleQualifiedName )
             {
-            // InternalTableDSL.g:28651:2: ( ruleQualifiedName )
-            // InternalTableDSL.g:28652:3: ruleQualifiedName
+            // InternalTableDSL.g:27186:2: ( ruleQualifiedName )
+            // InternalTableDSL.g:27187:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedFullyQualifiedNameQualifiedNameParserRuleCall_2_3_1_0()); 
@@ -93918,23 +88919,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__AnnotationTypeAssignment_2"
-    // InternalTableDSL.g:28661:1: rule__XAnnotation__AnnotationTypeAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // InternalTableDSL.g:27196:1: rule__XAnnotation__AnnotationTypeAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XAnnotation__AnnotationTypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28665:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalTableDSL.g:28666:2: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:27200:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalTableDSL.g:27201:2: ( ( ruleQualifiedName ) )
             {
-            // InternalTableDSL.g:28666:2: ( ( ruleQualifiedName ) )
-            // InternalTableDSL.g:28667:3: ( ruleQualifiedName )
+            // InternalTableDSL.g:27201:2: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:27202:3: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAnnotationTypeJvmAnnotationTypeCrossReference_2_0()); 
             }
-            // InternalTableDSL.g:28668:3: ( ruleQualifiedName )
-            // InternalTableDSL.g:28669:4: ruleQualifiedName
+            // InternalTableDSL.g:27203:3: ( ruleQualifiedName )
+            // InternalTableDSL.g:27204:4: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAnnotationTypeJvmAnnotationTypeQualifiedNameParserRuleCall_2_0_1()); 
@@ -93975,17 +88976,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0"
-    // InternalTableDSL.g:28680:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 : ( ruleXAnnotationElementValuePair ) ;
+    // InternalTableDSL.g:27215:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 : ( ruleXAnnotationElementValuePair ) ;
     public final void rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28684:1: ( ( ruleXAnnotationElementValuePair ) )
-            // InternalTableDSL.g:28685:2: ( ruleXAnnotationElementValuePair )
+            // InternalTableDSL.g:27219:1: ( ( ruleXAnnotationElementValuePair ) )
+            // InternalTableDSL.g:27220:2: ( ruleXAnnotationElementValuePair )
             {
-            // InternalTableDSL.g:28685:2: ( ruleXAnnotationElementValuePair )
-            // InternalTableDSL.g:28686:3: ruleXAnnotationElementValuePair
+            // InternalTableDSL.g:27220:2: ( ruleXAnnotationElementValuePair )
+            // InternalTableDSL.g:27221:3: ruleXAnnotationElementValuePair
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_0_0()); 
@@ -94020,17 +89021,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1"
-    // InternalTableDSL.g:28695:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 : ( ruleXAnnotationElementValuePair ) ;
+    // InternalTableDSL.g:27230:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 : ( ruleXAnnotationElementValuePair ) ;
     public final void rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28699:1: ( ( ruleXAnnotationElementValuePair ) )
-            // InternalTableDSL.g:28700:2: ( ruleXAnnotationElementValuePair )
+            // InternalTableDSL.g:27234:1: ( ( ruleXAnnotationElementValuePair ) )
+            // InternalTableDSL.g:27235:2: ( ruleXAnnotationElementValuePair )
             {
-            // InternalTableDSL.g:28700:2: ( ruleXAnnotationElementValuePair )
-            // InternalTableDSL.g:28701:3: ruleXAnnotationElementValuePair
+            // InternalTableDSL.g:27235:2: ( ruleXAnnotationElementValuePair )
+            // InternalTableDSL.g:27236:3: ruleXAnnotationElementValuePair
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_1_1_0()); 
@@ -94065,17 +89066,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotation__ValueAssignment_3_1_1"
-    // InternalTableDSL.g:28710:1: rule__XAnnotation__ValueAssignment_3_1_1 : ( ruleXAnnotationElementValueOrCommaList ) ;
+    // InternalTableDSL.g:27245:1: rule__XAnnotation__ValueAssignment_3_1_1 : ( ruleXAnnotationElementValueOrCommaList ) ;
     public final void rule__XAnnotation__ValueAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28714:1: ( ( ruleXAnnotationElementValueOrCommaList ) )
-            // InternalTableDSL.g:28715:2: ( ruleXAnnotationElementValueOrCommaList )
+            // InternalTableDSL.g:27249:1: ( ( ruleXAnnotationElementValueOrCommaList ) )
+            // InternalTableDSL.g:27250:2: ( ruleXAnnotationElementValueOrCommaList )
             {
-            // InternalTableDSL.g:28715:2: ( ruleXAnnotationElementValueOrCommaList )
-            // InternalTableDSL.g:28716:3: ruleXAnnotationElementValueOrCommaList
+            // InternalTableDSL.g:27250:2: ( ruleXAnnotationElementValueOrCommaList )
+            // InternalTableDSL.g:27251:3: ruleXAnnotationElementValueOrCommaList
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getValueXAnnotationElementValueOrCommaListParserRuleCall_3_1_1_0()); 
@@ -94110,23 +89111,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__ElementAssignment_0_0_0"
-    // InternalTableDSL.g:28725:1: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 : ( ( ruleValidID ) ) ;
+    // InternalTableDSL.g:27260:1: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 : ( ( ruleValidID ) ) ;
     public final void rule__XAnnotationElementValuePair__ElementAssignment_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28729:1: ( ( ( ruleValidID ) ) )
-            // InternalTableDSL.g:28730:2: ( ( ruleValidID ) )
+            // InternalTableDSL.g:27264:1: ( ( ( ruleValidID ) ) )
+            // InternalTableDSL.g:27265:2: ( ( ruleValidID ) )
             {
-            // InternalTableDSL.g:28730:2: ( ( ruleValidID ) )
-            // InternalTableDSL.g:28731:3: ( ruleValidID )
+            // InternalTableDSL.g:27265:2: ( ( ruleValidID ) )
+            // InternalTableDSL.g:27266:3: ( ruleValidID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationCrossReference_0_0_0_0()); 
             }
-            // InternalTableDSL.g:28732:3: ( ruleValidID )
-            // InternalTableDSL.g:28733:4: ruleValidID
+            // InternalTableDSL.g:27267:3: ( ruleValidID )
+            // InternalTableDSL.g:27268:4: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationValidIDParserRuleCall_0_0_0_0_1()); 
@@ -94167,17 +89168,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__ValueAssignment_1"
-    // InternalTableDSL.g:28744:1: rule__XAnnotationElementValuePair__ValueAssignment_1 : ( ruleXAnnotationElementValue ) ;
+    // InternalTableDSL.g:27279:1: rule__XAnnotationElementValuePair__ValueAssignment_1 : ( ruleXAnnotationElementValue ) ;
     public final void rule__XAnnotationElementValuePair__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28748:1: ( ( ruleXAnnotationElementValue ) )
-            // InternalTableDSL.g:28749:2: ( ruleXAnnotationElementValue )
+            // InternalTableDSL.g:27283:1: ( ( ruleXAnnotationElementValue ) )
+            // InternalTableDSL.g:27284:2: ( ruleXAnnotationElementValue )
             {
-            // InternalTableDSL.g:28749:2: ( ruleXAnnotationElementValue )
-            // InternalTableDSL.g:28750:3: ruleXAnnotationElementValue
+            // InternalTableDSL.g:27284:2: ( ruleXAnnotationElementValue )
+            // InternalTableDSL.g:27285:3: ruleXAnnotationElementValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getValueXAnnotationElementValueParserRuleCall_1_0()); 
@@ -94212,17 +89213,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0"
-    // InternalTableDSL.g:28759:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
+    // InternalTableDSL.g:27294:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28763:1: ( ( ruleXAnnotationOrExpression ) )
-            // InternalTableDSL.g:28764:2: ( ruleXAnnotationOrExpression )
+            // InternalTableDSL.g:27298:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalTableDSL.g:27299:2: ( ruleXAnnotationOrExpression )
             {
-            // InternalTableDSL.g:28764:2: ( ruleXAnnotationOrExpression )
-            // InternalTableDSL.g:28765:3: ruleXAnnotationOrExpression
+            // InternalTableDSL.g:27299:2: ( ruleXAnnotationOrExpression )
+            // InternalTableDSL.g:27300:3: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
@@ -94257,17 +89258,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1"
-    // InternalTableDSL.g:28774:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
+    // InternalTableDSL.g:27309:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28778:1: ( ( ruleXAnnotationOrExpression ) )
-            // InternalTableDSL.g:28779:2: ( ruleXAnnotationOrExpression )
+            // InternalTableDSL.g:27313:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalTableDSL.g:27314:2: ( ruleXAnnotationOrExpression )
             {
-            // InternalTableDSL.g:28779:2: ( ruleXAnnotationOrExpression )
-            // InternalTableDSL.g:28780:3: ruleXAnnotationOrExpression
+            // InternalTableDSL.g:27314:2: ( ruleXAnnotationOrExpression )
+            // InternalTableDSL.g:27315:3: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
@@ -94302,17 +89303,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1"
-    // InternalTableDSL.g:28789:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 : ( ruleXAnnotationOrExpression ) ;
+    // InternalTableDSL.g:27324:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28793:1: ( ( ruleXAnnotationOrExpression ) )
-            // InternalTableDSL.g:28794:2: ( ruleXAnnotationOrExpression )
+            // InternalTableDSL.g:27328:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalTableDSL.g:27329:2: ( ruleXAnnotationOrExpression )
             {
-            // InternalTableDSL.g:28794:2: ( ruleXAnnotationOrExpression )
-            // InternalTableDSL.g:28795:3: ruleXAnnotationOrExpression
+            // InternalTableDSL.g:27329:2: ( ruleXAnnotationOrExpression )
+            // InternalTableDSL.g:27330:3: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_1_1_1_1_0()); 
@@ -94347,17 +89348,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__ElementsAssignment_0_1_0"
-    // InternalTableDSL.g:28804:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
+    // InternalTableDSL.g:27339:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValue__ElementsAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28808:1: ( ( ruleXAnnotationOrExpression ) )
-            // InternalTableDSL.g:28809:2: ( ruleXAnnotationOrExpression )
+            // InternalTableDSL.g:27343:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalTableDSL.g:27344:2: ( ruleXAnnotationOrExpression )
             {
-            // InternalTableDSL.g:28809:2: ( ruleXAnnotationOrExpression )
-            // InternalTableDSL.g:28810:3: ruleXAnnotationOrExpression
+            // InternalTableDSL.g:27344:2: ( ruleXAnnotationOrExpression )
+            // InternalTableDSL.g:27345:3: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
@@ -94392,17 +89393,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1"
-    // InternalTableDSL.g:28819:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
+    // InternalTableDSL.g:27354:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28823:1: ( ( ruleXAnnotationOrExpression ) )
-            // InternalTableDSL.g:28824:2: ( ruleXAnnotationOrExpression )
+            // InternalTableDSL.g:27358:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalTableDSL.g:27359:2: ( ruleXAnnotationOrExpression )
             {
-            // InternalTableDSL.g:28824:2: ( ruleXAnnotationOrExpression )
-            // InternalTableDSL.g:28825:3: ruleXAnnotationOrExpression
+            // InternalTableDSL.g:27359:2: ( ruleXAnnotationOrExpression )
+            // InternalTableDSL.g:27360:3: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
@@ -94437,23 +89438,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__FeatureAssignment_0_1"
-    // InternalTableDSL.g:28834:1: rule__XAssignment__FeatureAssignment_0_1 : ( ( ruleFeatureCallID ) ) ;
+    // InternalTableDSL.g:27369:1: rule__XAssignment__FeatureAssignment_0_1 : ( ( ruleFeatureCallID ) ) ;
     public final void rule__XAssignment__FeatureAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28838:1: ( ( ( ruleFeatureCallID ) ) )
-            // InternalTableDSL.g:28839:2: ( ( ruleFeatureCallID ) )
+            // InternalTableDSL.g:27373:1: ( ( ( ruleFeatureCallID ) ) )
+            // InternalTableDSL.g:27374:2: ( ( ruleFeatureCallID ) )
             {
-            // InternalTableDSL.g:28839:2: ( ( ruleFeatureCallID ) )
-            // InternalTableDSL.g:28840:3: ( ruleFeatureCallID )
+            // InternalTableDSL.g:27374:2: ( ( ruleFeatureCallID ) )
+            // InternalTableDSL.g:27375:3: ( ruleFeatureCallID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
             }
-            // InternalTableDSL.g:28841:3: ( ruleFeatureCallID )
-            // InternalTableDSL.g:28842:4: ruleFeatureCallID
+            // InternalTableDSL.g:27376:3: ( ruleFeatureCallID )
+            // InternalTableDSL.g:27377:4: ruleFeatureCallID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementFeatureCallIDParserRuleCall_0_1_0_1()); 
@@ -94494,17 +89495,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__ValueAssignment_0_3"
-    // InternalTableDSL.g:28853:1: rule__XAssignment__ValueAssignment_0_3 : ( ruleXAssignment ) ;
+    // InternalTableDSL.g:27388:1: rule__XAssignment__ValueAssignment_0_3 : ( ruleXAssignment ) ;
     public final void rule__XAssignment__ValueAssignment_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28857:1: ( ( ruleXAssignment ) )
-            // InternalTableDSL.g:28858:2: ( ruleXAssignment )
+            // InternalTableDSL.g:27392:1: ( ( ruleXAssignment ) )
+            // InternalTableDSL.g:27393:2: ( ruleXAssignment )
             {
-            // InternalTableDSL.g:28858:2: ( ruleXAssignment )
-            // InternalTableDSL.g:28859:3: ruleXAssignment
+            // InternalTableDSL.g:27393:2: ( ruleXAssignment )
+            // InternalTableDSL.g:27394:3: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getValueXAssignmentParserRuleCall_0_3_0()); 
@@ -94539,23 +89540,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__FeatureAssignment_1_1_0_0_1"
-    // InternalTableDSL.g:28868:1: rule__XAssignment__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpMultiAssign ) ) ;
+    // InternalTableDSL.g:27403:1: rule__XAssignment__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpMultiAssign ) ) ;
     public final void rule__XAssignment__FeatureAssignment_1_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28872:1: ( ( ( ruleOpMultiAssign ) ) )
-            // InternalTableDSL.g:28873:2: ( ( ruleOpMultiAssign ) )
+            // InternalTableDSL.g:27407:1: ( ( ( ruleOpMultiAssign ) ) )
+            // InternalTableDSL.g:27408:2: ( ( ruleOpMultiAssign ) )
             {
-            // InternalTableDSL.g:28873:2: ( ( ruleOpMultiAssign ) )
-            // InternalTableDSL.g:28874:3: ( ruleOpMultiAssign )
+            // InternalTableDSL.g:27408:2: ( ( ruleOpMultiAssign ) )
+            // InternalTableDSL.g:27409:3: ( ruleOpMultiAssign )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             }
-            // InternalTableDSL.g:28875:3: ( ruleOpMultiAssign )
-            // InternalTableDSL.g:28876:4: ruleOpMultiAssign
+            // InternalTableDSL.g:27410:3: ( ruleOpMultiAssign )
+            // InternalTableDSL.g:27411:4: ruleOpMultiAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementOpMultiAssignParserRuleCall_1_1_0_0_1_0_1()); 
@@ -94596,17 +89597,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAssignment__RightOperandAssignment_1_1_1"
-    // InternalTableDSL.g:28887:1: rule__XAssignment__RightOperandAssignment_1_1_1 : ( ruleXAssignment ) ;
+    // InternalTableDSL.g:27422:1: rule__XAssignment__RightOperandAssignment_1_1_1 : ( ruleXAssignment ) ;
     public final void rule__XAssignment__RightOperandAssignment_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28891:1: ( ( ruleXAssignment ) )
-            // InternalTableDSL.g:28892:2: ( ruleXAssignment )
+            // InternalTableDSL.g:27426:1: ( ( ruleXAssignment ) )
+            // InternalTableDSL.g:27427:2: ( ruleXAssignment )
             {
-            // InternalTableDSL.g:28892:2: ( ruleXAssignment )
-            // InternalTableDSL.g:28893:3: ruleXAssignment
+            // InternalTableDSL.g:27427:2: ( ruleXAssignment )
+            // InternalTableDSL.g:27428:3: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getRightOperandXAssignmentParserRuleCall_1_1_1_0()); 
@@ -94641,23 +89642,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__FeatureAssignment_1_0_0_1"
-    // InternalTableDSL.g:28902:1: rule__XOrExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOr ) ) ;
+    // InternalTableDSL.g:27437:1: rule__XOrExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOr ) ) ;
     public final void rule__XOrExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28906:1: ( ( ( ruleOpOr ) ) )
-            // InternalTableDSL.g:28907:2: ( ( ruleOpOr ) )
+            // InternalTableDSL.g:27441:1: ( ( ( ruleOpOr ) ) )
+            // InternalTableDSL.g:27442:2: ( ( ruleOpOr ) )
             {
-            // InternalTableDSL.g:28907:2: ( ( ruleOpOr ) )
-            // InternalTableDSL.g:28908:3: ( ruleOpOr )
+            // InternalTableDSL.g:27442:2: ( ( ruleOpOr ) )
+            // InternalTableDSL.g:27443:3: ( ruleOpOr )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // InternalTableDSL.g:28909:3: ( ruleOpOr )
-            // InternalTableDSL.g:28910:4: ruleOpOr
+            // InternalTableDSL.g:27444:3: ( ruleOpOr )
+            // InternalTableDSL.g:27445:4: ruleOpOr
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementOpOrParserRuleCall_1_0_0_1_0_1()); 
@@ -94698,17 +89699,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOrExpression__RightOperandAssignment_1_1"
-    // InternalTableDSL.g:28921:1: rule__XOrExpression__RightOperandAssignment_1_1 : ( ruleXAndExpression ) ;
+    // InternalTableDSL.g:27456:1: rule__XOrExpression__RightOperandAssignment_1_1 : ( ruleXAndExpression ) ;
     public final void rule__XOrExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28925:1: ( ( ruleXAndExpression ) )
-            // InternalTableDSL.g:28926:2: ( ruleXAndExpression )
+            // InternalTableDSL.g:27460:1: ( ( ruleXAndExpression ) )
+            // InternalTableDSL.g:27461:2: ( ruleXAndExpression )
             {
-            // InternalTableDSL.g:28926:2: ( ruleXAndExpression )
-            // InternalTableDSL.g:28927:3: ruleXAndExpression
+            // InternalTableDSL.g:27461:2: ( ruleXAndExpression )
+            // InternalTableDSL.g:27462:3: ruleXAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getRightOperandXAndExpressionParserRuleCall_1_1_0()); 
@@ -94743,23 +89744,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__FeatureAssignment_1_0_0_1"
-    // InternalTableDSL.g:28936:1: rule__XAndExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAnd ) ) ;
+    // InternalTableDSL.g:27471:1: rule__XAndExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAnd ) ) ;
     public final void rule__XAndExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28940:1: ( ( ( ruleOpAnd ) ) )
-            // InternalTableDSL.g:28941:2: ( ( ruleOpAnd ) )
+            // InternalTableDSL.g:27475:1: ( ( ( ruleOpAnd ) ) )
+            // InternalTableDSL.g:27476:2: ( ( ruleOpAnd ) )
             {
-            // InternalTableDSL.g:28941:2: ( ( ruleOpAnd ) )
-            // InternalTableDSL.g:28942:3: ( ruleOpAnd )
+            // InternalTableDSL.g:27476:2: ( ( ruleOpAnd ) )
+            // InternalTableDSL.g:27477:3: ( ruleOpAnd )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // InternalTableDSL.g:28943:3: ( ruleOpAnd )
-            // InternalTableDSL.g:28944:4: ruleOpAnd
+            // InternalTableDSL.g:27478:3: ( ruleOpAnd )
+            // InternalTableDSL.g:27479:4: ruleOpAnd
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementOpAndParserRuleCall_1_0_0_1_0_1()); 
@@ -94800,17 +89801,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAndExpression__RightOperandAssignment_1_1"
-    // InternalTableDSL.g:28955:1: rule__XAndExpression__RightOperandAssignment_1_1 : ( ruleXEqualityExpression ) ;
+    // InternalTableDSL.g:27490:1: rule__XAndExpression__RightOperandAssignment_1_1 : ( ruleXEqualityExpression ) ;
     public final void rule__XAndExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28959:1: ( ( ruleXEqualityExpression ) )
-            // InternalTableDSL.g:28960:2: ( ruleXEqualityExpression )
+            // InternalTableDSL.g:27494:1: ( ( ruleXEqualityExpression ) )
+            // InternalTableDSL.g:27495:2: ( ruleXEqualityExpression )
             {
-            // InternalTableDSL.g:28960:2: ( ruleXEqualityExpression )
-            // InternalTableDSL.g:28961:3: ruleXEqualityExpression
+            // InternalTableDSL.g:27495:2: ( ruleXEqualityExpression )
+            // InternalTableDSL.g:27496:3: ruleXEqualityExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getRightOperandXEqualityExpressionParserRuleCall_1_1_0()); 
@@ -94845,23 +89846,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__FeatureAssignment_1_0_0_1"
-    // InternalTableDSL.g:28970:1: rule__XEqualityExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpEquality ) ) ;
+    // InternalTableDSL.g:27505:1: rule__XEqualityExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpEquality ) ) ;
     public final void rule__XEqualityExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28974:1: ( ( ( ruleOpEquality ) ) )
-            // InternalTableDSL.g:28975:2: ( ( ruleOpEquality ) )
+            // InternalTableDSL.g:27509:1: ( ( ( ruleOpEquality ) ) )
+            // InternalTableDSL.g:27510:2: ( ( ruleOpEquality ) )
             {
-            // InternalTableDSL.g:28975:2: ( ( ruleOpEquality ) )
-            // InternalTableDSL.g:28976:3: ( ruleOpEquality )
+            // InternalTableDSL.g:27510:2: ( ( ruleOpEquality ) )
+            // InternalTableDSL.g:27511:3: ( ruleOpEquality )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // InternalTableDSL.g:28977:3: ( ruleOpEquality )
-            // InternalTableDSL.g:28978:4: ruleOpEquality
+            // InternalTableDSL.g:27512:3: ( ruleOpEquality )
+            // InternalTableDSL.g:27513:4: ruleOpEquality
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementOpEqualityParserRuleCall_1_0_0_1_0_1()); 
@@ -94902,17 +89903,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XEqualityExpression__RightOperandAssignment_1_1"
-    // InternalTableDSL.g:28989:1: rule__XEqualityExpression__RightOperandAssignment_1_1 : ( ruleXRelationalExpression ) ;
+    // InternalTableDSL.g:27524:1: rule__XEqualityExpression__RightOperandAssignment_1_1 : ( ruleXRelationalExpression ) ;
     public final void rule__XEqualityExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:28993:1: ( ( ruleXRelationalExpression ) )
-            // InternalTableDSL.g:28994:2: ( ruleXRelationalExpression )
+            // InternalTableDSL.g:27528:1: ( ( ruleXRelationalExpression ) )
+            // InternalTableDSL.g:27529:2: ( ruleXRelationalExpression )
             {
-            // InternalTableDSL.g:28994:2: ( ruleXRelationalExpression )
-            // InternalTableDSL.g:28995:3: ruleXRelationalExpression
+            // InternalTableDSL.g:27529:2: ( ruleXRelationalExpression )
+            // InternalTableDSL.g:27530:3: ruleXRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getRightOperandXRelationalExpressionParserRuleCall_1_1_0()); 
@@ -94947,17 +89948,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__TypeAssignment_1_0_1"
-    // InternalTableDSL.g:29004:1: rule__XRelationalExpression__TypeAssignment_1_0_1 : ( ruleJvmTypeReference ) ;
+    // InternalTableDSL.g:27539:1: rule__XRelationalExpression__TypeAssignment_1_0_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XRelationalExpression__TypeAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29008:1: ( ( ruleJvmTypeReference ) )
-            // InternalTableDSL.g:29009:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:27543:1: ( ( ruleJvmTypeReference ) )
+            // InternalTableDSL.g:27544:2: ( ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:29009:2: ( ruleJvmTypeReference )
-            // InternalTableDSL.g:29010:3: ruleJvmTypeReference
+            // InternalTableDSL.g:27544:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:27545:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_0_1_0()); 
@@ -94992,23 +89993,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1"
-    // InternalTableDSL.g:29019:1: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpCompare ) ) ;
+    // InternalTableDSL.g:27554:1: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpCompare ) ) ;
     public final void rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29023:1: ( ( ( ruleOpCompare ) ) )
-            // InternalTableDSL.g:29024:2: ( ( ruleOpCompare ) )
+            // InternalTableDSL.g:27558:1: ( ( ( ruleOpCompare ) ) )
+            // InternalTableDSL.g:27559:2: ( ( ruleOpCompare ) )
             {
-            // InternalTableDSL.g:29024:2: ( ( ruleOpCompare ) )
-            // InternalTableDSL.g:29025:3: ( ruleOpCompare )
+            // InternalTableDSL.g:27559:2: ( ( ruleOpCompare ) )
+            // InternalTableDSL.g:27560:3: ( ruleOpCompare )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             }
-            // InternalTableDSL.g:29026:3: ( ruleOpCompare )
-            // InternalTableDSL.g:29027:4: ruleOpCompare
+            // InternalTableDSL.g:27561:3: ( ruleOpCompare )
+            // InternalTableDSL.g:27562:4: ruleOpCompare
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementOpCompareParserRuleCall_1_1_0_0_1_0_1()); 
@@ -95049,17 +90050,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XRelationalExpression__RightOperandAssignment_1_1_1"
-    // InternalTableDSL.g:29038:1: rule__XRelationalExpression__RightOperandAssignment_1_1_1 : ( ruleXOtherOperatorExpression ) ;
+    // InternalTableDSL.g:27573:1: rule__XRelationalExpression__RightOperandAssignment_1_1_1 : ( ruleXOtherOperatorExpression ) ;
     public final void rule__XRelationalExpression__RightOperandAssignment_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29042:1: ( ( ruleXOtherOperatorExpression ) )
-            // InternalTableDSL.g:29043:2: ( ruleXOtherOperatorExpression )
+            // InternalTableDSL.g:27577:1: ( ( ruleXOtherOperatorExpression ) )
+            // InternalTableDSL.g:27578:2: ( ruleXOtherOperatorExpression )
             {
-            // InternalTableDSL.g:29043:2: ( ruleXOtherOperatorExpression )
-            // InternalTableDSL.g:29044:3: ruleXOtherOperatorExpression
+            // InternalTableDSL.g:27578:2: ( ruleXOtherOperatorExpression )
+            // InternalTableDSL.g:27579:3: ruleXOtherOperatorExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getRightOperandXOtherOperatorExpressionParserRuleCall_1_1_1_0()); 
@@ -95094,23 +90095,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1"
-    // InternalTableDSL.g:29053:1: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOther ) ) ;
+    // InternalTableDSL.g:27588:1: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOther ) ) ;
     public final void rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29057:1: ( ( ( ruleOpOther ) ) )
-            // InternalTableDSL.g:29058:2: ( ( ruleOpOther ) )
+            // InternalTableDSL.g:27592:1: ( ( ( ruleOpOther ) ) )
+            // InternalTableDSL.g:27593:2: ( ( ruleOpOther ) )
             {
-            // InternalTableDSL.g:29058:2: ( ( ruleOpOther ) )
-            // InternalTableDSL.g:29059:3: ( ruleOpOther )
+            // InternalTableDSL.g:27593:2: ( ( ruleOpOther ) )
+            // InternalTableDSL.g:27594:3: ( ruleOpOther )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // InternalTableDSL.g:29060:3: ( ruleOpOther )
-            // InternalTableDSL.g:29061:4: ruleOpOther
+            // InternalTableDSL.g:27595:3: ( ruleOpOther )
+            // InternalTableDSL.g:27596:4: ruleOpOther
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementOpOtherParserRuleCall_1_0_0_1_0_1()); 
@@ -95151,17 +90152,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__RightOperandAssignment_1_1"
-    // InternalTableDSL.g:29072:1: rule__XOtherOperatorExpression__RightOperandAssignment_1_1 : ( ruleXAdditiveExpression ) ;
+    // InternalTableDSL.g:27607:1: rule__XOtherOperatorExpression__RightOperandAssignment_1_1 : ( ruleXAdditiveExpression ) ;
     public final void rule__XOtherOperatorExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29076:1: ( ( ruleXAdditiveExpression ) )
-            // InternalTableDSL.g:29077:2: ( ruleXAdditiveExpression )
+            // InternalTableDSL.g:27611:1: ( ( ruleXAdditiveExpression ) )
+            // InternalTableDSL.g:27612:2: ( ruleXAdditiveExpression )
             {
-            // InternalTableDSL.g:29077:2: ( ruleXAdditiveExpression )
-            // InternalTableDSL.g:29078:3: ruleXAdditiveExpression
+            // InternalTableDSL.g:27612:2: ( ruleXAdditiveExpression )
+            // InternalTableDSL.g:27613:3: ruleXAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandXAdditiveExpressionParserRuleCall_1_1_0()); 
@@ -95196,23 +90197,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__FeatureAssignment_1_0_0_1"
-    // InternalTableDSL.g:29087:1: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAdd ) ) ;
+    // InternalTableDSL.g:27622:1: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAdd ) ) ;
     public final void rule__XAdditiveExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29091:1: ( ( ( ruleOpAdd ) ) )
-            // InternalTableDSL.g:29092:2: ( ( ruleOpAdd ) )
+            // InternalTableDSL.g:27626:1: ( ( ( ruleOpAdd ) ) )
+            // InternalTableDSL.g:27627:2: ( ( ruleOpAdd ) )
             {
-            // InternalTableDSL.g:29092:2: ( ( ruleOpAdd ) )
-            // InternalTableDSL.g:29093:3: ( ruleOpAdd )
+            // InternalTableDSL.g:27627:2: ( ( ruleOpAdd ) )
+            // InternalTableDSL.g:27628:3: ( ruleOpAdd )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // InternalTableDSL.g:29094:3: ( ruleOpAdd )
-            // InternalTableDSL.g:29095:4: ruleOpAdd
+            // InternalTableDSL.g:27629:3: ( ruleOpAdd )
+            // InternalTableDSL.g:27630:4: ruleOpAdd
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementOpAddParserRuleCall_1_0_0_1_0_1()); 
@@ -95253,17 +90254,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XAdditiveExpression__RightOperandAssignment_1_1"
-    // InternalTableDSL.g:29106:1: rule__XAdditiveExpression__RightOperandAssignment_1_1 : ( ruleXMultiplicativeExpression ) ;
+    // InternalTableDSL.g:27641:1: rule__XAdditiveExpression__RightOperandAssignment_1_1 : ( ruleXMultiplicativeExpression ) ;
     public final void rule__XAdditiveExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29110:1: ( ( ruleXMultiplicativeExpression ) )
-            // InternalTableDSL.g:29111:2: ( ruleXMultiplicativeExpression )
+            // InternalTableDSL.g:27645:1: ( ( ruleXMultiplicativeExpression ) )
+            // InternalTableDSL.g:27646:2: ( ruleXMultiplicativeExpression )
             {
-            // InternalTableDSL.g:29111:2: ( ruleXMultiplicativeExpression )
-            // InternalTableDSL.g:29112:3: ruleXMultiplicativeExpression
+            // InternalTableDSL.g:27646:2: ( ruleXMultiplicativeExpression )
+            // InternalTableDSL.g:27647:3: ruleXMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getRightOperandXMultiplicativeExpressionParserRuleCall_1_1_0()); 
@@ -95298,23 +90299,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1"
-    // InternalTableDSL.g:29121:1: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpMulti ) ) ;
+    // InternalTableDSL.g:27656:1: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpMulti ) ) ;
     public final void rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29125:1: ( ( ( ruleOpMulti ) ) )
-            // InternalTableDSL.g:29126:2: ( ( ruleOpMulti ) )
+            // InternalTableDSL.g:27660:1: ( ( ( ruleOpMulti ) ) )
+            // InternalTableDSL.g:27661:2: ( ( ruleOpMulti ) )
             {
-            // InternalTableDSL.g:29126:2: ( ( ruleOpMulti ) )
-            // InternalTableDSL.g:29127:3: ( ruleOpMulti )
+            // InternalTableDSL.g:27661:2: ( ( ruleOpMulti ) )
+            // InternalTableDSL.g:27662:3: ( ruleOpMulti )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // InternalTableDSL.g:29128:3: ( ruleOpMulti )
-            // InternalTableDSL.g:29129:4: ruleOpMulti
+            // InternalTableDSL.g:27663:3: ( ruleOpMulti )
+            // InternalTableDSL.g:27664:4: ruleOpMulti
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementOpMultiParserRuleCall_1_0_0_1_0_1()); 
@@ -95355,17 +90356,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__RightOperandAssignment_1_1"
-    // InternalTableDSL.g:29140:1: rule__XMultiplicativeExpression__RightOperandAssignment_1_1 : ( ruleXUnaryOperation ) ;
+    // InternalTableDSL.g:27675:1: rule__XMultiplicativeExpression__RightOperandAssignment_1_1 : ( ruleXUnaryOperation ) ;
     public final void rule__XMultiplicativeExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29144:1: ( ( ruleXUnaryOperation ) )
-            // InternalTableDSL.g:29145:2: ( ruleXUnaryOperation )
+            // InternalTableDSL.g:27679:1: ( ( ruleXUnaryOperation ) )
+            // InternalTableDSL.g:27680:2: ( ruleXUnaryOperation )
             {
-            // InternalTableDSL.g:29145:2: ( ruleXUnaryOperation )
-            // InternalTableDSL.g:29146:3: ruleXUnaryOperation
+            // InternalTableDSL.g:27680:2: ( ruleXUnaryOperation )
+            // InternalTableDSL.g:27681:3: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandXUnaryOperationParserRuleCall_1_1_0()); 
@@ -95400,23 +90401,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XUnaryOperation__FeatureAssignment_0_1"
-    // InternalTableDSL.g:29155:1: rule__XUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
+    // InternalTableDSL.g:27690:1: rule__XUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
     public final void rule__XUnaryOperation__FeatureAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29159:1: ( ( ( ruleOpUnary ) ) )
-            // InternalTableDSL.g:29160:2: ( ( ruleOpUnary ) )
+            // InternalTableDSL.g:27694:1: ( ( ( ruleOpUnary ) ) )
+            // InternalTableDSL.g:27695:2: ( ( ruleOpUnary ) )
             {
-            // InternalTableDSL.g:29160:2: ( ( ruleOpUnary ) )
-            // InternalTableDSL.g:29161:3: ( ruleOpUnary )
+            // InternalTableDSL.g:27695:2: ( ( ruleOpUnary ) )
+            // InternalTableDSL.g:27696:3: ( ruleOpUnary )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
             }
-            // InternalTableDSL.g:29162:3: ( ruleOpUnary )
-            // InternalTableDSL.g:29163:4: ruleOpUnary
+            // InternalTableDSL.g:27697:3: ( ruleOpUnary )
+            // InternalTableDSL.g:27698:4: ruleOpUnary
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementOpUnaryParserRuleCall_0_1_0_1()); 
@@ -95457,17 +90458,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XUnaryOperation__OperandAssignment_0_2"
-    // InternalTableDSL.g:29174:1: rule__XUnaryOperation__OperandAssignment_0_2 : ( ruleXUnaryOperation ) ;
+    // InternalTableDSL.g:27709:1: rule__XUnaryOperation__OperandAssignment_0_2 : ( ruleXUnaryOperation ) ;
     public final void rule__XUnaryOperation__OperandAssignment_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29178:1: ( ( ruleXUnaryOperation ) )
-            // InternalTableDSL.g:29179:2: ( ruleXUnaryOperation )
+            // InternalTableDSL.g:27713:1: ( ( ruleXUnaryOperation ) )
+            // InternalTableDSL.g:27714:2: ( ruleXUnaryOperation )
             {
-            // InternalTableDSL.g:29179:2: ( ruleXUnaryOperation )
-            // InternalTableDSL.g:29180:3: ruleXUnaryOperation
+            // InternalTableDSL.g:27714:2: ( ruleXUnaryOperation )
+            // InternalTableDSL.g:27715:3: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getOperandXUnaryOperationParserRuleCall_0_2_0()); 
@@ -95502,17 +90503,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCastedExpression__TypeAssignment_1_1"
-    // InternalTableDSL.g:29189:1: rule__XCastedExpression__TypeAssignment_1_1 : ( ruleJvmTypeReference ) ;
+    // InternalTableDSL.g:27724:1: rule__XCastedExpression__TypeAssignment_1_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XCastedExpression__TypeAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29193:1: ( ( ruleJvmTypeReference ) )
-            // InternalTableDSL.g:29194:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:27728:1: ( ( ruleJvmTypeReference ) )
+            // InternalTableDSL.g:27729:2: ( ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:29194:2: ( ruleJvmTypeReference )
-            // InternalTableDSL.g:29195:3: ruleJvmTypeReference
+            // InternalTableDSL.g:27729:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:27730:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_1_0()); 
@@ -95547,23 +90548,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XPostfixOperation__FeatureAssignment_1_0_1"
-    // InternalTableDSL.g:29204:1: rule__XPostfixOperation__FeatureAssignment_1_0_1 : ( ( ruleOpPostfix ) ) ;
+    // InternalTableDSL.g:27739:1: rule__XPostfixOperation__FeatureAssignment_1_0_1 : ( ( ruleOpPostfix ) ) ;
     public final void rule__XPostfixOperation__FeatureAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29208:1: ( ( ( ruleOpPostfix ) ) )
-            // InternalTableDSL.g:29209:2: ( ( ruleOpPostfix ) )
+            // InternalTableDSL.g:27743:1: ( ( ( ruleOpPostfix ) ) )
+            // InternalTableDSL.g:27744:2: ( ( ruleOpPostfix ) )
             {
-            // InternalTableDSL.g:29209:2: ( ( ruleOpPostfix ) )
-            // InternalTableDSL.g:29210:3: ( ruleOpPostfix )
+            // InternalTableDSL.g:27744:2: ( ( ruleOpPostfix ) )
+            // InternalTableDSL.g:27745:3: ( ruleOpPostfix )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_1_0()); 
             }
-            // InternalTableDSL.g:29211:3: ( ruleOpPostfix )
-            // InternalTableDSL.g:29212:4: ruleOpPostfix
+            // InternalTableDSL.g:27746:3: ( ruleOpPostfix )
+            // InternalTableDSL.g:27747:4: ruleOpPostfix
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementOpPostfixParserRuleCall_1_0_1_0_1()); 
@@ -95604,28 +90605,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1"
-    // InternalTableDSL.g:29223:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 : ( ( '::' ) ) ;
+    // InternalTableDSL.g:27758:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 : ( ( '::' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29227:1: ( ( ( '::' ) ) )
-            // InternalTableDSL.g:29228:2: ( ( '::' ) )
+            // InternalTableDSL.g:27762:1: ( ( ( '::' ) ) )
+            // InternalTableDSL.g:27763:2: ( ( '::' ) )
             {
-            // InternalTableDSL.g:29228:2: ( ( '::' ) )
-            // InternalTableDSL.g:29229:3: ( '::' )
+            // InternalTableDSL.g:27763:2: ( ( '::' ) )
+            // InternalTableDSL.g:27764:3: ( '::' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
-            // InternalTableDSL.g:29230:3: ( '::' )
-            // InternalTableDSL.g:29231:4: '::'
+            // InternalTableDSL.g:27765:3: ( '::' )
+            // InternalTableDSL.g:27766:4: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
-            match(input,180,FOLLOW_2); if (state.failed) return ;
+            match(input,177,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
@@ -95657,23 +90658,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2"
-    // InternalTableDSL.g:29242:1: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 : ( ( ruleFeatureCallID ) ) ;
+    // InternalTableDSL.g:27777:1: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 : ( ( ruleFeatureCallID ) ) ;
     public final void rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29246:1: ( ( ( ruleFeatureCallID ) ) )
-            // InternalTableDSL.g:29247:2: ( ( ruleFeatureCallID ) )
+            // InternalTableDSL.g:27781:1: ( ( ( ruleFeatureCallID ) ) )
+            // InternalTableDSL.g:27782:2: ( ( ruleFeatureCallID ) )
             {
-            // InternalTableDSL.g:29247:2: ( ( ruleFeatureCallID ) )
-            // InternalTableDSL.g:29248:3: ( ruleFeatureCallID )
+            // InternalTableDSL.g:27782:2: ( ( ruleFeatureCallID ) )
+            // InternalTableDSL.g:27783:3: ( ruleFeatureCallID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_0_2_0()); 
             }
-            // InternalTableDSL.g:29249:3: ( ruleFeatureCallID )
-            // InternalTableDSL.g:29250:4: ruleFeatureCallID
+            // InternalTableDSL.g:27784:3: ( ruleFeatureCallID )
+            // InternalTableDSL.g:27785:4: ruleFeatureCallID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementFeatureCallIDParserRuleCall_1_0_0_0_2_0_1()); 
@@ -95714,17 +90715,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ValueAssignment_1_0_1"
-    // InternalTableDSL.g:29261:1: rule__XMemberFeatureCall__ValueAssignment_1_0_1 : ( ruleXAssignment ) ;
+    // InternalTableDSL.g:27796:1: rule__XMemberFeatureCall__ValueAssignment_1_0_1 : ( ruleXAssignment ) ;
     public final void rule__XMemberFeatureCall__ValueAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29265:1: ( ( ruleXAssignment ) )
-            // InternalTableDSL.g:29266:2: ( ruleXAssignment )
+            // InternalTableDSL.g:27800:1: ( ( ruleXAssignment ) )
+            // InternalTableDSL.g:27801:2: ( ruleXAssignment )
             {
-            // InternalTableDSL.g:29266:2: ( ruleXAssignment )
-            // InternalTableDSL.g:29267:3: ruleXAssignment
+            // InternalTableDSL.g:27801:2: ( ruleXAssignment )
+            // InternalTableDSL.g:27802:3: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getValueXAssignmentParserRuleCall_1_0_1_0()); 
@@ -95759,28 +90760,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1"
-    // InternalTableDSL.g:29276:1: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 : ( ( '?.' ) ) ;
+    // InternalTableDSL.g:27811:1: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 : ( ( '?.' ) ) ;
     public final void rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29280:1: ( ( ( '?.' ) ) )
-            // InternalTableDSL.g:29281:2: ( ( '?.' ) )
+            // InternalTableDSL.g:27815:1: ( ( ( '?.' ) ) )
+            // InternalTableDSL.g:27816:2: ( ( '?.' ) )
             {
-            // InternalTableDSL.g:29281:2: ( ( '?.' ) )
-            // InternalTableDSL.g:29282:3: ( '?.' )
+            // InternalTableDSL.g:27816:2: ( ( '?.' ) )
+            // InternalTableDSL.g:27817:3: ( '?.' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
-            // InternalTableDSL.g:29283:3: ( '?.' )
-            // InternalTableDSL.g:29284:4: '?.'
+            // InternalTableDSL.g:27818:3: ( '?.' )
+            // InternalTableDSL.g:27819:4: '?.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
-            match(input,181,FOLLOW_2); if (state.failed) return ;
+            match(input,178,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
@@ -95812,28 +90813,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2"
-    // InternalTableDSL.g:29295:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 : ( ( '::' ) ) ;
+    // InternalTableDSL.g:27830:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 : ( ( '::' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29299:1: ( ( ( '::' ) ) )
-            // InternalTableDSL.g:29300:2: ( ( '::' ) )
+            // InternalTableDSL.g:27834:1: ( ( ( '::' ) ) )
+            // InternalTableDSL.g:27835:2: ( ( '::' ) )
             {
-            // InternalTableDSL.g:29300:2: ( ( '::' ) )
-            // InternalTableDSL.g:29301:3: ( '::' )
+            // InternalTableDSL.g:27835:2: ( ( '::' ) )
+            // InternalTableDSL.g:27836:3: ( '::' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
-            // InternalTableDSL.g:29302:3: ( '::' )
-            // InternalTableDSL.g:29303:4: '::'
+            // InternalTableDSL.g:27837:3: ( '::' )
+            // InternalTableDSL.g:27838:4: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
-            match(input,180,FOLLOW_2); if (state.failed) return ;
+            match(input,177,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
@@ -95865,17 +90866,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1"
-    // InternalTableDSL.g:29314:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalTableDSL.g:27849:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29318:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalTableDSL.g:29319:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:27853:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalTableDSL.g:27854:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalTableDSL.g:29319:2: ( ruleJvmArgumentTypeReference )
-            // InternalTableDSL.g:29320:3: ruleJvmArgumentTypeReference
+            // InternalTableDSL.g:27854:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:27855:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_1_0()); 
@@ -95910,17 +90911,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1"
-    // InternalTableDSL.g:29329:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalTableDSL.g:27864:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29333:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalTableDSL.g:29334:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:27868:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalTableDSL.g:27869:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalTableDSL.g:29334:2: ( ruleJvmArgumentTypeReference )
-            // InternalTableDSL.g:29335:3: ruleJvmArgumentTypeReference
+            // InternalTableDSL.g:27869:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:27870:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_2_1_0()); 
@@ -95955,23 +90956,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__FeatureAssignment_1_1_2"
-    // InternalTableDSL.g:29344:1: rule__XMemberFeatureCall__FeatureAssignment_1_1_2 : ( ( ruleIdOrSuper ) ) ;
+    // InternalTableDSL.g:27879:1: rule__XMemberFeatureCall__FeatureAssignment_1_1_2 : ( ( ruleIdOrSuper ) ) ;
     public final void rule__XMemberFeatureCall__FeatureAssignment_1_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29348:1: ( ( ( ruleIdOrSuper ) ) )
-            // InternalTableDSL.g:29349:2: ( ( ruleIdOrSuper ) )
+            // InternalTableDSL.g:27883:1: ( ( ( ruleIdOrSuper ) ) )
+            // InternalTableDSL.g:27884:2: ( ( ruleIdOrSuper ) )
             {
-            // InternalTableDSL.g:29349:2: ( ( ruleIdOrSuper ) )
-            // InternalTableDSL.g:29350:3: ( ruleIdOrSuper )
+            // InternalTableDSL.g:27884:2: ( ( ruleIdOrSuper ) )
+            // InternalTableDSL.g:27885:3: ( ruleIdOrSuper )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_2_0()); 
             }
-            // InternalTableDSL.g:29351:3: ( ruleIdOrSuper )
-            // InternalTableDSL.g:29352:4: ruleIdOrSuper
+            // InternalTableDSL.g:27886:3: ( ruleIdOrSuper )
+            // InternalTableDSL.g:27887:4: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementIdOrSuperParserRuleCall_1_1_2_0_1()); 
@@ -96012,23 +91013,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0"
-    // InternalTableDSL.g:29363:1: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 : ( ( '(' ) ) ;
+    // InternalTableDSL.g:27898:1: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 : ( ( '(' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29367:1: ( ( ( '(' ) ) )
-            // InternalTableDSL.g:29368:2: ( ( '(' ) )
+            // InternalTableDSL.g:27902:1: ( ( ( '(' ) ) )
+            // InternalTableDSL.g:27903:2: ( ( '(' ) )
             {
-            // InternalTableDSL.g:29368:2: ( ( '(' ) )
-            // InternalTableDSL.g:29369:3: ( '(' )
+            // InternalTableDSL.g:27903:2: ( ( '(' ) )
+            // InternalTableDSL.g:27904:3: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
-            // InternalTableDSL.g:29370:3: ( '(' )
-            // InternalTableDSL.g:29371:4: '('
+            // InternalTableDSL.g:27905:3: ( '(' )
+            // InternalTableDSL.g:27906:4: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
@@ -96065,17 +91066,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0"
-    // InternalTableDSL.g:29382:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 : ( ruleXShortClosure ) ;
+    // InternalTableDSL.g:27917:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29386:1: ( ( ruleXShortClosure ) )
-            // InternalTableDSL.g:29387:2: ( ruleXShortClosure )
+            // InternalTableDSL.g:27921:1: ( ( ruleXShortClosure ) )
+            // InternalTableDSL.g:27922:2: ( ruleXShortClosure )
             {
-            // InternalTableDSL.g:29387:2: ( ruleXShortClosure )
-            // InternalTableDSL.g:29388:3: ruleXShortClosure
+            // InternalTableDSL.g:27922:2: ( ruleXShortClosure )
+            // InternalTableDSL.g:27923:3: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXShortClosureParserRuleCall_1_1_3_1_0_0()); 
@@ -96110,17 +91111,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0"
-    // InternalTableDSL.g:29397:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:27932:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29401:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29402:2: ( ruleXExpression )
+            // InternalTableDSL.g:27936:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:27937:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29402:2: ( ruleXExpression )
-            // InternalTableDSL.g:29403:3: ruleXExpression
+            // InternalTableDSL.g:27937:2: ( ruleXExpression )
+            // InternalTableDSL.g:27938:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_0_0()); 
@@ -96155,17 +91156,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1"
-    // InternalTableDSL.g:29412:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:27947:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 : ( ruleXExpression ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29416:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29417:2: ( ruleXExpression )
+            // InternalTableDSL.g:27951:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:27952:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29417:2: ( ruleXExpression )
-            // InternalTableDSL.g:29418:3: ruleXExpression
+            // InternalTableDSL.g:27952:2: ( ruleXExpression )
+            // InternalTableDSL.g:27953:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_1_1_0()); 
@@ -96200,17 +91201,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4"
-    // InternalTableDSL.g:29427:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 : ( ruleXClosure ) ;
+    // InternalTableDSL.g:27962:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 : ( ruleXClosure ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29431:1: ( ( ruleXClosure ) )
-            // InternalTableDSL.g:29432:2: ( ruleXClosure )
+            // InternalTableDSL.g:27966:1: ( ( ruleXClosure ) )
+            // InternalTableDSL.g:27967:2: ( ruleXClosure )
             {
-            // InternalTableDSL.g:29432:2: ( ruleXClosure )
-            // InternalTableDSL.g:29433:3: ruleXClosure
+            // InternalTableDSL.g:27967:2: ( ruleXClosure )
+            // InternalTableDSL.g:27968:3: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXClosureParserRuleCall_1_1_4_0()); 
@@ -96245,17 +91246,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__ElementsAssignment_3_0"
-    // InternalTableDSL.g:29442:1: rule__XSetLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:27977:1: rule__XSetLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
     public final void rule__XSetLiteral__ElementsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29446:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29447:2: ( ruleXExpression )
+            // InternalTableDSL.g:27981:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:27982:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29447:2: ( ruleXExpression )
-            // InternalTableDSL.g:29448:3: ruleXExpression
+            // InternalTableDSL.g:27982:2: ( ruleXExpression )
+            // InternalTableDSL.g:27983:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
@@ -96290,17 +91291,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSetLiteral__ElementsAssignment_3_1_1"
-    // InternalTableDSL.g:29457:1: rule__XSetLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:27992:1: rule__XSetLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XSetLiteral__ElementsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29461:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29462:2: ( ruleXExpression )
+            // InternalTableDSL.g:27996:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:27997:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29462:2: ( ruleXExpression )
-            // InternalTableDSL.g:29463:3: ruleXExpression
+            // InternalTableDSL.g:27997:2: ( ruleXExpression )
+            // InternalTableDSL.g:27998:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
@@ -96335,17 +91336,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__ElementsAssignment_3_0"
-    // InternalTableDSL.g:29472:1: rule__XListLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28007:1: rule__XListLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
     public final void rule__XListLiteral__ElementsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29476:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29477:2: ( ruleXExpression )
+            // InternalTableDSL.g:28011:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28012:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29477:2: ( ruleXExpression )
-            // InternalTableDSL.g:29478:3: ruleXExpression
+            // InternalTableDSL.g:28012:2: ( ruleXExpression )
+            // InternalTableDSL.g:28013:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
@@ -96380,17 +91381,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XListLiteral__ElementsAssignment_3_1_1"
-    // InternalTableDSL.g:29487:1: rule__XListLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28022:1: rule__XListLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XListLiteral__ElementsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29491:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29492:2: ( ruleXExpression )
+            // InternalTableDSL.g:28026:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28027:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29492:2: ( ruleXExpression )
-            // InternalTableDSL.g:29493:3: ruleXExpression
+            // InternalTableDSL.g:28027:2: ( ruleXExpression )
+            // InternalTableDSL.g:28028:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
@@ -96425,17 +91426,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0"
-    // InternalTableDSL.g:29502:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 : ( ruleJvmFormalParameter ) ;
+    // InternalTableDSL.g:28037:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 : ( ruleJvmFormalParameter ) ;
     public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29506:1: ( ( ruleJvmFormalParameter ) )
-            // InternalTableDSL.g:29507:2: ( ruleJvmFormalParameter )
+            // InternalTableDSL.g:28041:1: ( ( ruleJvmFormalParameter ) )
+            // InternalTableDSL.g:28042:2: ( ruleJvmFormalParameter )
             {
-            // InternalTableDSL.g:29507:2: ( ruleJvmFormalParameter )
-            // InternalTableDSL.g:29508:3: ruleJvmFormalParameter
+            // InternalTableDSL.g:28042:2: ( ruleJvmFormalParameter )
+            // InternalTableDSL.g:28043:3: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_0_0()); 
@@ -96470,17 +91471,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1"
-    // InternalTableDSL.g:29517:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 : ( ruleJvmFormalParameter ) ;
+    // InternalTableDSL.g:28052:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 : ( ruleJvmFormalParameter ) ;
     public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29521:1: ( ( ruleJvmFormalParameter ) )
-            // InternalTableDSL.g:29522:2: ( ruleJvmFormalParameter )
+            // InternalTableDSL.g:28056:1: ( ( ruleJvmFormalParameter ) )
+            // InternalTableDSL.g:28057:2: ( ruleJvmFormalParameter )
             {
-            // InternalTableDSL.g:29522:2: ( ruleJvmFormalParameter )
-            // InternalTableDSL.g:29523:3: ruleJvmFormalParameter
+            // InternalTableDSL.g:28057:2: ( ruleJvmFormalParameter )
+            // InternalTableDSL.g:28058:3: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_1_1_0()); 
@@ -96515,28 +91516,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__ExplicitSyntaxAssignment_1_0_1"
-    // InternalTableDSL.g:29532:1: rule__XClosure__ExplicitSyntaxAssignment_1_0_1 : ( ( '|' ) ) ;
+    // InternalTableDSL.g:28067:1: rule__XClosure__ExplicitSyntaxAssignment_1_0_1 : ( ( '|' ) ) ;
     public final void rule__XClosure__ExplicitSyntaxAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29536:1: ( ( ( '|' ) ) )
-            // InternalTableDSL.g:29537:2: ( ( '|' ) )
+            // InternalTableDSL.g:28071:1: ( ( ( '|' ) ) )
+            // InternalTableDSL.g:28072:2: ( ( '|' ) )
             {
-            // InternalTableDSL.g:29537:2: ( ( '|' ) )
-            // InternalTableDSL.g:29538:3: ( '|' )
+            // InternalTableDSL.g:28072:2: ( ( '|' ) )
+            // InternalTableDSL.g:28073:3: ( '|' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
-            // InternalTableDSL.g:29539:3: ( '|' )
-            // InternalTableDSL.g:29540:4: '|'
+            // InternalTableDSL.g:28074:3: ( '|' )
+            // InternalTableDSL.g:28075:4: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
-            match(input,182,FOLLOW_2); if (state.failed) return ;
+            match(input,179,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
@@ -96568,17 +91569,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XClosure__ExpressionAssignment_2"
-    // InternalTableDSL.g:29551:1: rule__XClosure__ExpressionAssignment_2 : ( ruleXExpressionInClosure ) ;
+    // InternalTableDSL.g:28086:1: rule__XClosure__ExpressionAssignment_2 : ( ruleXExpressionInClosure ) ;
     public final void rule__XClosure__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29555:1: ( ( ruleXExpressionInClosure ) )
-            // InternalTableDSL.g:29556:2: ( ruleXExpressionInClosure )
+            // InternalTableDSL.g:28090:1: ( ( ruleXExpressionInClosure ) )
+            // InternalTableDSL.g:28091:2: ( ruleXExpressionInClosure )
             {
-            // InternalTableDSL.g:29556:2: ( ruleXExpressionInClosure )
-            // InternalTableDSL.g:29557:3: ruleXExpressionInClosure
+            // InternalTableDSL.g:28091:2: ( ruleXExpressionInClosure )
+            // InternalTableDSL.g:28092:3: ruleXExpressionInClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExpressionXExpressionInClosureParserRuleCall_2_0()); 
@@ -96613,17 +91614,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XExpressionInClosure__ExpressionsAssignment_1_0"
-    // InternalTableDSL.g:29566:1: rule__XExpressionInClosure__ExpressionsAssignment_1_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalTableDSL.g:28101:1: rule__XExpressionInClosure__ExpressionsAssignment_1_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XExpressionInClosure__ExpressionsAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29570:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // InternalTableDSL.g:29571:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalTableDSL.g:28105:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalTableDSL.g:28106:2: ( ruleXExpressionOrVarDeclaration )
             {
-            // InternalTableDSL.g:29571:2: ( ruleXExpressionOrVarDeclaration )
-            // InternalTableDSL.g:29572:3: ruleXExpressionOrVarDeclaration
+            // InternalTableDSL.g:28106:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalTableDSL.g:28107:3: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_1_0_0()); 
@@ -96658,17 +91659,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0"
-    // InternalTableDSL.g:29581:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 : ( ruleJvmFormalParameter ) ;
+    // InternalTableDSL.g:28116:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 : ( ruleJvmFormalParameter ) ;
     public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29585:1: ( ( ruleJvmFormalParameter ) )
-            // InternalTableDSL.g:29586:2: ( ruleJvmFormalParameter )
+            // InternalTableDSL.g:28120:1: ( ( ruleJvmFormalParameter ) )
+            // InternalTableDSL.g:28121:2: ( ruleJvmFormalParameter )
             {
-            // InternalTableDSL.g:29586:2: ( ruleJvmFormalParameter )
-            // InternalTableDSL.g:29587:3: ruleJvmFormalParameter
+            // InternalTableDSL.g:28121:2: ( ruleJvmFormalParameter )
+            // InternalTableDSL.g:28122:3: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_0_0()); 
@@ -96703,17 +91704,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1"
-    // InternalTableDSL.g:29596:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 : ( ruleJvmFormalParameter ) ;
+    // InternalTableDSL.g:28131:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 : ( ruleJvmFormalParameter ) ;
     public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29600:1: ( ( ruleJvmFormalParameter ) )
-            // InternalTableDSL.g:29601:2: ( ruleJvmFormalParameter )
+            // InternalTableDSL.g:28135:1: ( ( ruleJvmFormalParameter ) )
+            // InternalTableDSL.g:28136:2: ( ruleJvmFormalParameter )
             {
-            // InternalTableDSL.g:29601:2: ( ruleJvmFormalParameter )
-            // InternalTableDSL.g:29602:3: ruleJvmFormalParameter
+            // InternalTableDSL.g:28136:2: ( ruleJvmFormalParameter )
+            // InternalTableDSL.g:28137:3: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_1_1_0()); 
@@ -96748,28 +91749,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2"
-    // InternalTableDSL.g:29611:1: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 : ( ( '|' ) ) ;
+    // InternalTableDSL.g:28146:1: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 : ( ( '|' ) ) ;
     public final void rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29615:1: ( ( ( '|' ) ) )
-            // InternalTableDSL.g:29616:2: ( ( '|' ) )
+            // InternalTableDSL.g:28150:1: ( ( ( '|' ) ) )
+            // InternalTableDSL.g:28151:2: ( ( '|' ) )
             {
-            // InternalTableDSL.g:29616:2: ( ( '|' ) )
-            // InternalTableDSL.g:29617:3: ( '|' )
+            // InternalTableDSL.g:28151:2: ( ( '|' ) )
+            // InternalTableDSL.g:28152:3: ( '|' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
-            // InternalTableDSL.g:29618:3: ( '|' )
-            // InternalTableDSL.g:29619:4: '|'
+            // InternalTableDSL.g:28153:3: ( '|' )
+            // InternalTableDSL.g:28154:4: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
-            match(input,182,FOLLOW_2); if (state.failed) return ;
+            match(input,179,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
@@ -96801,17 +91802,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XShortClosure__ExpressionAssignment_1"
-    // InternalTableDSL.g:29630:1: rule__XShortClosure__ExpressionAssignment_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28165:1: rule__XShortClosure__ExpressionAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XShortClosure__ExpressionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29634:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29635:2: ( ruleXExpression )
+            // InternalTableDSL.g:28169:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28170:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29635:2: ( ruleXExpression )
-            // InternalTableDSL.g:29636:3: ruleXExpression
+            // InternalTableDSL.g:28170:2: ( ruleXExpression )
+            // InternalTableDSL.g:28171:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExpressionXExpressionParserRuleCall_1_0()); 
@@ -96846,17 +91847,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__IfAssignment_3"
-    // InternalTableDSL.g:29645:1: rule__XIfExpression__IfAssignment_3 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28180:1: rule__XIfExpression__IfAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__IfAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29649:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29650:2: ( ruleXExpression )
+            // InternalTableDSL.g:28184:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28185:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29650:2: ( ruleXExpression )
-            // InternalTableDSL.g:29651:3: ruleXExpression
+            // InternalTableDSL.g:28185:2: ( ruleXExpression )
+            // InternalTableDSL.g:28186:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfXExpressionParserRuleCall_3_0()); 
@@ -96891,17 +91892,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__ThenAssignment_5"
-    // InternalTableDSL.g:29660:1: rule__XIfExpression__ThenAssignment_5 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28195:1: rule__XIfExpression__ThenAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__ThenAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29664:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29665:2: ( ruleXExpression )
+            // InternalTableDSL.g:28199:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28200:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29665:2: ( ruleXExpression )
-            // InternalTableDSL.g:29666:3: ruleXExpression
+            // InternalTableDSL.g:28200:2: ( ruleXExpression )
+            // InternalTableDSL.g:28201:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getThenXExpressionParserRuleCall_5_0()); 
@@ -96936,17 +91937,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XIfExpression__ElseAssignment_6_1"
-    // InternalTableDSL.g:29675:1: rule__XIfExpression__ElseAssignment_6_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28210:1: rule__XIfExpression__ElseAssignment_6_1 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__ElseAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29679:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29680:2: ( ruleXExpression )
+            // InternalTableDSL.g:28214:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28215:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29680:2: ( ruleXExpression )
-            // InternalTableDSL.g:29681:3: ruleXExpression
+            // InternalTableDSL.g:28215:2: ( ruleXExpression )
+            // InternalTableDSL.g:28216:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseXExpressionParserRuleCall_6_1_0()); 
@@ -96981,17 +91982,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1"
-    // InternalTableDSL.g:29690:1: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 : ( ruleJvmFormalParameter ) ;
+    // InternalTableDSL.g:28225:1: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 : ( ruleJvmFormalParameter ) ;
     public final void rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29694:1: ( ( ruleJvmFormalParameter ) )
-            // InternalTableDSL.g:29695:2: ( ruleJvmFormalParameter )
+            // InternalTableDSL.g:28229:1: ( ( ruleJvmFormalParameter ) )
+            // InternalTableDSL.g:28230:2: ( ruleJvmFormalParameter )
             {
-            // InternalTableDSL.g:29695:2: ( ruleJvmFormalParameter )
-            // InternalTableDSL.g:29696:3: ruleJvmFormalParameter
+            // InternalTableDSL.g:28230:2: ( ruleJvmFormalParameter )
+            // InternalTableDSL.g:28231:3: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_0_0_0_1_0()); 
@@ -97026,17 +92027,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__SwitchAssignment_2_0_1"
-    // InternalTableDSL.g:29705:1: rule__XSwitchExpression__SwitchAssignment_2_0_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28240:1: rule__XSwitchExpression__SwitchAssignment_2_0_1 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__SwitchAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29709:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29710:2: ( ruleXExpression )
+            // InternalTableDSL.g:28244:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28245:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29710:2: ( ruleXExpression )
-            // InternalTableDSL.g:29711:3: ruleXExpression
+            // InternalTableDSL.g:28245:2: ( ruleXExpression )
+            // InternalTableDSL.g:28246:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_0_1_0()); 
@@ -97071,17 +92072,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0"
-    // InternalTableDSL.g:29720:1: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 : ( ruleJvmFormalParameter ) ;
+    // InternalTableDSL.g:28255:1: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 : ( ruleJvmFormalParameter ) ;
     public final void rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29724:1: ( ( ruleJvmFormalParameter ) )
-            // InternalTableDSL.g:29725:2: ( ruleJvmFormalParameter )
+            // InternalTableDSL.g:28259:1: ( ( ruleJvmFormalParameter ) )
+            // InternalTableDSL.g:28260:2: ( ruleJvmFormalParameter )
             {
-            // InternalTableDSL.g:29725:2: ( ruleJvmFormalParameter )
-            // InternalTableDSL.g:29726:3: ruleJvmFormalParameter
+            // InternalTableDSL.g:28260:2: ( ruleJvmFormalParameter )
+            // InternalTableDSL.g:28261:3: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_1_0_0_0_0()); 
@@ -97116,17 +92117,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__SwitchAssignment_2_1_1"
-    // InternalTableDSL.g:29735:1: rule__XSwitchExpression__SwitchAssignment_2_1_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28270:1: rule__XSwitchExpression__SwitchAssignment_2_1_1 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__SwitchAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29739:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29740:2: ( ruleXExpression )
+            // InternalTableDSL.g:28274:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28275:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29740:2: ( ruleXExpression )
-            // InternalTableDSL.g:29741:3: ruleXExpression
+            // InternalTableDSL.g:28275:2: ( ruleXExpression )
+            // InternalTableDSL.g:28276:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_1_1_0()); 
@@ -97161,17 +92162,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__CasesAssignment_4"
-    // InternalTableDSL.g:29750:1: rule__XSwitchExpression__CasesAssignment_4 : ( ruleXCasePart ) ;
+    // InternalTableDSL.g:28285:1: rule__XSwitchExpression__CasesAssignment_4 : ( ruleXCasePart ) ;
     public final void rule__XSwitchExpression__CasesAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29754:1: ( ( ruleXCasePart ) )
-            // InternalTableDSL.g:29755:2: ( ruleXCasePart )
+            // InternalTableDSL.g:28289:1: ( ( ruleXCasePart ) )
+            // InternalTableDSL.g:28290:2: ( ruleXCasePart )
             {
-            // InternalTableDSL.g:29755:2: ( ruleXCasePart )
-            // InternalTableDSL.g:29756:3: ruleXCasePart
+            // InternalTableDSL.g:28290:2: ( ruleXCasePart )
+            // InternalTableDSL.g:28291:3: ruleXCasePart
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getCasesXCasePartParserRuleCall_4_0()); 
@@ -97206,17 +92207,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSwitchExpression__DefaultAssignment_5_2"
-    // InternalTableDSL.g:29765:1: rule__XSwitchExpression__DefaultAssignment_5_2 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28300:1: rule__XSwitchExpression__DefaultAssignment_5_2 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__DefaultAssignment_5_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29769:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29770:2: ( ruleXExpression )
+            // InternalTableDSL.g:28304:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28305:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29770:2: ( ruleXExpression )
-            // InternalTableDSL.g:29771:3: ruleXExpression
+            // InternalTableDSL.g:28305:2: ( ruleXExpression )
+            // InternalTableDSL.g:28306:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultXExpressionParserRuleCall_5_2_0()); 
@@ -97251,17 +92252,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__TypeGuardAssignment_1"
-    // InternalTableDSL.g:29780:1: rule__XCasePart__TypeGuardAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalTableDSL.g:28315:1: rule__XCasePart__TypeGuardAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XCasePart__TypeGuardAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29784:1: ( ( ruleJvmTypeReference ) )
-            // InternalTableDSL.g:29785:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:28319:1: ( ( ruleJvmTypeReference ) )
+            // InternalTableDSL.g:28320:2: ( ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:29785:2: ( ruleJvmTypeReference )
-            // InternalTableDSL.g:29786:3: ruleJvmTypeReference
+            // InternalTableDSL.g:28320:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:28321:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getTypeGuardJvmTypeReferenceParserRuleCall_1_0()); 
@@ -97296,17 +92297,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__CaseAssignment_2_1"
-    // InternalTableDSL.g:29795:1: rule__XCasePart__CaseAssignment_2_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28330:1: rule__XCasePart__CaseAssignment_2_1 : ( ruleXExpression ) ;
     public final void rule__XCasePart__CaseAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29799:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29800:2: ( ruleXExpression )
+            // InternalTableDSL.g:28334:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28335:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29800:2: ( ruleXExpression )
-            // InternalTableDSL.g:29801:3: ruleXExpression
+            // InternalTableDSL.g:28335:2: ( ruleXExpression )
+            // InternalTableDSL.g:28336:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseXExpressionParserRuleCall_2_1_0()); 
@@ -97341,17 +92342,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__ThenAssignment_3_0_1"
-    // InternalTableDSL.g:29810:1: rule__XCasePart__ThenAssignment_3_0_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28345:1: rule__XCasePart__ThenAssignment_3_0_1 : ( ruleXExpression ) ;
     public final void rule__XCasePart__ThenAssignment_3_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29814:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29815:2: ( ruleXExpression )
+            // InternalTableDSL.g:28349:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28350:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29815:2: ( ruleXExpression )
-            // InternalTableDSL.g:29816:3: ruleXExpression
+            // InternalTableDSL.g:28350:2: ( ruleXExpression )
+            // InternalTableDSL.g:28351:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getThenXExpressionParserRuleCall_3_0_1_0()); 
@@ -97386,23 +92387,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCasePart__FallThroughAssignment_3_1"
-    // InternalTableDSL.g:29825:1: rule__XCasePart__FallThroughAssignment_3_1 : ( ( ',' ) ) ;
+    // InternalTableDSL.g:28360:1: rule__XCasePart__FallThroughAssignment_3_1 : ( ( ',' ) ) ;
     public final void rule__XCasePart__FallThroughAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29829:1: ( ( ( ',' ) ) )
-            // InternalTableDSL.g:29830:2: ( ( ',' ) )
+            // InternalTableDSL.g:28364:1: ( ( ( ',' ) ) )
+            // InternalTableDSL.g:28365:2: ( ( ',' ) )
             {
-            // InternalTableDSL.g:29830:2: ( ( ',' ) )
-            // InternalTableDSL.g:29831:3: ( ',' )
+            // InternalTableDSL.g:28365:2: ( ( ',' ) )
+            // InternalTableDSL.g:28366:3: ( ',' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
-            // InternalTableDSL.g:29832:3: ( ',' )
-            // InternalTableDSL.g:29833:4: ','
+            // InternalTableDSL.g:28367:3: ( ',' )
+            // InternalTableDSL.g:28368:4: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
@@ -97439,17 +92440,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__DeclaredParamAssignment_0_0_3"
-    // InternalTableDSL.g:29844:1: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 : ( ruleJvmFormalParameter ) ;
+    // InternalTableDSL.g:28379:1: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 : ( ruleJvmFormalParameter ) ;
     public final void rule__XForLoopExpression__DeclaredParamAssignment_0_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29848:1: ( ( ruleJvmFormalParameter ) )
-            // InternalTableDSL.g:29849:2: ( ruleJvmFormalParameter )
+            // InternalTableDSL.g:28383:1: ( ( ruleJvmFormalParameter ) )
+            // InternalTableDSL.g:28384:2: ( ruleJvmFormalParameter )
             {
-            // InternalTableDSL.g:29849:2: ( ruleJvmFormalParameter )
-            // InternalTableDSL.g:29850:3: ruleJvmFormalParameter
+            // InternalTableDSL.g:28384:2: ( ruleJvmFormalParameter )
+            // InternalTableDSL.g:28385:3: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_0_0_3_0()); 
@@ -97484,17 +92485,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__ForExpressionAssignment_1"
-    // InternalTableDSL.g:29859:1: rule__XForLoopExpression__ForExpressionAssignment_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28394:1: rule__XForLoopExpression__ForExpressionAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XForLoopExpression__ForExpressionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29863:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29864:2: ( ruleXExpression )
+            // InternalTableDSL.g:28398:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28399:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29864:2: ( ruleXExpression )
-            // InternalTableDSL.g:29865:3: ruleXExpression
+            // InternalTableDSL.g:28399:2: ( ruleXExpression )
+            // InternalTableDSL.g:28400:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForExpressionXExpressionParserRuleCall_1_0()); 
@@ -97529,17 +92530,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XForLoopExpression__EachExpressionAssignment_3"
-    // InternalTableDSL.g:29874:1: rule__XForLoopExpression__EachExpressionAssignment_3 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28409:1: rule__XForLoopExpression__EachExpressionAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XForLoopExpression__EachExpressionAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29878:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29879:2: ( ruleXExpression )
+            // InternalTableDSL.g:28413:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28414:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29879:2: ( ruleXExpression )
-            // InternalTableDSL.g:29880:3: ruleXExpression
+            // InternalTableDSL.g:28414:2: ( ruleXExpression )
+            // InternalTableDSL.g:28415:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_3_0()); 
@@ -97574,17 +92575,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0"
-    // InternalTableDSL.g:29889:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalTableDSL.g:28424:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29893:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // InternalTableDSL.g:29894:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalTableDSL.g:28428:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalTableDSL.g:28429:2: ( ruleXExpressionOrVarDeclaration )
             {
-            // InternalTableDSL.g:29894:2: ( ruleXExpressionOrVarDeclaration )
-            // InternalTableDSL.g:29895:3: ruleXExpressionOrVarDeclaration
+            // InternalTableDSL.g:28429:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalTableDSL.g:28430:3: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_0_0()); 
@@ -97619,17 +92620,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1"
-    // InternalTableDSL.g:29904:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalTableDSL.g:28439:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29908:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // InternalTableDSL.g:29909:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalTableDSL.g:28443:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalTableDSL.g:28444:2: ( ruleXExpressionOrVarDeclaration )
             {
-            // InternalTableDSL.g:29909:2: ( ruleXExpressionOrVarDeclaration )
-            // InternalTableDSL.g:29910:3: ruleXExpressionOrVarDeclaration
+            // InternalTableDSL.g:28444:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalTableDSL.g:28445:3: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_1_1_0()); 
@@ -97664,17 +92665,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__ExpressionAssignment_5"
-    // InternalTableDSL.g:29919:1: rule__XBasicForLoopExpression__ExpressionAssignment_5 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28454:1: rule__XBasicForLoopExpression__ExpressionAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__ExpressionAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29923:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29924:2: ( ruleXExpression )
+            // InternalTableDSL.g:28458:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28459:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29924:2: ( ruleXExpression )
-            // InternalTableDSL.g:29925:3: ruleXExpression
+            // InternalTableDSL.g:28459:2: ( ruleXExpression )
+            // InternalTableDSL.g:28460:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionXExpressionParserRuleCall_5_0()); 
@@ -97709,17 +92710,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0"
-    // InternalTableDSL.g:29934:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28469:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29938:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29939:2: ( ruleXExpression )
+            // InternalTableDSL.g:28473:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28474:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29939:2: ( ruleXExpression )
-            // InternalTableDSL.g:29940:3: ruleXExpression
+            // InternalTableDSL.g:28474:2: ( ruleXExpression )
+            // InternalTableDSL.g:28475:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_0_0()); 
@@ -97754,17 +92755,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1"
-    // InternalTableDSL.g:29949:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28484:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29953:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29954:2: ( ruleXExpression )
+            // InternalTableDSL.g:28488:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28489:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29954:2: ( ruleXExpression )
-            // InternalTableDSL.g:29955:3: ruleXExpression
+            // InternalTableDSL.g:28489:2: ( ruleXExpression )
+            // InternalTableDSL.g:28490:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_1_1_0()); 
@@ -97799,17 +92800,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__EachExpressionAssignment_9"
-    // InternalTableDSL.g:29964:1: rule__XBasicForLoopExpression__EachExpressionAssignment_9 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28499:1: rule__XBasicForLoopExpression__EachExpressionAssignment_9 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__EachExpressionAssignment_9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29968:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29969:2: ( ruleXExpression )
+            // InternalTableDSL.g:28503:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28504:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29969:2: ( ruleXExpression )
-            // InternalTableDSL.g:29970:3: ruleXExpression
+            // InternalTableDSL.g:28504:2: ( ruleXExpression )
+            // InternalTableDSL.g:28505:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_9_0()); 
@@ -97844,17 +92845,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XWhileExpression__PredicateAssignment_3"
-    // InternalTableDSL.g:29979:1: rule__XWhileExpression__PredicateAssignment_3 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28514:1: rule__XWhileExpression__PredicateAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XWhileExpression__PredicateAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29983:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29984:2: ( ruleXExpression )
+            // InternalTableDSL.g:28518:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28519:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29984:2: ( ruleXExpression )
-            // InternalTableDSL.g:29985:3: ruleXExpression
+            // InternalTableDSL.g:28519:2: ( ruleXExpression )
+            // InternalTableDSL.g:28520:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getPredicateXExpressionParserRuleCall_3_0()); 
@@ -97889,17 +92890,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XWhileExpression__BodyAssignment_5"
-    // InternalTableDSL.g:29994:1: rule__XWhileExpression__BodyAssignment_5 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28529:1: rule__XWhileExpression__BodyAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XWhileExpression__BodyAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:29998:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:29999:2: ( ruleXExpression )
+            // InternalTableDSL.g:28533:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28534:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:29999:2: ( ruleXExpression )
-            // InternalTableDSL.g:30000:3: ruleXExpression
+            // InternalTableDSL.g:28534:2: ( ruleXExpression )
+            // InternalTableDSL.g:28535:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getBodyXExpressionParserRuleCall_5_0()); 
@@ -97934,17 +92935,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__BodyAssignment_2"
-    // InternalTableDSL.g:30009:1: rule__XDoWhileExpression__BodyAssignment_2 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28544:1: rule__XDoWhileExpression__BodyAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XDoWhileExpression__BodyAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30013:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:30014:2: ( ruleXExpression )
+            // InternalTableDSL.g:28548:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28549:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:30014:2: ( ruleXExpression )
-            // InternalTableDSL.g:30015:3: ruleXExpression
+            // InternalTableDSL.g:28549:2: ( ruleXExpression )
+            // InternalTableDSL.g:28550:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getBodyXExpressionParserRuleCall_2_0()); 
@@ -97979,17 +92980,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XDoWhileExpression__PredicateAssignment_5"
-    // InternalTableDSL.g:30024:1: rule__XDoWhileExpression__PredicateAssignment_5 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28559:1: rule__XDoWhileExpression__PredicateAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XDoWhileExpression__PredicateAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30028:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:30029:2: ( ruleXExpression )
+            // InternalTableDSL.g:28563:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28564:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:30029:2: ( ruleXExpression )
-            // InternalTableDSL.g:30030:3: ruleXExpression
+            // InternalTableDSL.g:28564:2: ( ruleXExpression )
+            // InternalTableDSL.g:28565:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getPredicateXExpressionParserRuleCall_5_0()); 
@@ -98024,17 +93025,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBlockExpression__ExpressionsAssignment_2_0"
-    // InternalTableDSL.g:30039:1: rule__XBlockExpression__ExpressionsAssignment_2_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalTableDSL.g:28574:1: rule__XBlockExpression__ExpressionsAssignment_2_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBlockExpression__ExpressionsAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30043:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // InternalTableDSL.g:30044:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalTableDSL.g:28578:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalTableDSL.g:28579:2: ( ruleXExpressionOrVarDeclaration )
             {
-            // InternalTableDSL.g:30044:2: ( ruleXExpressionOrVarDeclaration )
-            // InternalTableDSL.g:30045:3: ruleXExpressionOrVarDeclaration
+            // InternalTableDSL.g:28579:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalTableDSL.g:28580:3: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_2_0_0()); 
@@ -98069,28 +93070,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__WriteableAssignment_1_0"
-    // InternalTableDSL.g:30054:1: rule__XVariableDeclaration__WriteableAssignment_1_0 : ( ( 'var' ) ) ;
+    // InternalTableDSL.g:28589:1: rule__XVariableDeclaration__WriteableAssignment_1_0 : ( ( 'var' ) ) ;
     public final void rule__XVariableDeclaration__WriteableAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30058:1: ( ( ( 'var' ) ) )
-            // InternalTableDSL.g:30059:2: ( ( 'var' ) )
+            // InternalTableDSL.g:28593:1: ( ( ( 'var' ) ) )
+            // InternalTableDSL.g:28594:2: ( ( 'var' ) )
             {
-            // InternalTableDSL.g:30059:2: ( ( 'var' ) )
-            // InternalTableDSL.g:30060:3: ( 'var' )
+            // InternalTableDSL.g:28594:2: ( ( 'var' ) )
+            // InternalTableDSL.g:28595:3: ( 'var' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
-            // InternalTableDSL.g:30061:3: ( 'var' )
-            // InternalTableDSL.g:30062:4: 'var'
+            // InternalTableDSL.g:28596:3: ( 'var' )
+            // InternalTableDSL.g:28597:4: 'var'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
-            match(input,183,FOLLOW_2); if (state.failed) return ;
+            match(input,180,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
@@ -98122,17 +93123,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__TypeAssignment_2_0_0_0"
-    // InternalTableDSL.g:30073:1: rule__XVariableDeclaration__TypeAssignment_2_0_0_0 : ( ruleJvmTypeReference ) ;
+    // InternalTableDSL.g:28608:1: rule__XVariableDeclaration__TypeAssignment_2_0_0_0 : ( ruleJvmTypeReference ) ;
     public final void rule__XVariableDeclaration__TypeAssignment_2_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30077:1: ( ( ruleJvmTypeReference ) )
-            // InternalTableDSL.g:30078:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:28612:1: ( ( ruleJvmTypeReference ) )
+            // InternalTableDSL.g:28613:2: ( ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:30078:2: ( ruleJvmTypeReference )
-            // InternalTableDSL.g:30079:3: ruleJvmTypeReference
+            // InternalTableDSL.g:28613:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:28614:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getTypeJvmTypeReferenceParserRuleCall_2_0_0_0_0()); 
@@ -98167,17 +93168,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__NameAssignment_2_0_0_1"
-    // InternalTableDSL.g:30088:1: rule__XVariableDeclaration__NameAssignment_2_0_0_1 : ( ruleValidID ) ;
+    // InternalTableDSL.g:28623:1: rule__XVariableDeclaration__NameAssignment_2_0_0_1 : ( ruleValidID ) ;
     public final void rule__XVariableDeclaration__NameAssignment_2_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30092:1: ( ( ruleValidID ) )
-            // InternalTableDSL.g:30093:2: ( ruleValidID )
+            // InternalTableDSL.g:28627:1: ( ( ruleValidID ) )
+            // InternalTableDSL.g:28628:2: ( ruleValidID )
             {
-            // InternalTableDSL.g:30093:2: ( ruleValidID )
-            // InternalTableDSL.g:30094:3: ruleValidID
+            // InternalTableDSL.g:28628:2: ( ruleValidID )
+            // InternalTableDSL.g:28629:3: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_0_0_1_0()); 
@@ -98212,17 +93213,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__NameAssignment_2_1"
-    // InternalTableDSL.g:30103:1: rule__XVariableDeclaration__NameAssignment_2_1 : ( ruleValidID ) ;
+    // InternalTableDSL.g:28638:1: rule__XVariableDeclaration__NameAssignment_2_1 : ( ruleValidID ) ;
     public final void rule__XVariableDeclaration__NameAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30107:1: ( ( ruleValidID ) )
-            // InternalTableDSL.g:30108:2: ( ruleValidID )
+            // InternalTableDSL.g:28642:1: ( ( ruleValidID ) )
+            // InternalTableDSL.g:28643:2: ( ruleValidID )
             {
-            // InternalTableDSL.g:30108:2: ( ruleValidID )
-            // InternalTableDSL.g:30109:3: ruleValidID
+            // InternalTableDSL.g:28643:2: ( ruleValidID )
+            // InternalTableDSL.g:28644:3: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_1_0()); 
@@ -98257,17 +93258,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XVariableDeclaration__RightAssignment_3_1"
-    // InternalTableDSL.g:30118:1: rule__XVariableDeclaration__RightAssignment_3_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28653:1: rule__XVariableDeclaration__RightAssignment_3_1 : ( ruleXExpression ) ;
     public final void rule__XVariableDeclaration__RightAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30122:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:30123:2: ( ruleXExpression )
+            // InternalTableDSL.g:28657:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28658:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:30123:2: ( ruleXExpression )
-            // InternalTableDSL.g:30124:3: ruleXExpression
+            // InternalTableDSL.g:28658:2: ( ruleXExpression )
+            // InternalTableDSL.g:28659:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getRightXExpressionParserRuleCall_3_1_0()); 
@@ -98302,17 +93303,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmFormalParameter__ParameterTypeAssignment_0"
-    // InternalTableDSL.g:30133:1: rule__JvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
+    // InternalTableDSL.g:28668:1: rule__JvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmFormalParameter__ParameterTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30137:1: ( ( ruleJvmTypeReference ) )
-            // InternalTableDSL.g:30138:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:28672:1: ( ( ruleJvmTypeReference ) )
+            // InternalTableDSL.g:28673:2: ( ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:30138:2: ( ruleJvmTypeReference )
-            // InternalTableDSL.g:30139:3: ruleJvmTypeReference
+            // InternalTableDSL.g:28673:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:28674:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
@@ -98347,17 +93348,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmFormalParameter__NameAssignment_1"
-    // InternalTableDSL.g:30148:1: rule__JvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
+    // InternalTableDSL.g:28683:1: rule__JvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__JvmFormalParameter__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30152:1: ( ( ruleValidID ) )
-            // InternalTableDSL.g:30153:2: ( ruleValidID )
+            // InternalTableDSL.g:28687:1: ( ( ruleValidID ) )
+            // InternalTableDSL.g:28688:2: ( ruleValidID )
             {
-            // InternalTableDSL.g:30153:2: ( ruleValidID )
-            // InternalTableDSL.g:30154:3: ruleValidID
+            // InternalTableDSL.g:28688:2: ( ruleValidID )
+            // InternalTableDSL.g:28689:3: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
@@ -98392,17 +93393,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__ParameterTypeAssignment_0"
-    // InternalTableDSL.g:30163:1: rule__FullJvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
+    // InternalTableDSL.g:28698:1: rule__FullJvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
     public final void rule__FullJvmFormalParameter__ParameterTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30167:1: ( ( ruleJvmTypeReference ) )
-            // InternalTableDSL.g:30168:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:28702:1: ( ( ruleJvmTypeReference ) )
+            // InternalTableDSL.g:28703:2: ( ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:30168:2: ( ruleJvmTypeReference )
-            // InternalTableDSL.g:30169:3: ruleJvmTypeReference
+            // InternalTableDSL.g:28703:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:28704:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
@@ -98437,17 +93438,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__NameAssignment_1"
-    // InternalTableDSL.g:30178:1: rule__FullJvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
+    // InternalTableDSL.g:28713:1: rule__FullJvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__FullJvmFormalParameter__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30182:1: ( ( ruleValidID ) )
-            // InternalTableDSL.g:30183:2: ( ruleValidID )
+            // InternalTableDSL.g:28717:1: ( ( ruleValidID ) )
+            // InternalTableDSL.g:28718:2: ( ruleValidID )
             {
-            // InternalTableDSL.g:30183:2: ( ruleValidID )
-            // InternalTableDSL.g:30184:3: ruleValidID
+            // InternalTableDSL.g:28718:2: ( ruleValidID )
+            // InternalTableDSL.g:28719:3: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
@@ -98482,17 +93483,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__TypeArgumentsAssignment_1_1"
-    // InternalTableDSL.g:30193:1: rule__XFeatureCall__TypeArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalTableDSL.g:28728:1: rule__XFeatureCall__TypeArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XFeatureCall__TypeArgumentsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30197:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalTableDSL.g:30198:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:28732:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalTableDSL.g:28733:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalTableDSL.g:30198:2: ( ruleJvmArgumentTypeReference )
-            // InternalTableDSL.g:30199:3: ruleJvmArgumentTypeReference
+            // InternalTableDSL.g:28733:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:28734:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
@@ -98527,17 +93528,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__TypeArgumentsAssignment_1_2_1"
-    // InternalTableDSL.g:30208:1: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalTableDSL.g:28743:1: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XFeatureCall__TypeArgumentsAssignment_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30212:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalTableDSL.g:30213:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:28747:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalTableDSL.g:28748:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalTableDSL.g:30213:2: ( ruleJvmArgumentTypeReference )
-            // InternalTableDSL.g:30214:3: ruleJvmArgumentTypeReference
+            // InternalTableDSL.g:28748:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:28749:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
@@ -98572,23 +93573,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureAssignment_2"
-    // InternalTableDSL.g:30223:1: rule__XFeatureCall__FeatureAssignment_2 : ( ( ruleIdOrSuper ) ) ;
+    // InternalTableDSL.g:28758:1: rule__XFeatureCall__FeatureAssignment_2 : ( ( ruleIdOrSuper ) ) ;
     public final void rule__XFeatureCall__FeatureAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30227:1: ( ( ( ruleIdOrSuper ) ) )
-            // InternalTableDSL.g:30228:2: ( ( ruleIdOrSuper ) )
+            // InternalTableDSL.g:28762:1: ( ( ( ruleIdOrSuper ) ) )
+            // InternalTableDSL.g:28763:2: ( ( ruleIdOrSuper ) )
             {
-            // InternalTableDSL.g:30228:2: ( ( ruleIdOrSuper ) )
-            // InternalTableDSL.g:30229:3: ( ruleIdOrSuper )
+            // InternalTableDSL.g:28763:2: ( ( ruleIdOrSuper ) )
+            // InternalTableDSL.g:28764:3: ( ruleIdOrSuper )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_2_0()); 
             }
-            // InternalTableDSL.g:30230:3: ( ruleIdOrSuper )
-            // InternalTableDSL.g:30231:4: ruleIdOrSuper
+            // InternalTableDSL.g:28765:3: ( ruleIdOrSuper )
+            // InternalTableDSL.g:28766:4: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementIdOrSuperParserRuleCall_2_0_1()); 
@@ -98629,23 +93630,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__ExplicitOperationCallAssignment_3_0"
-    // InternalTableDSL.g:30242:1: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 : ( ( '(' ) ) ;
+    // InternalTableDSL.g:28777:1: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 : ( ( '(' ) ) ;
     public final void rule__XFeatureCall__ExplicitOperationCallAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30246:1: ( ( ( '(' ) ) )
-            // InternalTableDSL.g:30247:2: ( ( '(' ) )
+            // InternalTableDSL.g:28781:1: ( ( ( '(' ) ) )
+            // InternalTableDSL.g:28782:2: ( ( '(' ) )
             {
-            // InternalTableDSL.g:30247:2: ( ( '(' ) )
-            // InternalTableDSL.g:30248:3: ( '(' )
+            // InternalTableDSL.g:28782:2: ( ( '(' ) )
+            // InternalTableDSL.g:28783:3: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
-            // InternalTableDSL.g:30249:3: ( '(' )
-            // InternalTableDSL.g:30250:4: '('
+            // InternalTableDSL.g:28784:3: ( '(' )
+            // InternalTableDSL.g:28785:4: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
@@ -98682,17 +93683,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0"
-    // InternalTableDSL.g:30261:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 : ( ruleXShortClosure ) ;
+    // InternalTableDSL.g:28796:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30265:1: ( ( ruleXShortClosure ) )
-            // InternalTableDSL.g:30266:2: ( ruleXShortClosure )
+            // InternalTableDSL.g:28800:1: ( ( ruleXShortClosure ) )
+            // InternalTableDSL.g:28801:2: ( ruleXShortClosure )
             {
-            // InternalTableDSL.g:30266:2: ( ruleXShortClosure )
-            // InternalTableDSL.g:30267:3: ruleXShortClosure
+            // InternalTableDSL.g:28801:2: ( ruleXShortClosure )
+            // InternalTableDSL.g:28802:3: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXShortClosureParserRuleCall_3_1_0_0()); 
@@ -98727,17 +93728,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0"
-    // InternalTableDSL.g:30276:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28811:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30280:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:30281:2: ( ruleXExpression )
+            // InternalTableDSL.g:28815:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28816:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:30281:2: ( ruleXExpression )
-            // InternalTableDSL.g:30282:3: ruleXExpression
+            // InternalTableDSL.g:28816:2: ( ruleXExpression )
+            // InternalTableDSL.g:28817:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_0_0()); 
@@ -98772,17 +93773,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1"
-    // InternalTableDSL.g:30291:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28826:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 : ( ruleXExpression ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30295:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:30296:2: ( ruleXExpression )
+            // InternalTableDSL.g:28830:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28831:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:30296:2: ( ruleXExpression )
-            // InternalTableDSL.g:30297:3: ruleXExpression
+            // InternalTableDSL.g:28831:2: ( ruleXExpression )
+            // InternalTableDSL.g:28832:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_1_1_0()); 
@@ -98817,17 +93818,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_4"
-    // InternalTableDSL.g:30306:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_4 : ( ruleXClosure ) ;
+    // InternalTableDSL.g:28841:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_4 : ( ruleXClosure ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30310:1: ( ( ruleXClosure ) )
-            // InternalTableDSL.g:30311:2: ( ruleXClosure )
+            // InternalTableDSL.g:28845:1: ( ( ruleXClosure ) )
+            // InternalTableDSL.g:28846:2: ( ruleXClosure )
             {
-            // InternalTableDSL.g:30311:2: ( ruleXClosure )
-            // InternalTableDSL.g:30312:3: ruleXClosure
+            // InternalTableDSL.g:28846:2: ( ruleXClosure )
+            // InternalTableDSL.g:28847:3: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXClosureParserRuleCall_4_0()); 
@@ -98862,23 +93863,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__ConstructorAssignment_2"
-    // InternalTableDSL.g:30321:1: rule__XConstructorCall__ConstructorAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // InternalTableDSL.g:28856:1: rule__XConstructorCall__ConstructorAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XConstructorCall__ConstructorAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30325:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalTableDSL.g:30326:2: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:28860:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalTableDSL.g:28861:2: ( ( ruleQualifiedName ) )
             {
-            // InternalTableDSL.g:30326:2: ( ( ruleQualifiedName ) )
-            // InternalTableDSL.g:30327:3: ( ruleQualifiedName )
+            // InternalTableDSL.g:28861:2: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:28862:3: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorCrossReference_2_0()); 
             }
-            // InternalTableDSL.g:30328:3: ( ruleQualifiedName )
-            // InternalTableDSL.g:30329:4: ruleQualifiedName
+            // InternalTableDSL.g:28863:3: ( ruleQualifiedName )
+            // InternalTableDSL.g:28864:4: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorQualifiedNameParserRuleCall_2_0_1()); 
@@ -98919,17 +93920,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__TypeArgumentsAssignment_3_1"
-    // InternalTableDSL.g:30340:1: rule__XConstructorCall__TypeArgumentsAssignment_3_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalTableDSL.g:28875:1: rule__XConstructorCall__TypeArgumentsAssignment_3_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XConstructorCall__TypeArgumentsAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30344:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalTableDSL.g:30345:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:28879:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalTableDSL.g:28880:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalTableDSL.g:30345:2: ( ruleJvmArgumentTypeReference )
-            // InternalTableDSL.g:30346:3: ruleJvmArgumentTypeReference
+            // InternalTableDSL.g:28880:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:28881:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_1_0()); 
@@ -98964,17 +93965,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__TypeArgumentsAssignment_3_2_1"
-    // InternalTableDSL.g:30355:1: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalTableDSL.g:28890:1: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XConstructorCall__TypeArgumentsAssignment_3_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30359:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalTableDSL.g:30360:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:28894:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalTableDSL.g:28895:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalTableDSL.g:30360:2: ( ruleJvmArgumentTypeReference )
-            // InternalTableDSL.g:30361:3: ruleJvmArgumentTypeReference
+            // InternalTableDSL.g:28895:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:28896:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_2_1_0()); 
@@ -99009,23 +94010,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0"
-    // InternalTableDSL.g:30370:1: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 : ( ( '(' ) ) ;
+    // InternalTableDSL.g:28905:1: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 : ( ( '(' ) ) ;
     public final void rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30374:1: ( ( ( '(' ) ) )
-            // InternalTableDSL.g:30375:2: ( ( '(' ) )
+            // InternalTableDSL.g:28909:1: ( ( ( '(' ) ) )
+            // InternalTableDSL.g:28910:2: ( ( '(' ) )
             {
-            // InternalTableDSL.g:30375:2: ( ( '(' ) )
-            // InternalTableDSL.g:30376:3: ( '(' )
+            // InternalTableDSL.g:28910:2: ( ( '(' ) )
+            // InternalTableDSL.g:28911:3: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
-            // InternalTableDSL.g:30377:3: ( '(' )
-            // InternalTableDSL.g:30378:4: '('
+            // InternalTableDSL.g:28912:3: ( '(' )
+            // InternalTableDSL.g:28913:4: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
@@ -99062,17 +94063,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_0"
-    // InternalTableDSL.g:30389:1: rule__XConstructorCall__ArgumentsAssignment_4_1_0 : ( ruleXShortClosure ) ;
+    // InternalTableDSL.g:28924:1: rule__XConstructorCall__ArgumentsAssignment_4_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30393:1: ( ( ruleXShortClosure ) )
-            // InternalTableDSL.g:30394:2: ( ruleXShortClosure )
+            // InternalTableDSL.g:28928:1: ( ( ruleXShortClosure ) )
+            // InternalTableDSL.g:28929:2: ( ruleXShortClosure )
             {
-            // InternalTableDSL.g:30394:2: ( ruleXShortClosure )
-            // InternalTableDSL.g:30395:3: ruleXShortClosure
+            // InternalTableDSL.g:28929:2: ( ruleXShortClosure )
+            // InternalTableDSL.g:28930:3: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXShortClosureParserRuleCall_4_1_0_0()); 
@@ -99107,17 +94108,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_1_0"
-    // InternalTableDSL.g:30404:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28939:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30408:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:30409:2: ( ruleXExpression )
+            // InternalTableDSL.g:28943:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28944:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:30409:2: ( ruleXExpression )
-            // InternalTableDSL.g:30410:3: ruleXExpression
+            // InternalTableDSL.g:28944:2: ( ruleXExpression )
+            // InternalTableDSL.g:28945:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_0_0()); 
@@ -99152,17 +94153,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1"
-    // InternalTableDSL.g:30419:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:28954:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 : ( ruleXExpression ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30423:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:30424:2: ( ruleXExpression )
+            // InternalTableDSL.g:28958:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:28959:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:30424:2: ( ruleXExpression )
-            // InternalTableDSL.g:30425:3: ruleXExpression
+            // InternalTableDSL.g:28959:2: ( ruleXExpression )
+            // InternalTableDSL.g:28960:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_1_1_0()); 
@@ -99197,17 +94198,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_5"
-    // InternalTableDSL.g:30434:1: rule__XConstructorCall__ArgumentsAssignment_5 : ( ruleXClosure ) ;
+    // InternalTableDSL.g:28969:1: rule__XConstructorCall__ArgumentsAssignment_5 : ( ruleXClosure ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30438:1: ( ( ruleXClosure ) )
-            // InternalTableDSL.g:30439:2: ( ruleXClosure )
+            // InternalTableDSL.g:28973:1: ( ( ruleXClosure ) )
+            // InternalTableDSL.g:28974:2: ( ruleXClosure )
             {
-            // InternalTableDSL.g:30439:2: ( ruleXClosure )
-            // InternalTableDSL.g:30440:3: ruleXClosure
+            // InternalTableDSL.g:28974:2: ( ruleXClosure )
+            // InternalTableDSL.g:28975:3: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXClosureParserRuleCall_5_0()); 
@@ -99242,28 +94243,28 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XBooleanLiteral__IsTrueAssignment_1_1"
-    // InternalTableDSL.g:30449:1: rule__XBooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
+    // InternalTableDSL.g:28984:1: rule__XBooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
     public final void rule__XBooleanLiteral__IsTrueAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30453:1: ( ( ( 'true' ) ) )
-            // InternalTableDSL.g:30454:2: ( ( 'true' ) )
+            // InternalTableDSL.g:28988:1: ( ( ( 'true' ) ) )
+            // InternalTableDSL.g:28989:2: ( ( 'true' ) )
             {
-            // InternalTableDSL.g:30454:2: ( ( 'true' ) )
-            // InternalTableDSL.g:30455:3: ( 'true' )
+            // InternalTableDSL.g:28989:2: ( ( 'true' ) )
+            // InternalTableDSL.g:28990:3: ( 'true' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
-            // InternalTableDSL.g:30456:3: ( 'true' )
-            // InternalTableDSL.g:30457:4: 'true'
+            // InternalTableDSL.g:28991:3: ( 'true' )
+            // InternalTableDSL.g:28992:4: 'true'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
-            match(input,184,FOLLOW_2); if (state.failed) return ;
+            match(input,181,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
@@ -99295,17 +94296,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XNumberLiteral__ValueAssignment_1"
-    // InternalTableDSL.g:30468:1: rule__XNumberLiteral__ValueAssignment_1 : ( ruleNumber ) ;
+    // InternalTableDSL.g:29003:1: rule__XNumberLiteral__ValueAssignment_1 : ( ruleNumber ) ;
     public final void rule__XNumberLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30472:1: ( ( ruleNumber ) )
-            // InternalTableDSL.g:30473:2: ( ruleNumber )
+            // InternalTableDSL.g:29007:1: ( ( ruleNumber ) )
+            // InternalTableDSL.g:29008:2: ( ruleNumber )
             {
-            // InternalTableDSL.g:30473:2: ( ruleNumber )
-            // InternalTableDSL.g:30474:3: ruleNumber
+            // InternalTableDSL.g:29008:2: ( ruleNumber )
+            // InternalTableDSL.g:29009:3: ruleNumber
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getValueNumberParserRuleCall_1_0()); 
@@ -99340,17 +94341,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XStringLiteral__ValueAssignment_1"
-    // InternalTableDSL.g:30483:1: rule__XStringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
+    // InternalTableDSL.g:29018:1: rule__XStringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
     public final void rule__XStringLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30487:1: ( ( RULE_STRING ) )
-            // InternalTableDSL.g:30488:2: ( RULE_STRING )
+            // InternalTableDSL.g:29022:1: ( ( RULE_STRING ) )
+            // InternalTableDSL.g:29023:2: ( RULE_STRING )
             {
-            // InternalTableDSL.g:30488:2: ( RULE_STRING )
-            // InternalTableDSL.g:30489:3: RULE_STRING
+            // InternalTableDSL.g:29023:2: ( RULE_STRING )
+            // InternalTableDSL.g:29024:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
@@ -99381,23 +94382,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTypeLiteral__TypeAssignment_3"
-    // InternalTableDSL.g:30498:1: rule__XTypeLiteral__TypeAssignment_3 : ( ( ruleQualifiedName ) ) ;
+    // InternalTableDSL.g:29033:1: rule__XTypeLiteral__TypeAssignment_3 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XTypeLiteral__TypeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30502:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalTableDSL.g:30503:2: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:29037:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalTableDSL.g:29038:2: ( ( ruleQualifiedName ) )
             {
-            // InternalTableDSL.g:30503:2: ( ( ruleQualifiedName ) )
-            // InternalTableDSL.g:30504:3: ( ruleQualifiedName )
+            // InternalTableDSL.g:29038:2: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:29039:3: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeCrossReference_3_0()); 
             }
-            // InternalTableDSL.g:30505:3: ( ruleQualifiedName )
-            // InternalTableDSL.g:30506:4: ruleQualifiedName
+            // InternalTableDSL.g:29040:3: ( ruleQualifiedName )
+            // InternalTableDSL.g:29041:4: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeQualifiedNameParserRuleCall_3_0_1()); 
@@ -99438,17 +94439,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTypeLiteral__ArrayDimensionsAssignment_4"
-    // InternalTableDSL.g:30517:1: rule__XTypeLiteral__ArrayDimensionsAssignment_4 : ( ruleArrayBrackets ) ;
+    // InternalTableDSL.g:29052:1: rule__XTypeLiteral__ArrayDimensionsAssignment_4 : ( ruleArrayBrackets ) ;
     public final void rule__XTypeLiteral__ArrayDimensionsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30521:1: ( ( ruleArrayBrackets ) )
-            // InternalTableDSL.g:30522:2: ( ruleArrayBrackets )
+            // InternalTableDSL.g:29056:1: ( ( ruleArrayBrackets ) )
+            // InternalTableDSL.g:29057:2: ( ruleArrayBrackets )
             {
-            // InternalTableDSL.g:30522:2: ( ruleArrayBrackets )
-            // InternalTableDSL.g:30523:3: ruleArrayBrackets
+            // InternalTableDSL.g:29057:2: ( ruleArrayBrackets )
+            // InternalTableDSL.g:29058:3: ruleArrayBrackets
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsArrayBracketsParserRuleCall_4_0()); 
@@ -99483,17 +94484,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XThrowExpression__ExpressionAssignment_2"
-    // InternalTableDSL.g:30532:1: rule__XThrowExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:29067:1: rule__XThrowExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XThrowExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30536:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:30537:2: ( ruleXExpression )
+            // InternalTableDSL.g:29071:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:29072:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:30537:2: ( ruleXExpression )
-            // InternalTableDSL.g:30538:3: ruleXExpression
+            // InternalTableDSL.g:29072:2: ( ruleXExpression )
+            // InternalTableDSL.g:29073:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
@@ -99528,17 +94529,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XReturnExpression__ExpressionAssignment_2"
-    // InternalTableDSL.g:30547:1: rule__XReturnExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:29082:1: rule__XReturnExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XReturnExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30551:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:30552:2: ( ruleXExpression )
+            // InternalTableDSL.g:29086:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:29087:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:30552:2: ( ruleXExpression )
-            // InternalTableDSL.g:30553:3: ruleXExpression
+            // InternalTableDSL.g:29087:2: ( ruleXExpression )
+            // InternalTableDSL.g:29088:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
@@ -99573,17 +94574,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__ExpressionAssignment_2"
-    // InternalTableDSL.g:30562:1: rule__XTryCatchFinallyExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:29097:1: rule__XTryCatchFinallyExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30566:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:30567:2: ( ruleXExpression )
+            // InternalTableDSL.g:29101:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:29102:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:30567:2: ( ruleXExpression )
-            // InternalTableDSL.g:30568:3: ruleXExpression
+            // InternalTableDSL.g:29102:2: ( ruleXExpression )
+            // InternalTableDSL.g:29103:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
@@ -99618,17 +94619,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0"
-    // InternalTableDSL.g:30577:1: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 : ( ruleXCatchClause ) ;
+    // InternalTableDSL.g:29112:1: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 : ( ruleXCatchClause ) ;
     public final void rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30581:1: ( ( ruleXCatchClause ) )
-            // InternalTableDSL.g:30582:2: ( ruleXCatchClause )
+            // InternalTableDSL.g:29116:1: ( ( ruleXCatchClause ) )
+            // InternalTableDSL.g:29117:2: ( ruleXCatchClause )
             {
-            // InternalTableDSL.g:30582:2: ( ruleXCatchClause )
-            // InternalTableDSL.g:30583:3: ruleXCatchClause
+            // InternalTableDSL.g:29117:2: ( ruleXCatchClause )
+            // InternalTableDSL.g:29118:3: ruleXCatchClause
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesXCatchClauseParserRuleCall_3_0_0_0()); 
@@ -99663,17 +94664,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1"
-    // InternalTableDSL.g:30592:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:29127:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30596:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:30597:2: ( ruleXExpression )
+            // InternalTableDSL.g:29131:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:29132:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:30597:2: ( ruleXExpression )
-            // InternalTableDSL.g:30598:3: ruleXExpression
+            // InternalTableDSL.g:29132:2: ( ruleXExpression )
+            // InternalTableDSL.g:29133:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_0_1_1_0()); 
@@ -99708,17 +94709,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1"
-    // InternalTableDSL.g:30607:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:29142:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30611:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:30612:2: ( ruleXExpression )
+            // InternalTableDSL.g:29146:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:29147:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:30612:2: ( ruleXExpression )
-            // InternalTableDSL.g:30613:3: ruleXExpression
+            // InternalTableDSL.g:29147:2: ( ruleXExpression )
+            // InternalTableDSL.g:29148:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_1_1_0()); 
@@ -99753,17 +94754,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__ParamAssignment_1"
-    // InternalTableDSL.g:30622:1: rule__XSynchronizedExpression__ParamAssignment_1 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:29157:1: rule__XSynchronizedExpression__ParamAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XSynchronizedExpression__ParamAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30626:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:30627:2: ( ruleXExpression )
+            // InternalTableDSL.g:29161:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:29162:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:30627:2: ( ruleXExpression )
-            // InternalTableDSL.g:30628:3: ruleXExpression
+            // InternalTableDSL.g:29162:2: ( ruleXExpression )
+            // InternalTableDSL.g:29163:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getParamXExpressionParserRuleCall_1_0()); 
@@ -99798,17 +94799,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XSynchronizedExpression__ExpressionAssignment_3"
-    // InternalTableDSL.g:30637:1: rule__XSynchronizedExpression__ExpressionAssignment_3 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:29172:1: rule__XSynchronizedExpression__ExpressionAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XSynchronizedExpression__ExpressionAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30641:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:30642:2: ( ruleXExpression )
+            // InternalTableDSL.g:29176:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:29177:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:30642:2: ( ruleXExpression )
-            // InternalTableDSL.g:30643:3: ruleXExpression
+            // InternalTableDSL.g:29177:2: ( ruleXExpression )
+            // InternalTableDSL.g:29178:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getExpressionXExpressionParserRuleCall_3_0()); 
@@ -99843,17 +94844,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCatchClause__DeclaredParamAssignment_2"
-    // InternalTableDSL.g:30652:1: rule__XCatchClause__DeclaredParamAssignment_2 : ( ruleFullJvmFormalParameter ) ;
+    // InternalTableDSL.g:29187:1: rule__XCatchClause__DeclaredParamAssignment_2 : ( ruleFullJvmFormalParameter ) ;
     public final void rule__XCatchClause__DeclaredParamAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30656:1: ( ( ruleFullJvmFormalParameter ) )
-            // InternalTableDSL.g:30657:2: ( ruleFullJvmFormalParameter )
+            // InternalTableDSL.g:29191:1: ( ( ruleFullJvmFormalParameter ) )
+            // InternalTableDSL.g:29192:2: ( ruleFullJvmFormalParameter )
             {
-            // InternalTableDSL.g:30657:2: ( ruleFullJvmFormalParameter )
-            // InternalTableDSL.g:30658:3: ruleFullJvmFormalParameter
+            // InternalTableDSL.g:29192:2: ( ruleFullJvmFormalParameter )
+            // InternalTableDSL.g:29193:3: ruleFullJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getDeclaredParamFullJvmFormalParameterParserRuleCall_2_0()); 
@@ -99888,17 +94889,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XCatchClause__ExpressionAssignment_4"
-    // InternalTableDSL.g:30667:1: rule__XCatchClause__ExpressionAssignment_4 : ( ruleXExpression ) ;
+    // InternalTableDSL.g:29202:1: rule__XCatchClause__ExpressionAssignment_4 : ( ruleXExpression ) ;
     public final void rule__XCatchClause__ExpressionAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30671:1: ( ( ruleXExpression ) )
-            // InternalTableDSL.g:30672:2: ( ruleXExpression )
+            // InternalTableDSL.g:29206:1: ( ( ruleXExpression ) )
+            // InternalTableDSL.g:29207:2: ( ruleXExpression )
             {
-            // InternalTableDSL.g:30672:2: ( ruleXExpression )
-            // InternalTableDSL.g:30673:3: ruleXExpression
+            // InternalTableDSL.g:29207:2: ( ruleXExpression )
+            // InternalTableDSL.g:29208:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getExpressionXExpressionParserRuleCall_4_0()); 
@@ -99933,17 +94934,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0"
-    // InternalTableDSL.g:30682:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 : ( ruleJvmTypeReference ) ;
+    // InternalTableDSL.g:29217:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30686:1: ( ( ruleJvmTypeReference ) )
-            // InternalTableDSL.g:30687:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:29221:1: ( ( ruleJvmTypeReference ) )
+            // InternalTableDSL.g:29222:2: ( ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:30687:2: ( ruleJvmTypeReference )
-            // InternalTableDSL.g:30688:3: ruleJvmTypeReference
+            // InternalTableDSL.g:29222:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:29223:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_0_0()); 
@@ -99978,17 +94979,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1"
-    // InternalTableDSL.g:30697:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 : ( ruleJvmTypeReference ) ;
+    // InternalTableDSL.g:29232:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30701:1: ( ( ruleJvmTypeReference ) )
-            // InternalTableDSL.g:30702:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:29236:1: ( ( ruleJvmTypeReference ) )
+            // InternalTableDSL.g:29237:2: ( ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:30702:2: ( ruleJvmTypeReference )
-            // InternalTableDSL.g:30703:3: ruleJvmTypeReference
+            // InternalTableDSL.g:29237:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:29238:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_1_1_0()); 
@@ -100023,17 +95024,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ReturnTypeAssignment_2"
-    // InternalTableDSL.g:30712:1: rule__XFunctionTypeRef__ReturnTypeAssignment_2 : ( ruleJvmTypeReference ) ;
+    // InternalTableDSL.g:29247:1: rule__XFunctionTypeRef__ReturnTypeAssignment_2 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ReturnTypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30716:1: ( ( ruleJvmTypeReference ) )
-            // InternalTableDSL.g:30717:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:29251:1: ( ( ruleJvmTypeReference ) )
+            // InternalTableDSL.g:29252:2: ( ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:30717:2: ( ruleJvmTypeReference )
-            // InternalTableDSL.g:30718:3: ruleJvmTypeReference
+            // InternalTableDSL.g:29252:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:29253:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeJvmTypeReferenceParserRuleCall_2_0()); 
@@ -100068,23 +95069,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__TypeAssignment_0"
-    // InternalTableDSL.g:30727:1: rule__JvmParameterizedTypeReference__TypeAssignment_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalTableDSL.g:29262:1: rule__JvmParameterizedTypeReference__TypeAssignment_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__JvmParameterizedTypeReference__TypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30731:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalTableDSL.g:30732:2: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:29266:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalTableDSL.g:29267:2: ( ( ruleQualifiedName ) )
             {
-            // InternalTableDSL.g:30732:2: ( ( ruleQualifiedName ) )
-            // InternalTableDSL.g:30733:3: ( ruleQualifiedName )
+            // InternalTableDSL.g:29267:2: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:29268:3: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_0_0()); 
             }
-            // InternalTableDSL.g:30734:3: ( ruleQualifiedName )
-            // InternalTableDSL.g:30735:4: ruleQualifiedName
+            // InternalTableDSL.g:29269:3: ( ruleQualifiedName )
+            // InternalTableDSL.g:29270:4: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeQualifiedNameParserRuleCall_0_0_1()); 
@@ -100125,17 +95126,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1"
-    // InternalTableDSL.g:30746:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalTableDSL.g:29281:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30750:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalTableDSL.g:30751:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:29285:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalTableDSL.g:29286:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalTableDSL.g:30751:2: ( ruleJvmArgumentTypeReference )
-            // InternalTableDSL.g:30752:3: ruleJvmArgumentTypeReference
+            // InternalTableDSL.g:29286:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:29287:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
@@ -100170,17 +95171,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1"
-    // InternalTableDSL.g:30761:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalTableDSL.g:29296:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30765:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalTableDSL.g:30766:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:29300:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalTableDSL.g:29301:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalTableDSL.g:30766:2: ( ruleJvmArgumentTypeReference )
-            // InternalTableDSL.g:30767:3: ruleJvmArgumentTypeReference
+            // InternalTableDSL.g:29301:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:29302:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
@@ -100215,23 +95216,23 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1"
-    // InternalTableDSL.g:30776:1: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 : ( ( ruleValidID ) ) ;
+    // InternalTableDSL.g:29311:1: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 : ( ( ruleValidID ) ) ;
     public final void rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30780:1: ( ( ( ruleValidID ) ) )
-            // InternalTableDSL.g:30781:2: ( ( ruleValidID ) )
+            // InternalTableDSL.g:29315:1: ( ( ( ruleValidID ) ) )
+            // InternalTableDSL.g:29316:2: ( ( ruleValidID ) )
             {
-            // InternalTableDSL.g:30781:2: ( ( ruleValidID ) )
-            // InternalTableDSL.g:30782:3: ( ruleValidID )
+            // InternalTableDSL.g:29316:2: ( ( ruleValidID ) )
+            // InternalTableDSL.g:29317:3: ( ruleValidID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_1_4_1_0()); 
             }
-            // InternalTableDSL.g:30783:3: ( ruleValidID )
-            // InternalTableDSL.g:30784:4: ruleValidID
+            // InternalTableDSL.g:29318:3: ( ruleValidID )
+            // InternalTableDSL.g:29319:4: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeValidIDParserRuleCall_1_4_1_0_1()); 
@@ -100272,17 +95273,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1"
-    // InternalTableDSL.g:30795:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalTableDSL.g:29330:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30799:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalTableDSL.g:30800:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:29334:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalTableDSL.g:29335:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalTableDSL.g:30800:2: ( ruleJvmArgumentTypeReference )
-            // InternalTableDSL.g:30801:3: ruleJvmArgumentTypeReference
+            // InternalTableDSL.g:29335:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:29336:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_1_0()); 
@@ -100317,17 +95318,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1"
-    // InternalTableDSL.g:30810:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalTableDSL.g:29345:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30814:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalTableDSL.g:30815:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:29349:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalTableDSL.g:29350:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalTableDSL.g:30815:2: ( ruleJvmArgumentTypeReference )
-            // InternalTableDSL.g:30816:3: ruleJvmArgumentTypeReference
+            // InternalTableDSL.g:29350:2: ( ruleJvmArgumentTypeReference )
+            // InternalTableDSL.g:29351:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_2_1_0()); 
@@ -100362,17 +95363,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0"
-    // InternalTableDSL.g:30825:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 : ( ruleJvmUpperBound ) ;
+    // InternalTableDSL.g:29360:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 : ( ruleJvmUpperBound ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30829:1: ( ( ruleJvmUpperBound ) )
-            // InternalTableDSL.g:30830:2: ( ruleJvmUpperBound )
+            // InternalTableDSL.g:29364:1: ( ( ruleJvmUpperBound ) )
+            // InternalTableDSL.g:29365:2: ( ruleJvmUpperBound )
             {
-            // InternalTableDSL.g:30830:2: ( ruleJvmUpperBound )
-            // InternalTableDSL.g:30831:3: ruleJvmUpperBound
+            // InternalTableDSL.g:29365:2: ( ruleJvmUpperBound )
+            // InternalTableDSL.g:29366:3: ruleJvmUpperBound
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundParserRuleCall_2_0_0_0()); 
@@ -100407,17 +95408,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1"
-    // InternalTableDSL.g:30840:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 : ( ruleJvmUpperBoundAnded ) ;
+    // InternalTableDSL.g:29375:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 : ( ruleJvmUpperBoundAnded ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30844:1: ( ( ruleJvmUpperBoundAnded ) )
-            // InternalTableDSL.g:30845:2: ( ruleJvmUpperBoundAnded )
+            // InternalTableDSL.g:29379:1: ( ( ruleJvmUpperBoundAnded ) )
+            // InternalTableDSL.g:29380:2: ( ruleJvmUpperBoundAnded )
             {
-            // InternalTableDSL.g:30845:2: ( ruleJvmUpperBoundAnded )
-            // InternalTableDSL.g:30846:3: ruleJvmUpperBoundAnded
+            // InternalTableDSL.g:29380:2: ( ruleJvmUpperBoundAnded )
+            // InternalTableDSL.g:29381:3: ruleJvmUpperBoundAnded
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundAndedParserRuleCall_2_0_1_0()); 
@@ -100452,17 +95453,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0"
-    // InternalTableDSL.g:30855:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 : ( ruleJvmLowerBound ) ;
+    // InternalTableDSL.g:29390:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 : ( ruleJvmLowerBound ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30859:1: ( ( ruleJvmLowerBound ) )
-            // InternalTableDSL.g:30860:2: ( ruleJvmLowerBound )
+            // InternalTableDSL.g:29394:1: ( ( ruleJvmLowerBound ) )
+            // InternalTableDSL.g:29395:2: ( ruleJvmLowerBound )
             {
-            // InternalTableDSL.g:30860:2: ( ruleJvmLowerBound )
-            // InternalTableDSL.g:30861:3: ruleJvmLowerBound
+            // InternalTableDSL.g:29395:2: ( ruleJvmLowerBound )
+            // InternalTableDSL.g:29396:3: ruleJvmLowerBound
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundParserRuleCall_2_1_0_0()); 
@@ -100497,17 +95498,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1"
-    // InternalTableDSL.g:30870:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 : ( ruleJvmLowerBoundAnded ) ;
+    // InternalTableDSL.g:29405:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 : ( ruleJvmLowerBoundAnded ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30874:1: ( ( ruleJvmLowerBoundAnded ) )
-            // InternalTableDSL.g:30875:2: ( ruleJvmLowerBoundAnded )
+            // InternalTableDSL.g:29409:1: ( ( ruleJvmLowerBoundAnded ) )
+            // InternalTableDSL.g:29410:2: ( ruleJvmLowerBoundAnded )
             {
-            // InternalTableDSL.g:30875:2: ( ruleJvmLowerBoundAnded )
-            // InternalTableDSL.g:30876:3: ruleJvmLowerBoundAnded
+            // InternalTableDSL.g:29410:2: ( ruleJvmLowerBoundAnded )
+            // InternalTableDSL.g:29411:3: ruleJvmLowerBoundAnded
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundAndedParserRuleCall_2_1_1_0()); 
@@ -100542,17 +95543,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmUpperBound__TypeReferenceAssignment_1"
-    // InternalTableDSL.g:30885:1: rule__JvmUpperBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalTableDSL.g:29420:1: rule__JvmUpperBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmUpperBound__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30889:1: ( ( ruleJvmTypeReference ) )
-            // InternalTableDSL.g:30890:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:29424:1: ( ( ruleJvmTypeReference ) )
+            // InternalTableDSL.g:29425:2: ( ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:30890:2: ( ruleJvmTypeReference )
-            // InternalTableDSL.g:30891:3: ruleJvmTypeReference
+            // InternalTableDSL.g:29425:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:29426:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
@@ -100587,17 +95588,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__TypeReferenceAssignment_1"
-    // InternalTableDSL.g:30900:1: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalTableDSL.g:29435:1: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmUpperBoundAnded__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30904:1: ( ( ruleJvmTypeReference ) )
-            // InternalTableDSL.g:30905:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:29439:1: ( ( ruleJvmTypeReference ) )
+            // InternalTableDSL.g:29440:2: ( ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:30905:2: ( ruleJvmTypeReference )
-            // InternalTableDSL.g:30906:3: ruleJvmTypeReference
+            // InternalTableDSL.g:29440:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:29441:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
@@ -100632,17 +95633,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmLowerBound__TypeReferenceAssignment_1"
-    // InternalTableDSL.g:30915:1: rule__JvmLowerBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalTableDSL.g:29450:1: rule__JvmLowerBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmLowerBound__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30919:1: ( ( ruleJvmTypeReference ) )
-            // InternalTableDSL.g:30920:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:29454:1: ( ( ruleJvmTypeReference ) )
+            // InternalTableDSL.g:29455:2: ( ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:30920:2: ( ruleJvmTypeReference )
-            // InternalTableDSL.g:30921:3: ruleJvmTypeReference
+            // InternalTableDSL.g:29455:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:29456:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
@@ -100677,17 +95678,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__TypeReferenceAssignment_1"
-    // InternalTableDSL.g:30930:1: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalTableDSL.g:29465:1: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmLowerBoundAnded__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30934:1: ( ( ruleJvmTypeReference ) )
-            // InternalTableDSL.g:30935:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:29469:1: ( ( ruleJvmTypeReference ) )
+            // InternalTableDSL.g:29470:2: ( ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:30935:2: ( ruleJvmTypeReference )
-            // InternalTableDSL.g:30936:3: ruleJvmTypeReference
+            // InternalTableDSL.g:29470:2: ( ruleJvmTypeReference )
+            // InternalTableDSL.g:29471:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
@@ -100722,17 +95723,17 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
 
     // $ANTLR start "rule__XImportSection__ImportDeclarationsAssignment"
-    // InternalTableDSL.g:30945:1: rule__XImportSection__ImportDeclarationsAssignment : ( ruleXImportDeclaration ) ;
+    // InternalTableDSL.g:29480:1: rule__XImportSection__ImportDeclarationsAssignment : ( ruleXImportDeclaration ) ;
     public final void rule__XImportSection__ImportDeclarationsAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalTableDSL.g:30949:1: ( ( ruleXImportDeclaration ) )
-            // InternalTableDSL.g:30950:2: ( ruleXImportDeclaration )
+            // InternalTableDSL.g:29484:1: ( ( ruleXImportDeclaration ) )
+            // InternalTableDSL.g:29485:2: ( ruleXImportDeclaration )
             {
-            // InternalTableDSL.g:30950:2: ( ruleXImportDeclaration )
-            // InternalTableDSL.g:30951:3: ruleXImportDeclaration
+            // InternalTableDSL.g:29485:2: ( ruleXImportDeclaration )
+            // InternalTableDSL.g:29486:3: ruleXImportDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportSectionAccess().getImportDeclarationsXImportDeclarationParserRuleCall_0()); 
@@ -101109,10 +96110,10 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     }
     // $ANTLR end synpred112_InternalTableDSL
 
-    // $ANTLR start synpred179_InternalTableDSL
-    public final void synpred179_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:13884:3: ( rule__XAssignment__Group_1_1__0 )
-        // InternalTableDSL.g:13884:3: rule__XAssignment__Group_1_1__0
+    // $ANTLR start synpred177_InternalTableDSL
+    public final void synpred177_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:13263:3: ( rule__XAssignment__Group_1_1__0 )
+        // InternalTableDSL.g:13263:3: rule__XAssignment__Group_1_1__0
         {
         pushFollow(FOLLOW_2);
         rule__XAssignment__Group_1_1__0();
@@ -101122,12 +96123,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred179_InternalTableDSL
+    // $ANTLR end synpred177_InternalTableDSL
 
-    // $ANTLR start synpred181_InternalTableDSL
-    public final void synpred181_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:14235:3: ( rule__XOrExpression__Group_1__0 )
-        // InternalTableDSL.g:14235:3: rule__XOrExpression__Group_1__0
+    // $ANTLR start synpred179_InternalTableDSL
+    public final void synpred179_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:13614:3: ( rule__XOrExpression__Group_1__0 )
+        // InternalTableDSL.g:13614:3: rule__XOrExpression__Group_1__0
         {
         pushFollow(FOLLOW_2);
         rule__XOrExpression__Group_1__0();
@@ -101137,12 +96138,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred181_InternalTableDSL
+    // $ANTLR end synpred179_InternalTableDSL
 
-    // $ANTLR start synpred182_InternalTableDSL
-    public final void synpred182_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:14424:3: ( rule__XAndExpression__Group_1__0 )
-        // InternalTableDSL.g:14424:3: rule__XAndExpression__Group_1__0
+    // $ANTLR start synpred180_InternalTableDSL
+    public final void synpred180_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:13803:3: ( rule__XAndExpression__Group_1__0 )
+        // InternalTableDSL.g:13803:3: rule__XAndExpression__Group_1__0
         {
         pushFollow(FOLLOW_2);
         rule__XAndExpression__Group_1__0();
@@ -101152,12 +96153,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred182_InternalTableDSL
+    // $ANTLR end synpred180_InternalTableDSL
 
-    // $ANTLR start synpred183_InternalTableDSL
-    public final void synpred183_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:14613:3: ( rule__XEqualityExpression__Group_1__0 )
-        // InternalTableDSL.g:14613:3: rule__XEqualityExpression__Group_1__0
+    // $ANTLR start synpred181_InternalTableDSL
+    public final void synpred181_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:13992:3: ( rule__XEqualityExpression__Group_1__0 )
+        // InternalTableDSL.g:13992:3: rule__XEqualityExpression__Group_1__0
         {
         pushFollow(FOLLOW_2);
         rule__XEqualityExpression__Group_1__0();
@@ -101167,12 +96168,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred183_InternalTableDSL
+    // $ANTLR end synpred181_InternalTableDSL
 
-    // $ANTLR start synpred184_InternalTableDSL
-    public final void synpred184_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:14802:3: ( rule__XRelationalExpression__Alternatives_1 )
-        // InternalTableDSL.g:14802:3: rule__XRelationalExpression__Alternatives_1
+    // $ANTLR start synpred182_InternalTableDSL
+    public final void synpred182_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:14181:3: ( rule__XRelationalExpression__Alternatives_1 )
+        // InternalTableDSL.g:14181:3: rule__XRelationalExpression__Alternatives_1
         {
         pushFollow(FOLLOW_2);
         rule__XRelationalExpression__Alternatives_1();
@@ -101182,12 +96183,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred184_InternalTableDSL
+    // $ANTLR end synpred182_InternalTableDSL
 
-    // $ANTLR start synpred185_InternalTableDSL
-    public final void synpred185_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:15180:3: ( rule__XOtherOperatorExpression__Group_1__0 )
-        // InternalTableDSL.g:15180:3: rule__XOtherOperatorExpression__Group_1__0
+    // $ANTLR start synpred183_InternalTableDSL
+    public final void synpred183_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:14559:3: ( rule__XOtherOperatorExpression__Group_1__0 )
+        // InternalTableDSL.g:14559:3: rule__XOtherOperatorExpression__Group_1__0
         {
         pushFollow(FOLLOW_2);
         rule__XOtherOperatorExpression__Group_1__0();
@@ -101197,12 +96198,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred185_InternalTableDSL
+    // $ANTLR end synpred183_InternalTableDSL
 
-    // $ANTLR start synpred186_InternalTableDSL
-    public final void synpred186_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:15693:3: ( rule__XAdditiveExpression__Group_1__0 )
-        // InternalTableDSL.g:15693:3: rule__XAdditiveExpression__Group_1__0
+    // $ANTLR start synpred184_InternalTableDSL
+    public final void synpred184_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:15072:3: ( rule__XAdditiveExpression__Group_1__0 )
+        // InternalTableDSL.g:15072:3: rule__XAdditiveExpression__Group_1__0
         {
         pushFollow(FOLLOW_2);
         rule__XAdditiveExpression__Group_1__0();
@@ -101212,12 +96213,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred186_InternalTableDSL
+    // $ANTLR end synpred184_InternalTableDSL
 
-    // $ANTLR start synpred187_InternalTableDSL
-    public final void synpred187_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:15882:3: ( rule__XMultiplicativeExpression__Group_1__0 )
-        // InternalTableDSL.g:15882:3: rule__XMultiplicativeExpression__Group_1__0
+    // $ANTLR start synpred185_InternalTableDSL
+    public final void synpred185_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:15261:3: ( rule__XMultiplicativeExpression__Group_1__0 )
+        // InternalTableDSL.g:15261:3: rule__XMultiplicativeExpression__Group_1__0
         {
         pushFollow(FOLLOW_2);
         rule__XMultiplicativeExpression__Group_1__0();
@@ -101227,12 +96228,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred187_InternalTableDSL
+    // $ANTLR end synpred185_InternalTableDSL
 
-    // $ANTLR start synpred188_InternalTableDSL
-    public final void synpred188_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:16152:3: ( rule__XCastedExpression__Group_1__0 )
-        // InternalTableDSL.g:16152:3: rule__XCastedExpression__Group_1__0
+    // $ANTLR start synpred186_InternalTableDSL
+    public final void synpred186_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:15531:3: ( rule__XCastedExpression__Group_1__0 )
+        // InternalTableDSL.g:15531:3: rule__XCastedExpression__Group_1__0
         {
         pushFollow(FOLLOW_2);
         rule__XCastedExpression__Group_1__0();
@@ -101242,12 +96243,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred188_InternalTableDSL
+    // $ANTLR end synpred186_InternalTableDSL
 
-    // $ANTLR start synpred189_InternalTableDSL
-    public final void synpred189_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:16341:3: ( rule__XPostfixOperation__Group_1__0 )
-        // InternalTableDSL.g:16341:3: rule__XPostfixOperation__Group_1__0
+    // $ANTLR start synpred187_InternalTableDSL
+    public final void synpred187_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:15720:3: ( rule__XPostfixOperation__Group_1__0 )
+        // InternalTableDSL.g:15720:3: rule__XPostfixOperation__Group_1__0
         {
         pushFollow(FOLLOW_2);
         rule__XPostfixOperation__Group_1__0();
@@ -101257,12 +96258,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred189_InternalTableDSL
+    // $ANTLR end synpred187_InternalTableDSL
 
-    // $ANTLR start synpred190_InternalTableDSL
-    public final void synpred190_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:16476:3: ( rule__XMemberFeatureCall__Alternatives_1 )
-        // InternalTableDSL.g:16476:3: rule__XMemberFeatureCall__Alternatives_1
+    // $ANTLR start synpred188_InternalTableDSL
+    public final void synpred188_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:15855:3: ( rule__XMemberFeatureCall__Alternatives_1 )
+        // InternalTableDSL.g:15855:3: rule__XMemberFeatureCall__Alternatives_1
         {
         pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__Alternatives_1();
@@ -101272,12 +96273,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred190_InternalTableDSL
+    // $ANTLR end synpred188_InternalTableDSL
 
-    // $ANTLR start synpred192_InternalTableDSL
-    public final void synpred192_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:16774:3: ( rule__XMemberFeatureCall__Group_1_1_3__0 )
-        // InternalTableDSL.g:16774:3: rule__XMemberFeatureCall__Group_1_1_3__0
+    // $ANTLR start synpred190_InternalTableDSL
+    public final void synpred190_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:16153:3: ( rule__XMemberFeatureCall__Group_1_1_3__0 )
+        // InternalTableDSL.g:16153:3: rule__XMemberFeatureCall__Group_1_1_3__0
         {
         pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__Group_1_1_3__0();
@@ -101287,12 +96288,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred192_InternalTableDSL
+    // $ANTLR end synpred190_InternalTableDSL
 
-    // $ANTLR start synpred193_InternalTableDSL
-    public final void synpred193_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:16800:3: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )
-        // InternalTableDSL.g:16800:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
+    // $ANTLR start synpred191_InternalTableDSL
+    public final void synpred191_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:16179:3: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )
+        // InternalTableDSL.g:16179:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
         {
         pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4();
@@ -101302,12 +96303,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred193_InternalTableDSL
+    // $ANTLR end synpred191_InternalTableDSL
 
-    // $ANTLR start synpred201_InternalTableDSL
-    public final void synpred201_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:17773:3: ( rule__XClosure__Group_1__0 )
-        // InternalTableDSL.g:17773:3: rule__XClosure__Group_1__0
+    // $ANTLR start synpred199_InternalTableDSL
+    public final void synpred199_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:17152:3: ( rule__XClosure__Group_1__0 )
+        // InternalTableDSL.g:17152:3: rule__XClosure__Group_1__0
         {
         pushFollow(FOLLOW_2);
         rule__XClosure__Group_1__0();
@@ -101317,12 +96318,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred201_InternalTableDSL
+    // $ANTLR end synpred199_InternalTableDSL
 
-    // $ANTLR start synpred208_InternalTableDSL
-    public final void synpred208_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:18744:3: ( rule__XIfExpression__Group_6__0 )
-        // InternalTableDSL.g:18744:3: rule__XIfExpression__Group_6__0
+    // $ANTLR start synpred206_InternalTableDSL
+    public final void synpred206_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:18123:3: ( rule__XIfExpression__Group_6__0 )
+        // InternalTableDSL.g:18123:3: rule__XIfExpression__Group_6__0
         {
         pushFollow(FOLLOW_2);
         rule__XIfExpression__Group_6__0();
@@ -101332,12 +96333,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred208_InternalTableDSL
+    // $ANTLR end synpred206_InternalTableDSL
 
-    // $ANTLR start synpred211_InternalTableDSL
-    public final void synpred211_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:19204:3: ( rule__XSwitchExpression__Group_2_1_0__0 )
-        // InternalTableDSL.g:19204:3: rule__XSwitchExpression__Group_2_1_0__0
+    // $ANTLR start synpred209_InternalTableDSL
+    public final void synpred209_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:18583:3: ( rule__XSwitchExpression__Group_2_1_0__0 )
+        // InternalTableDSL.g:18583:3: rule__XSwitchExpression__Group_2_1_0__0
         {
         pushFollow(FOLLOW_2);
         rule__XSwitchExpression__Group_2_1_0__0();
@@ -101347,12 +96348,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred211_InternalTableDSL
+    // $ANTLR end synpred209_InternalTableDSL
 
-    // $ANTLR start synpred224_InternalTableDSL
-    public final void synpred224_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:21337:3: ( rule__XFeatureCall__Group_3__0 )
-        // InternalTableDSL.g:21337:3: rule__XFeatureCall__Group_3__0
+    // $ANTLR start synpred222_InternalTableDSL
+    public final void synpred222_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:20716:3: ( rule__XFeatureCall__Group_3__0 )
+        // InternalTableDSL.g:20716:3: rule__XFeatureCall__Group_3__0
         {
         pushFollow(FOLLOW_2);
         rule__XFeatureCall__Group_3__0();
@@ -101362,12 +96363,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred224_InternalTableDSL
+    // $ANTLR end synpred222_InternalTableDSL
 
-    // $ANTLR start synpred225_InternalTableDSL
-    public final void synpred225_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:21363:3: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )
-        // InternalTableDSL.g:21363:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
+    // $ANTLR start synpred223_InternalTableDSL
+    public final void synpred223_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:20742:3: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )
+        // InternalTableDSL.g:20742:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
         {
         pushFollow(FOLLOW_2);
         rule__XFeatureCall__FeatureCallArgumentsAssignment_4();
@@ -101377,12 +96378,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred225_InternalTableDSL
+    // $ANTLR end synpred223_InternalTableDSL
 
-    // $ANTLR start synpred229_InternalTableDSL
-    public final void synpred229_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:21823:3: ( rule__XConstructorCall__Group_3__0 )
-        // InternalTableDSL.g:21823:3: rule__XConstructorCall__Group_3__0
+    // $ANTLR start synpred227_InternalTableDSL
+    public final void synpred227_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:21202:3: ( rule__XConstructorCall__Group_3__0 )
+        // InternalTableDSL.g:21202:3: rule__XConstructorCall__Group_3__0
         {
         pushFollow(FOLLOW_2);
         rule__XConstructorCall__Group_3__0();
@@ -101392,12 +96393,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred229_InternalTableDSL
+    // $ANTLR end synpred227_InternalTableDSL
 
-    // $ANTLR start synpred230_InternalTableDSL
-    public final void synpred230_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:21850:3: ( rule__XConstructorCall__Group_4__0 )
-        // InternalTableDSL.g:21850:3: rule__XConstructorCall__Group_4__0
+    // $ANTLR start synpred228_InternalTableDSL
+    public final void synpred228_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:21229:3: ( rule__XConstructorCall__Group_4__0 )
+        // InternalTableDSL.g:21229:3: rule__XConstructorCall__Group_4__0
         {
         pushFollow(FOLLOW_2);
         rule__XConstructorCall__Group_4__0();
@@ -101407,12 +96408,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred230_InternalTableDSL
+    // $ANTLR end synpred228_InternalTableDSL
 
-    // $ANTLR start synpred231_InternalTableDSL
-    public final void synpred231_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:21876:3: ( rule__XConstructorCall__ArgumentsAssignment_5 )
-        // InternalTableDSL.g:21876:3: rule__XConstructorCall__ArgumentsAssignment_5
+    // $ANTLR start synpred229_InternalTableDSL
+    public final void synpred229_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:21255:3: ( rule__XConstructorCall__ArgumentsAssignment_5 )
+        // InternalTableDSL.g:21255:3: rule__XConstructorCall__ArgumentsAssignment_5
         {
         pushFollow(FOLLOW_2);
         rule__XConstructorCall__ArgumentsAssignment_5();
@@ -101422,12 +96423,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred231_InternalTableDSL
+    // $ANTLR end synpred229_InternalTableDSL
 
-    // $ANTLR start synpred236_InternalTableDSL
-    public final void synpred236_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:22767:3: ( rule__XReturnExpression__ExpressionAssignment_2 )
-        // InternalTableDSL.g:22767:3: rule__XReturnExpression__ExpressionAssignment_2
+    // $ANTLR start synpred234_InternalTableDSL
+    public final void synpred234_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:22146:3: ( rule__XReturnExpression__ExpressionAssignment_2 )
+        // InternalTableDSL.g:22146:3: rule__XReturnExpression__ExpressionAssignment_2
         {
         pushFollow(FOLLOW_2);
         rule__XReturnExpression__ExpressionAssignment_2();
@@ -101437,12 +96438,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred236_InternalTableDSL
+    // $ANTLR end synpred234_InternalTableDSL
 
-    // $ANTLR start synpred237_InternalTableDSL
-    public final void synpred237_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:22909:4: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
-        // InternalTableDSL.g:22909:4: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+    // $ANTLR start synpred235_InternalTableDSL
+    public final void synpred235_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:22288:4: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+        // InternalTableDSL.g:22288:4: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
         {
         pushFollow(FOLLOW_2);
         rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
@@ -101452,12 +96453,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred237_InternalTableDSL
+    // $ANTLR end synpred235_InternalTableDSL
 
-    // $ANTLR start synpred238_InternalTableDSL
-    public final void synpred238_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:22936:3: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )
-        // InternalTableDSL.g:22936:3: rule__XTryCatchFinallyExpression__Group_3_0_1__0
+    // $ANTLR start synpred236_InternalTableDSL
+    public final void synpred236_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:22315:3: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )
+        // InternalTableDSL.g:22315:3: rule__XTryCatchFinallyExpression__Group_3_0_1__0
         {
         pushFollow(FOLLOW_2);
         rule__XTryCatchFinallyExpression__Group_3_0_1__0();
@@ -101467,12 +96468,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred238_InternalTableDSL
+    // $ANTLR end synpred236_InternalTableDSL
 
-    // $ANTLR start synpred239_InternalTableDSL
-    public final void synpred239_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:23449:3: ( rule__QualifiedName__Group_1__0 )
-        // InternalTableDSL.g:23449:3: rule__QualifiedName__Group_1__0
+    // $ANTLR start synpred237_InternalTableDSL
+    public final void synpred237_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:22828:3: ( rule__QualifiedName__Group_1__0 )
+        // InternalTableDSL.g:22828:3: rule__QualifiedName__Group_1__0
         {
         pushFollow(FOLLOW_2);
         rule__QualifiedName__Group_1__0();
@@ -101482,12 +96483,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred239_InternalTableDSL
+    // $ANTLR end synpred237_InternalTableDSL
 
-    // $ANTLR start synpred241_InternalTableDSL
-    public final void synpred241_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:23665:3: ( rule__JvmTypeReference__Group_0_1__0 )
-        // InternalTableDSL.g:23665:3: rule__JvmTypeReference__Group_0_1__0
+    // $ANTLR start synpred239_InternalTableDSL
+    public final void synpred239_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:23044:3: ( rule__JvmTypeReference__Group_0_1__0 )
+        // InternalTableDSL.g:23044:3: rule__JvmTypeReference__Group_0_1__0
         {
         pushFollow(FOLLOW_2);
         rule__JvmTypeReference__Group_0_1__0();
@@ -101497,12 +96498,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred241_InternalTableDSL
+    // $ANTLR end synpred239_InternalTableDSL
 
-    // $ANTLR start synpred245_InternalTableDSL
-    public final void synpred245_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:24124:3: ( rule__JvmParameterizedTypeReference__Group_1__0 )
-        // InternalTableDSL.g:24124:3: rule__JvmParameterizedTypeReference__Group_1__0
+    // $ANTLR start synpred243_InternalTableDSL
+    public final void synpred243_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:23503:3: ( rule__JvmParameterizedTypeReference__Group_1__0 )
+        // InternalTableDSL.g:23503:3: rule__JvmParameterizedTypeReference__Group_1__0
         {
         pushFollow(FOLLOW_2);
         rule__JvmParameterizedTypeReference__Group_1__0();
@@ -101512,12 +96513,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred245_InternalTableDSL
+    // $ANTLR end synpred243_InternalTableDSL
 
-    // $ANTLR start synpred247_InternalTableDSL
-    public final void synpred247_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:24259:3: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )
-        // InternalTableDSL.g:24259:3: rule__JvmParameterizedTypeReference__Group_1_4__0
+    // $ANTLR start synpred245_InternalTableDSL
+    public final void synpred245_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:23638:3: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )
+        // InternalTableDSL.g:23638:3: rule__JvmParameterizedTypeReference__Group_1_4__0
         {
         pushFollow(FOLLOW_2);
         rule__JvmParameterizedTypeReference__Group_1_4__0();
@@ -101527,12 +96528,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred247_InternalTableDSL
+    // $ANTLR end synpred245_InternalTableDSL
 
-    // $ANTLR start synpred248_InternalTableDSL
-    public final void synpred248_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:24394:3: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )
-        // InternalTableDSL.g:24394:3: rule__JvmParameterizedTypeReference__Group_1_4_2__0
+    // $ANTLR start synpred246_InternalTableDSL
+    public final void synpred246_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:23773:3: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )
+        // InternalTableDSL.g:23773:3: rule__JvmParameterizedTypeReference__Group_1_4_2__0
         {
         pushFollow(FOLLOW_2);
         rule__JvmParameterizedTypeReference__Group_1_4_2__0();
@@ -101542,12 +96543,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred248_InternalTableDSL
+    // $ANTLR end synpred246_InternalTableDSL
 
-    // $ANTLR start synpred253_InternalTableDSL
-    public final void synpred253_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25192:2: ( rule__TableSelection__UnorderedGroup_3__0 )
-        // InternalTableDSL.g:25192:2: rule__TableSelection__UnorderedGroup_3__0
+    // $ANTLR start synpred251_InternalTableDSL
+    public final void synpred251_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24571:2: ( rule__TableSelection__UnorderedGroup_3__0 )
+        // InternalTableDSL.g:24571:2: rule__TableSelection__UnorderedGroup_3__0
         {
         pushFollow(FOLLOW_2);
         rule__TableSelection__UnorderedGroup_3__0();
@@ -101557,32 +96558,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred253_InternalTableDSL
+    // $ANTLR end synpred251_InternalTableDSL
 
-    // $ANTLR start synpred254_InternalTableDSL
-    public final void synpred254_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25207:3: ( ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) ) )
-        // InternalTableDSL.g:25207:3: ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) )
+    // $ANTLR start synpred252_InternalTableDSL
+    public final void synpred252_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24586:3: ( ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) ) )
+        // InternalTableDSL.g:24586:3: ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) )
         {
-        // InternalTableDSL.g:25207:3: ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) )
-        // InternalTableDSL.g:25208:4: {...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) )
+        // InternalTableDSL.g:24586:3: ({...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) ) )
+        // InternalTableDSL.g:24587:4: {...}? => ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred254_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0)");
+            throw new FailedPredicateException(input, "synpred252_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0)");
         }
-        // InternalTableDSL.g:25208:110: ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) )
-        // InternalTableDSL.g:25209:5: ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) )
+        // InternalTableDSL.g:24587:110: ( ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) ) )
+        // InternalTableDSL.g:24588:5: ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0);
-        // InternalTableDSL.g:25215:5: ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) )
-        // InternalTableDSL.g:25216:6: ( rule__TableSelection__SelectalwaysAssignment_3_0 )
+        // InternalTableDSL.g:24594:5: ( ( rule__TableSelection__SelectalwaysAssignment_3_0 ) )
+        // InternalTableDSL.g:24595:6: ( rule__TableSelection__SelectalwaysAssignment_3_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getTableSelectionAccess().getSelectalwaysAssignment_3_0()); 
         }
-        // InternalTableDSL.g:25217:6: ( rule__TableSelection__SelectalwaysAssignment_3_0 )
-        // InternalTableDSL.g:25217:7: rule__TableSelection__SelectalwaysAssignment_3_0
+        // InternalTableDSL.g:24596:6: ( rule__TableSelection__SelectalwaysAssignment_3_0 )
+        // InternalTableDSL.g:24596:7: rule__TableSelection__SelectalwaysAssignment_3_0
         {
         pushFollow(FOLLOW_2);
         rule__TableSelection__SelectalwaysAssignment_3_0();
@@ -101604,32 +96605,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred254_InternalTableDSL
+    // $ANTLR end synpred252_InternalTableDSL
 
-    // $ANTLR start synpred255_InternalTableDSL
-    public final void synpred255_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25222:3: ( ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) ) )
-        // InternalTableDSL.g:25222:3: ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) )
+    // $ANTLR start synpred253_InternalTableDSL
+    public final void synpred253_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24601:3: ( ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) ) )
+        // InternalTableDSL.g:24601:3: ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) )
         {
-        // InternalTableDSL.g:25222:3: ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) )
-        // InternalTableDSL.g:25223:4: {...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) )
+        // InternalTableDSL.g:24601:3: ({...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) ) )
+        // InternalTableDSL.g:24602:4: {...}? => ( ( ( rule__TableSelection__Group_3_1__0 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred255_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1)");
+            throw new FailedPredicateException(input, "synpred253_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1)");
         }
-        // InternalTableDSL.g:25223:110: ( ( ( rule__TableSelection__Group_3_1__0 ) ) )
-        // InternalTableDSL.g:25224:5: ( ( rule__TableSelection__Group_3_1__0 ) )
+        // InternalTableDSL.g:24602:110: ( ( ( rule__TableSelection__Group_3_1__0 ) ) )
+        // InternalTableDSL.g:24603:5: ( ( rule__TableSelection__Group_3_1__0 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1);
-        // InternalTableDSL.g:25230:5: ( ( rule__TableSelection__Group_3_1__0 ) )
-        // InternalTableDSL.g:25231:6: ( rule__TableSelection__Group_3_1__0 )
+        // InternalTableDSL.g:24609:5: ( ( rule__TableSelection__Group_3_1__0 ) )
+        // InternalTableDSL.g:24610:6: ( rule__TableSelection__Group_3_1__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getTableSelectionAccess().getGroup_3_1()); 
         }
-        // InternalTableDSL.g:25232:6: ( rule__TableSelection__Group_3_1__0 )
-        // InternalTableDSL.g:25232:7: rule__TableSelection__Group_3_1__0
+        // InternalTableDSL.g:24611:6: ( rule__TableSelection__Group_3_1__0 )
+        // InternalTableDSL.g:24611:7: rule__TableSelection__Group_3_1__0
         {
         pushFollow(FOLLOW_2);
         rule__TableSelection__Group_3_1__0();
@@ -101651,35 +96652,35 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred255_InternalTableDSL
+    // $ANTLR end synpred253_InternalTableDSL
 
-    // $ANTLR start synpred256_InternalTableDSL
-    public final void synpred256_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25237:3: ( ({...}? => ( ( ( rule__TableSelection__Group_3_2__0 ) ) ) ) )
-        // InternalTableDSL.g:25237:3: ({...}? => ( ( ( rule__TableSelection__Group_3_2__0 ) ) ) )
+    // $ANTLR start synpred254_InternalTableDSL
+    public final void synpred254_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24616:3: ( ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_2 ) ) ) ) )
+        // InternalTableDSL.g:24616:3: ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_2 ) ) ) )
         {
-        // InternalTableDSL.g:25237:3: ({...}? => ( ( ( rule__TableSelection__Group_3_2__0 ) ) ) )
-        // InternalTableDSL.g:25238:4: {...}? => ( ( ( rule__TableSelection__Group_3_2__0 ) ) )
+        // InternalTableDSL.g:24616:3: ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_2 ) ) ) )
+        // InternalTableDSL.g:24617:4: {...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_2 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred256_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2)");
+            throw new FailedPredicateException(input, "synpred254_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2)");
         }
-        // InternalTableDSL.g:25238:110: ( ( ( rule__TableSelection__Group_3_2__0 ) ) )
-        // InternalTableDSL.g:25239:5: ( ( rule__TableSelection__Group_3_2__0 ) )
+        // InternalTableDSL.g:24617:110: ( ( ( rule__TableSelection__FilteringAssignment_3_2 ) ) )
+        // InternalTableDSL.g:24618:5: ( ( rule__TableSelection__FilteringAssignment_3_2 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2);
-        // InternalTableDSL.g:25245:5: ( ( rule__TableSelection__Group_3_2__0 ) )
-        // InternalTableDSL.g:25246:6: ( rule__TableSelection__Group_3_2__0 )
+        // InternalTableDSL.g:24624:5: ( ( rule__TableSelection__FilteringAssignment_3_2 ) )
+        // InternalTableDSL.g:24625:6: ( rule__TableSelection__FilteringAssignment_3_2 )
         {
         if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableSelectionAccess().getGroup_3_2()); 
+           before(grammarAccess.getTableSelectionAccess().getFilteringAssignment_3_2()); 
         }
-        // InternalTableDSL.g:25247:6: ( rule__TableSelection__Group_3_2__0 )
-        // InternalTableDSL.g:25247:7: rule__TableSelection__Group_3_2__0
+        // InternalTableDSL.g:24626:6: ( rule__TableSelection__FilteringAssignment_3_2 )
+        // InternalTableDSL.g:24626:7: rule__TableSelection__FilteringAssignment_3_2
         {
         pushFollow(FOLLOW_2);
-        rule__TableSelection__Group_3_2__0();
+        rule__TableSelection__FilteringAssignment_3_2();
 
         state._fsp--;
         if (state.failed) return ;
@@ -101698,82 +96699,35 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred256_InternalTableDSL
+    // $ANTLR end synpred254_InternalTableDSL
 
-    // $ANTLR start synpred257_InternalTableDSL
-    public final void synpred257_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25252:3: ( ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_3 ) ) ) ) )
-        // InternalTableDSL.g:25252:3: ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_3 ) ) ) )
+    // $ANTLR start synpred255_InternalTableDSL
+    public final void synpred255_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24631:3: ( ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) ) ) ) )
+        // InternalTableDSL.g:24631:3: ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) ) ) )
         {
-        // InternalTableDSL.g:25252:3: ({...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_3 ) ) ) )
-        // InternalTableDSL.g:25253:4: {...}? => ( ( ( rule__TableSelection__FilteringAssignment_3_3 ) ) )
+        // InternalTableDSL.g:24631:3: ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) ) ) )
+        // InternalTableDSL.g:24632:4: {...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred257_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3)");
+            throw new FailedPredicateException(input, "synpred255_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3)");
         }
-        // InternalTableDSL.g:25253:110: ( ( ( rule__TableSelection__FilteringAssignment_3_3 ) ) )
-        // InternalTableDSL.g:25254:5: ( ( rule__TableSelection__FilteringAssignment_3_3 ) )
+        // InternalTableDSL.g:24632:110: ( ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) ) )
+        // InternalTableDSL.g:24633:5: ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3);
-        // InternalTableDSL.g:25260:5: ( ( rule__TableSelection__FilteringAssignment_3_3 ) )
-        // InternalTableDSL.g:25261:6: ( rule__TableSelection__FilteringAssignment_3_3 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableSelectionAccess().getFilteringAssignment_3_3()); 
-        }
-        // InternalTableDSL.g:25262:6: ( rule__TableSelection__FilteringAssignment_3_3 )
-        // InternalTableDSL.g:25262:7: rule__TableSelection__FilteringAssignment_3_3
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableSelection__FilteringAssignment_3_3();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred257_InternalTableDSL
-
-    // $ANTLR start synpred258_InternalTableDSL
-    public final void synpred258_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25267:3: ( ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) ) ) ) )
-        // InternalTableDSL.g:25267:3: ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) ) ) )
-        {
-        // InternalTableDSL.g:25267:3: ({...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) ) ) )
-        // InternalTableDSL.g:25268:4: {...}? => ( ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred258_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4)");
-        }
-        // InternalTableDSL.g:25268:110: ( ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) ) )
-        // InternalTableDSL.g:25269:5: ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4);
-        // InternalTableDSL.g:25275:5: ( ( rule__TableSelection__EmbeddedAssignment_3_4 ) )
-        // InternalTableDSL.g:25276:6: ( rule__TableSelection__EmbeddedAssignment_3_4 )
+        // InternalTableDSL.g:24639:5: ( ( rule__TableSelection__EmbeddedAssignment_3_3 ) )
+        // InternalTableDSL.g:24640:6: ( rule__TableSelection__EmbeddedAssignment_3_3 )
         {
         if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableSelectionAccess().getEmbeddedAssignment_3_4()); 
+           before(grammarAccess.getTableSelectionAccess().getEmbeddedAssignment_3_3()); 
         }
-        // InternalTableDSL.g:25277:6: ( rule__TableSelection__EmbeddedAssignment_3_4 )
-        // InternalTableDSL.g:25277:7: rule__TableSelection__EmbeddedAssignment_3_4
+        // InternalTableDSL.g:24641:6: ( rule__TableSelection__EmbeddedAssignment_3_3 )
+        // InternalTableDSL.g:24641:7: rule__TableSelection__EmbeddedAssignment_3_3
         {
         pushFollow(FOLLOW_2);
-        rule__TableSelection__EmbeddedAssignment_3_4();
+        rule__TableSelection__EmbeddedAssignment_3_3();
 
         state._fsp--;
         if (state.failed) return ;
@@ -101792,12 +96746,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred258_InternalTableDSL
+    // $ANTLR end synpred255_InternalTableDSL
 
-    // $ANTLR start synpred259_InternalTableDSL
-    public final void synpred259_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25311:2: ( rule__TableSelection__UnorderedGroup_3__1 )
-        // InternalTableDSL.g:25311:2: rule__TableSelection__UnorderedGroup_3__1
+    // $ANTLR start synpred256_InternalTableDSL
+    public final void synpred256_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24675:2: ( rule__TableSelection__UnorderedGroup_3__1 )
+        // InternalTableDSL.g:24675:2: rule__TableSelection__UnorderedGroup_3__1
         {
         pushFollow(FOLLOW_2);
         rule__TableSelection__UnorderedGroup_3__1();
@@ -101807,12 +96761,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred259_InternalTableDSL
+    // $ANTLR end synpred256_InternalTableDSL
 
-    // $ANTLR start synpred260_InternalTableDSL
-    public final void synpred260_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25323:2: ( rule__TableSelection__UnorderedGroup_3__2 )
-        // InternalTableDSL.g:25323:2: rule__TableSelection__UnorderedGroup_3__2
+    // $ANTLR start synpred257_InternalTableDSL
+    public final void synpred257_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24687:2: ( rule__TableSelection__UnorderedGroup_3__2 )
+        // InternalTableDSL.g:24687:2: rule__TableSelection__UnorderedGroup_3__2
         {
         pushFollow(FOLLOW_2);
         rule__TableSelection__UnorderedGroup_3__2();
@@ -101822,12 +96776,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred260_InternalTableDSL
+    // $ANTLR end synpred257_InternalTableDSL
 
-    // $ANTLR start synpred261_InternalTableDSL
-    public final void synpred261_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25335:2: ( rule__TableSelection__UnorderedGroup_3__3 )
-        // InternalTableDSL.g:25335:2: rule__TableSelection__UnorderedGroup_3__3
+    // $ANTLR start synpred258_InternalTableDSL
+    public final void synpred258_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24699:2: ( rule__TableSelection__UnorderedGroup_3__3 )
+        // InternalTableDSL.g:24699:2: rule__TableSelection__UnorderedGroup_3__3
         {
         pushFollow(FOLLOW_2);
         rule__TableSelection__UnorderedGroup_3__3();
@@ -101837,12 +96791,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred261_InternalTableDSL
+    // $ANTLR end synpred258_InternalTableDSL
 
-    // $ANTLR start synpred262_InternalTableDSL
-    public final void synpred262_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25347:2: ( rule__TableSelection__UnorderedGroup_3__4 )
-        // InternalTableDSL.g:25347:2: rule__TableSelection__UnorderedGroup_3__4
+    // $ANTLR start synpred259_InternalTableDSL
+    public final void synpred259_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24711:2: ( rule__TableSelection__UnorderedGroup_3__4 )
+        // InternalTableDSL.g:24711:2: rule__TableSelection__UnorderedGroup_3__4
         {
         pushFollow(FOLLOW_2);
         rule__TableSelection__UnorderedGroup_3__4();
@@ -101852,27 +96806,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred262_InternalTableDSL
-
-    // $ANTLR start synpred263_InternalTableDSL
-    public final void synpred263_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25359:2: ( rule__TableSelection__UnorderedGroup_3__5 )
-        // InternalTableDSL.g:25359:2: rule__TableSelection__UnorderedGroup_3__5
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableSelection__UnorderedGroup_3__5();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred263_InternalTableDSL
+    // $ANTLR end synpred259_InternalTableDSL
 
-    // $ANTLR start synpred264_InternalTableDSL
-    public final void synpred264_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25383:2: ( rule__TableTable__UnorderedGroup_2__0 )
-        // InternalTableDSL.g:25383:2: rule__TableTable__UnorderedGroup_2__0
+    // $ANTLR start synpred260_InternalTableDSL
+    public final void synpred260_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24735:2: ( rule__TableTable__UnorderedGroup_2__0 )
+        // InternalTableDSL.g:24735:2: rule__TableTable__UnorderedGroup_2__0
         {
         pushFollow(FOLLOW_2);
         rule__TableTable__UnorderedGroup_2__0();
@@ -101882,32 +96821,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred264_InternalTableDSL
+    // $ANTLR end synpred260_InternalTableDSL
 
-    // $ANTLR start synpred265_InternalTableDSL
-    public final void synpred265_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25398:3: ( ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) ) )
-        // InternalTableDSL.g:25398:3: ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) )
+    // $ANTLR start synpred261_InternalTableDSL
+    public final void synpred261_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24750:3: ( ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) ) )
+        // InternalTableDSL.g:24750:3: ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) )
         {
-        // InternalTableDSL.g:25398:3: ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) )
-        // InternalTableDSL.g:25399:4: {...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) )
+        // InternalTableDSL.g:24750:3: ({...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) ) )
+        // InternalTableDSL.g:24751:4: {...}? => ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred265_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0)");
+            throw new FailedPredicateException(input, "synpred261_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0)");
         }
-        // InternalTableDSL.g:25399:106: ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) )
-        // InternalTableDSL.g:25400:5: ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) )
+        // InternalTableDSL.g:24751:106: ( ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) ) )
+        // InternalTableDSL.g:24752:5: ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0);
-        // InternalTableDSL.g:25406:5: ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) )
-        // InternalTableDSL.g:25407:6: ( rule__TableTable__SelectalwaysAssignment_2_0 )
+        // InternalTableDSL.g:24758:5: ( ( rule__TableTable__SelectalwaysAssignment_2_0 ) )
+        // InternalTableDSL.g:24759:6: ( rule__TableTable__SelectalwaysAssignment_2_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getTableTableAccess().getSelectalwaysAssignment_2_0()); 
         }
-        // InternalTableDSL.g:25408:6: ( rule__TableTable__SelectalwaysAssignment_2_0 )
-        // InternalTableDSL.g:25408:7: rule__TableTable__SelectalwaysAssignment_2_0
+        // InternalTableDSL.g:24760:6: ( rule__TableTable__SelectalwaysAssignment_2_0 )
+        // InternalTableDSL.g:24760:7: rule__TableTable__SelectalwaysAssignment_2_0
         {
         pushFollow(FOLLOW_2);
         rule__TableTable__SelectalwaysAssignment_2_0();
@@ -101929,32 +96868,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred265_InternalTableDSL
+    // $ANTLR end synpred261_InternalTableDSL
 
-    // $ANTLR start synpred266_InternalTableDSL
-    public final void synpred266_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25413:3: ( ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) ) )
-        // InternalTableDSL.g:25413:3: ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) )
+    // $ANTLR start synpred262_InternalTableDSL
+    public final void synpred262_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24765:3: ( ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) ) )
+        // InternalTableDSL.g:24765:3: ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) )
         {
-        // InternalTableDSL.g:25413:3: ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) )
-        // InternalTableDSL.g:25414:4: {...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) )
+        // InternalTableDSL.g:24765:3: ({...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) ) )
+        // InternalTableDSL.g:24766:4: {...}? => ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred266_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1)");
+            throw new FailedPredicateException(input, "synpred262_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1)");
         }
-        // InternalTableDSL.g:25414:106: ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) )
-        // InternalTableDSL.g:25415:5: ( ( rule__TableTable__SelectByIdAssignment_2_1 ) )
+        // InternalTableDSL.g:24766:106: ( ( ( rule__TableTable__SelectByIdAssignment_2_1 ) ) )
+        // InternalTableDSL.g:24767:5: ( ( rule__TableTable__SelectByIdAssignment_2_1 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1);
-        // InternalTableDSL.g:25421:5: ( ( rule__TableTable__SelectByIdAssignment_2_1 ) )
-        // InternalTableDSL.g:25422:6: ( rule__TableTable__SelectByIdAssignment_2_1 )
+        // InternalTableDSL.g:24773:5: ( ( rule__TableTable__SelectByIdAssignment_2_1 ) )
+        // InternalTableDSL.g:24774:6: ( rule__TableTable__SelectByIdAssignment_2_1 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getTableTableAccess().getSelectByIdAssignment_2_1()); 
         }
-        // InternalTableDSL.g:25423:6: ( rule__TableTable__SelectByIdAssignment_2_1 )
-        // InternalTableDSL.g:25423:7: rule__TableTable__SelectByIdAssignment_2_1
+        // InternalTableDSL.g:24775:6: ( rule__TableTable__SelectByIdAssignment_2_1 )
+        // InternalTableDSL.g:24775:7: rule__TableTable__SelectByIdAssignment_2_1
         {
         pushFollow(FOLLOW_2);
         rule__TableTable__SelectByIdAssignment_2_1();
@@ -101976,32 +96915,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred266_InternalTableDSL
+    // $ANTLR end synpred262_InternalTableDSL
 
-    // $ANTLR start synpred267_InternalTableDSL
-    public final void synpred267_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25428:3: ( ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) ) )
-        // InternalTableDSL.g:25428:3: ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) )
+    // $ANTLR start synpred263_InternalTableDSL
+    public final void synpred263_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24780:3: ( ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) ) )
+        // InternalTableDSL.g:24780:3: ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) )
         {
-        // InternalTableDSL.g:25428:3: ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) )
-        // InternalTableDSL.g:25429:4: {...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) )
+        // InternalTableDSL.g:24780:3: ({...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) ) )
+        // InternalTableDSL.g:24781:4: {...}? => ( ( ( rule__TableTable__Group_2_2__0 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred267_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2)");
+            throw new FailedPredicateException(input, "synpred263_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2)");
         }
-        // InternalTableDSL.g:25429:106: ( ( ( rule__TableTable__Group_2_2__0 ) ) )
-        // InternalTableDSL.g:25430:5: ( ( rule__TableTable__Group_2_2__0 ) )
+        // InternalTableDSL.g:24781:106: ( ( ( rule__TableTable__Group_2_2__0 ) ) )
+        // InternalTableDSL.g:24782:5: ( ( rule__TableTable__Group_2_2__0 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2);
-        // InternalTableDSL.g:25436:5: ( ( rule__TableTable__Group_2_2__0 ) )
-        // InternalTableDSL.g:25437:6: ( rule__TableTable__Group_2_2__0 )
+        // InternalTableDSL.g:24788:5: ( ( rule__TableTable__Group_2_2__0 ) )
+        // InternalTableDSL.g:24789:6: ( rule__TableTable__Group_2_2__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getTableTableAccess().getGroup_2_2()); 
         }
-        // InternalTableDSL.g:25438:6: ( rule__TableTable__Group_2_2__0 )
-        // InternalTableDSL.g:25438:7: rule__TableTable__Group_2_2__0
+        // InternalTableDSL.g:24790:6: ( rule__TableTable__Group_2_2__0 )
+        // InternalTableDSL.g:24790:7: rule__TableTable__Group_2_2__0
         {
         pushFollow(FOLLOW_2);
         rule__TableTable__Group_2_2__0();
@@ -102023,35 +96962,35 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred267_InternalTableDSL
+    // $ANTLR end synpred263_InternalTableDSL
 
-    // $ANTLR start synpred268_InternalTableDSL
-    public final void synpred268_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25443:3: ( ({...}? => ( ( ( rule__TableTable__Group_2_3__0 ) ) ) ) )
-        // InternalTableDSL.g:25443:3: ({...}? => ( ( ( rule__TableTable__Group_2_3__0 ) ) ) )
+    // $ANTLR start synpred264_InternalTableDSL
+    public final void synpred264_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24795:3: ( ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_3 ) ) ) ) )
+        // InternalTableDSL.g:24795:3: ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_3 ) ) ) )
         {
-        // InternalTableDSL.g:25443:3: ({...}? => ( ( ( rule__TableTable__Group_2_3__0 ) ) ) )
-        // InternalTableDSL.g:25444:4: {...}? => ( ( ( rule__TableTable__Group_2_3__0 ) ) )
+        // InternalTableDSL.g:24795:3: ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_3 ) ) ) )
+        // InternalTableDSL.g:24796:4: {...}? => ( ( ( rule__TableTable__FilteringAssignment_2_3 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred268_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3)");
+            throw new FailedPredicateException(input, "synpred264_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3)");
         }
-        // InternalTableDSL.g:25444:106: ( ( ( rule__TableTable__Group_2_3__0 ) ) )
-        // InternalTableDSL.g:25445:5: ( ( rule__TableTable__Group_2_3__0 ) )
+        // InternalTableDSL.g:24796:106: ( ( ( rule__TableTable__FilteringAssignment_2_3 ) ) )
+        // InternalTableDSL.g:24797:5: ( ( rule__TableTable__FilteringAssignment_2_3 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3);
-        // InternalTableDSL.g:25451:5: ( ( rule__TableTable__Group_2_3__0 ) )
-        // InternalTableDSL.g:25452:6: ( rule__TableTable__Group_2_3__0 )
+        // InternalTableDSL.g:24803:5: ( ( rule__TableTable__FilteringAssignment_2_3 ) )
+        // InternalTableDSL.g:24804:6: ( rule__TableTable__FilteringAssignment_2_3 )
         {
         if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableTableAccess().getGroup_2_3()); 
+           before(grammarAccess.getTableTableAccess().getFilteringAssignment_2_3()); 
         }
-        // InternalTableDSL.g:25453:6: ( rule__TableTable__Group_2_3__0 )
-        // InternalTableDSL.g:25453:7: rule__TableTable__Group_2_3__0
+        // InternalTableDSL.g:24805:6: ( rule__TableTable__FilteringAssignment_2_3 )
+        // InternalTableDSL.g:24805:7: rule__TableTable__FilteringAssignment_2_3
         {
         pushFollow(FOLLOW_2);
-        rule__TableTable__Group_2_3__0();
+        rule__TableTable__FilteringAssignment_2_3();
 
         state._fsp--;
         if (state.failed) return ;
@@ -102070,82 +97009,35 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred268_InternalTableDSL
+    // $ANTLR end synpred264_InternalTableDSL
 
-    // $ANTLR start synpred269_InternalTableDSL
-    public final void synpred269_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25458:3: ( ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_4 ) ) ) ) )
-        // InternalTableDSL.g:25458:3: ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_4 ) ) ) )
+    // $ANTLR start synpred265_InternalTableDSL
+    public final void synpred265_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24810:3: ( ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_4 ) ) ) ) )
+        // InternalTableDSL.g:24810:3: ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_4 ) ) ) )
         {
-        // InternalTableDSL.g:25458:3: ({...}? => ( ( ( rule__TableTable__FilteringAssignment_2_4 ) ) ) )
-        // InternalTableDSL.g:25459:4: {...}? => ( ( ( rule__TableTable__FilteringAssignment_2_4 ) ) )
+        // InternalTableDSL.g:24810:3: ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_4 ) ) ) )
+        // InternalTableDSL.g:24811:4: {...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_4 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred269_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4)");
+            throw new FailedPredicateException(input, "synpred265_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4)");
         }
-        // InternalTableDSL.g:25459:106: ( ( ( rule__TableTable__FilteringAssignment_2_4 ) ) )
-        // InternalTableDSL.g:25460:5: ( ( rule__TableTable__FilteringAssignment_2_4 ) )
+        // InternalTableDSL.g:24811:106: ( ( ( rule__TableTable__EmbeddedAssignment_2_4 ) ) )
+        // InternalTableDSL.g:24812:5: ( ( rule__TableTable__EmbeddedAssignment_2_4 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4);
-        // InternalTableDSL.g:25466:5: ( ( rule__TableTable__FilteringAssignment_2_4 ) )
-        // InternalTableDSL.g:25467:6: ( rule__TableTable__FilteringAssignment_2_4 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableTableAccess().getFilteringAssignment_2_4()); 
-        }
-        // InternalTableDSL.g:25468:6: ( rule__TableTable__FilteringAssignment_2_4 )
-        // InternalTableDSL.g:25468:7: rule__TableTable__FilteringAssignment_2_4
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableTable__FilteringAssignment_2_4();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred269_InternalTableDSL
-
-    // $ANTLR start synpred270_InternalTableDSL
-    public final void synpred270_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25473:3: ( ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_5 ) ) ) ) )
-        // InternalTableDSL.g:25473:3: ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_5 ) ) ) )
-        {
-        // InternalTableDSL.g:25473:3: ({...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_5 ) ) ) )
-        // InternalTableDSL.g:25474:4: {...}? => ( ( ( rule__TableTable__EmbeddedAssignment_2_5 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred270_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5)");
-        }
-        // InternalTableDSL.g:25474:106: ( ( ( rule__TableTable__EmbeddedAssignment_2_5 ) ) )
-        // InternalTableDSL.g:25475:5: ( ( rule__TableTable__EmbeddedAssignment_2_5 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5);
-        // InternalTableDSL.g:25481:5: ( ( rule__TableTable__EmbeddedAssignment_2_5 ) )
-        // InternalTableDSL.g:25482:6: ( rule__TableTable__EmbeddedAssignment_2_5 )
+        // InternalTableDSL.g:24818:5: ( ( rule__TableTable__EmbeddedAssignment_2_4 ) )
+        // InternalTableDSL.g:24819:6: ( rule__TableTable__EmbeddedAssignment_2_4 )
         {
         if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableTableAccess().getEmbeddedAssignment_2_5()); 
+           before(grammarAccess.getTableTableAccess().getEmbeddedAssignment_2_4()); 
         }
-        // InternalTableDSL.g:25483:6: ( rule__TableTable__EmbeddedAssignment_2_5 )
-        // InternalTableDSL.g:25483:7: rule__TableTable__EmbeddedAssignment_2_5
+        // InternalTableDSL.g:24820:6: ( rule__TableTable__EmbeddedAssignment_2_4 )
+        // InternalTableDSL.g:24820:7: rule__TableTable__EmbeddedAssignment_2_4
         {
         pushFollow(FOLLOW_2);
-        rule__TableTable__EmbeddedAssignment_2_5();
+        rule__TableTable__EmbeddedAssignment_2_4();
 
         state._fsp--;
         if (state.failed) return ;
@@ -102164,12 +97056,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred270_InternalTableDSL
+    // $ANTLR end synpred265_InternalTableDSL
 
-    // $ANTLR start synpred271_InternalTableDSL
-    public final void synpred271_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25517:2: ( rule__TableTable__UnorderedGroup_2__1 )
-        // InternalTableDSL.g:25517:2: rule__TableTable__UnorderedGroup_2__1
+    // $ANTLR start synpred266_InternalTableDSL
+    public final void synpred266_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24854:2: ( rule__TableTable__UnorderedGroup_2__1 )
+        // InternalTableDSL.g:24854:2: rule__TableTable__UnorderedGroup_2__1
         {
         pushFollow(FOLLOW_2);
         rule__TableTable__UnorderedGroup_2__1();
@@ -102179,12 +97071,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred271_InternalTableDSL
+    // $ANTLR end synpred266_InternalTableDSL
 
-    // $ANTLR start synpred272_InternalTableDSL
-    public final void synpred272_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25529:2: ( rule__TableTable__UnorderedGroup_2__2 )
-        // InternalTableDSL.g:25529:2: rule__TableTable__UnorderedGroup_2__2
+    // $ANTLR start synpred267_InternalTableDSL
+    public final void synpred267_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24866:2: ( rule__TableTable__UnorderedGroup_2__2 )
+        // InternalTableDSL.g:24866:2: rule__TableTable__UnorderedGroup_2__2
         {
         pushFollow(FOLLOW_2);
         rule__TableTable__UnorderedGroup_2__2();
@@ -102194,12 +97086,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred272_InternalTableDSL
+    // $ANTLR end synpred267_InternalTableDSL
 
-    // $ANTLR start synpred273_InternalTableDSL
-    public final void synpred273_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25541:2: ( rule__TableTable__UnorderedGroup_2__3 )
-        // InternalTableDSL.g:25541:2: rule__TableTable__UnorderedGroup_2__3
+    // $ANTLR start synpred268_InternalTableDSL
+    public final void synpred268_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24878:2: ( rule__TableTable__UnorderedGroup_2__3 )
+        // InternalTableDSL.g:24878:2: rule__TableTable__UnorderedGroup_2__3
         {
         pushFollow(FOLLOW_2);
         rule__TableTable__UnorderedGroup_2__3();
@@ -102209,12 +97101,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred273_InternalTableDSL
+    // $ANTLR end synpred268_InternalTableDSL
 
-    // $ANTLR start synpred274_InternalTableDSL
-    public final void synpred274_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25553:2: ( rule__TableTable__UnorderedGroup_2__4 )
-        // InternalTableDSL.g:25553:2: rule__TableTable__UnorderedGroup_2__4
+    // $ANTLR start synpred269_InternalTableDSL
+    public final void synpred269_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24890:2: ( rule__TableTable__UnorderedGroup_2__4 )
+        // InternalTableDSL.g:24890:2: rule__TableTable__UnorderedGroup_2__4
         {
         pushFollow(FOLLOW_2);
         rule__TableTable__UnorderedGroup_2__4();
@@ -102224,12 +97116,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred274_InternalTableDSL
+    // $ANTLR end synpred269_InternalTableDSL
 
-    // $ANTLR start synpred275_InternalTableDSL
-    public final void synpred275_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25565:2: ( rule__TableTable__UnorderedGroup_2__5 )
-        // InternalTableDSL.g:25565:2: rule__TableTable__UnorderedGroup_2__5
+    // $ANTLR start synpred270_InternalTableDSL
+    public final void synpred270_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24902:2: ( rule__TableTable__UnorderedGroup_2__5 )
+        // InternalTableDSL.g:24902:2: rule__TableTable__UnorderedGroup_2__5
         {
         pushFollow(FOLLOW_2);
         rule__TableTable__UnorderedGroup_2__5();
@@ -102239,414 +97131,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred275_InternalTableDSL
-
-    // $ANTLR start synpred276_InternalTableDSL
-    public final void synpred276_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25577:2: ( rule__TableTable__UnorderedGroup_2__6 )
-        // InternalTableDSL.g:25577:2: rule__TableTable__UnorderedGroup_2__6
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableTable__UnorderedGroup_2__6();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred276_InternalTableDSL
-
-    // $ANTLR start synpred277_InternalTableDSL
-    public final void synpred277_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25601:2: ( rule__TableBean__UnorderedGroup_2__0 )
-        // InternalTableDSL.g:25601:2: rule__TableBean__UnorderedGroup_2__0
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableBean__UnorderedGroup_2__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred277_InternalTableDSL
-
-    // $ANTLR start synpred278_InternalTableDSL
-    public final void synpred278_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25616:3: ( ({...}? => ( ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) ) ) ) )
-        // InternalTableDSL.g:25616:3: ({...}? => ( ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) ) ) )
-        {
-        // InternalTableDSL.g:25616:3: ({...}? => ( ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) ) ) )
-        // InternalTableDSL.g:25617:4: {...}? => ( ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred278_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0)");
-        }
-        // InternalTableDSL.g:25617:105: ( ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) ) )
-        // InternalTableDSL.g:25618:5: ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0);
-        // InternalTableDSL.g:25624:5: ( ( rule__TableBean__SelectalwaysAssignment_2_0 ) )
-        // InternalTableDSL.g:25625:6: ( rule__TableBean__SelectalwaysAssignment_2_0 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableBeanAccess().getSelectalwaysAssignment_2_0()); 
-        }
-        // InternalTableDSL.g:25626:6: ( rule__TableBean__SelectalwaysAssignment_2_0 )
-        // InternalTableDSL.g:25626:7: rule__TableBean__SelectalwaysAssignment_2_0
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableBean__SelectalwaysAssignment_2_0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred278_InternalTableDSL
-
-    // $ANTLR start synpred279_InternalTableDSL
-    public final void synpred279_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25631:3: ( ({...}? => ( ( ( rule__TableBean__SelectByIdAssignment_2_1 ) ) ) ) )
-        // InternalTableDSL.g:25631:3: ({...}? => ( ( ( rule__TableBean__SelectByIdAssignment_2_1 ) ) ) )
-        {
-        // InternalTableDSL.g:25631:3: ({...}? => ( ( ( rule__TableBean__SelectByIdAssignment_2_1 ) ) ) )
-        // InternalTableDSL.g:25632:4: {...}? => ( ( ( rule__TableBean__SelectByIdAssignment_2_1 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred279_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1)");
-        }
-        // InternalTableDSL.g:25632:105: ( ( ( rule__TableBean__SelectByIdAssignment_2_1 ) ) )
-        // InternalTableDSL.g:25633:5: ( ( rule__TableBean__SelectByIdAssignment_2_1 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1);
-        // InternalTableDSL.g:25639:5: ( ( rule__TableBean__SelectByIdAssignment_2_1 ) )
-        // InternalTableDSL.g:25640:6: ( rule__TableBean__SelectByIdAssignment_2_1 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableBeanAccess().getSelectByIdAssignment_2_1()); 
-        }
-        // InternalTableDSL.g:25641:6: ( rule__TableBean__SelectByIdAssignment_2_1 )
-        // InternalTableDSL.g:25641:7: rule__TableBean__SelectByIdAssignment_2_1
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableBean__SelectByIdAssignment_2_1();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred279_InternalTableDSL
-
-    // $ANTLR start synpred280_InternalTableDSL
-    public final void synpred280_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25646:3: ( ({...}? => ( ( ( rule__TableBean__Group_2_2__0 ) ) ) ) )
-        // InternalTableDSL.g:25646:3: ({...}? => ( ( ( rule__TableBean__Group_2_2__0 ) ) ) )
-        {
-        // InternalTableDSL.g:25646:3: ({...}? => ( ( ( rule__TableBean__Group_2_2__0 ) ) ) )
-        // InternalTableDSL.g:25647:4: {...}? => ( ( ( rule__TableBean__Group_2_2__0 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred280_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2)");
-        }
-        // InternalTableDSL.g:25647:105: ( ( ( rule__TableBean__Group_2_2__0 ) ) )
-        // InternalTableDSL.g:25648:5: ( ( rule__TableBean__Group_2_2__0 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2);
-        // InternalTableDSL.g:25654:5: ( ( rule__TableBean__Group_2_2__0 ) )
-        // InternalTableDSL.g:25655:6: ( rule__TableBean__Group_2_2__0 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableBeanAccess().getGroup_2_2()); 
-        }
-        // InternalTableDSL.g:25656:6: ( rule__TableBean__Group_2_2__0 )
-        // InternalTableDSL.g:25656:7: rule__TableBean__Group_2_2__0
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableBean__Group_2_2__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred280_InternalTableDSL
-
-    // $ANTLR start synpred281_InternalTableDSL
-    public final void synpred281_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25661:3: ( ({...}? => ( ( ( rule__TableBean__Group_2_3__0 ) ) ) ) )
-        // InternalTableDSL.g:25661:3: ({...}? => ( ( ( rule__TableBean__Group_2_3__0 ) ) ) )
-        {
-        // InternalTableDSL.g:25661:3: ({...}? => ( ( ( rule__TableBean__Group_2_3__0 ) ) ) )
-        // InternalTableDSL.g:25662:4: {...}? => ( ( ( rule__TableBean__Group_2_3__0 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred281_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3)");
-        }
-        // InternalTableDSL.g:25662:105: ( ( ( rule__TableBean__Group_2_3__0 ) ) )
-        // InternalTableDSL.g:25663:5: ( ( rule__TableBean__Group_2_3__0 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3);
-        // InternalTableDSL.g:25669:5: ( ( rule__TableBean__Group_2_3__0 ) )
-        // InternalTableDSL.g:25670:6: ( rule__TableBean__Group_2_3__0 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableBeanAccess().getGroup_2_3()); 
-        }
-        // InternalTableDSL.g:25671:6: ( rule__TableBean__Group_2_3__0 )
-        // InternalTableDSL.g:25671:7: rule__TableBean__Group_2_3__0
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableBean__Group_2_3__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred281_InternalTableDSL
-
-    // $ANTLR start synpred282_InternalTableDSL
-    public final void synpred282_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25676:3: ( ({...}? => ( ( ( rule__TableBean__FilteringAssignment_2_4 ) ) ) ) )
-        // InternalTableDSL.g:25676:3: ({...}? => ( ( ( rule__TableBean__FilteringAssignment_2_4 ) ) ) )
-        {
-        // InternalTableDSL.g:25676:3: ({...}? => ( ( ( rule__TableBean__FilteringAssignment_2_4 ) ) ) )
-        // InternalTableDSL.g:25677:4: {...}? => ( ( ( rule__TableBean__FilteringAssignment_2_4 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred282_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4)");
-        }
-        // InternalTableDSL.g:25677:105: ( ( ( rule__TableBean__FilteringAssignment_2_4 ) ) )
-        // InternalTableDSL.g:25678:5: ( ( rule__TableBean__FilteringAssignment_2_4 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4);
-        // InternalTableDSL.g:25684:5: ( ( rule__TableBean__FilteringAssignment_2_4 ) )
-        // InternalTableDSL.g:25685:6: ( rule__TableBean__FilteringAssignment_2_4 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableBeanAccess().getFilteringAssignment_2_4()); 
-        }
-        // InternalTableDSL.g:25686:6: ( rule__TableBean__FilteringAssignment_2_4 )
-        // InternalTableDSL.g:25686:7: rule__TableBean__FilteringAssignment_2_4
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableBean__FilteringAssignment_2_4();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred282_InternalTableDSL
-
-    // $ANTLR start synpred283_InternalTableDSL
-    public final void synpred283_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25691:3: ( ({...}? => ( ( ( rule__TableBean__EmbeddedAssignment_2_5 ) ) ) ) )
-        // InternalTableDSL.g:25691:3: ({...}? => ( ( ( rule__TableBean__EmbeddedAssignment_2_5 ) ) ) )
-        {
-        // InternalTableDSL.g:25691:3: ({...}? => ( ( ( rule__TableBean__EmbeddedAssignment_2_5 ) ) ) )
-        // InternalTableDSL.g:25692:4: {...}? => ( ( ( rule__TableBean__EmbeddedAssignment_2_5 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred283_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5)");
-        }
-        // InternalTableDSL.g:25692:105: ( ( ( rule__TableBean__EmbeddedAssignment_2_5 ) ) )
-        // InternalTableDSL.g:25693:5: ( ( rule__TableBean__EmbeddedAssignment_2_5 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5);
-        // InternalTableDSL.g:25699:5: ( ( rule__TableBean__EmbeddedAssignment_2_5 ) )
-        // InternalTableDSL.g:25700:6: ( rule__TableBean__EmbeddedAssignment_2_5 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableBeanAccess().getEmbeddedAssignment_2_5()); 
-        }
-        // InternalTableDSL.g:25701:6: ( rule__TableBean__EmbeddedAssignment_2_5 )
-        // InternalTableDSL.g:25701:7: rule__TableBean__EmbeddedAssignment_2_5
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableBean__EmbeddedAssignment_2_5();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred283_InternalTableDSL
-
-    // $ANTLR start synpred284_InternalTableDSL
-    public final void synpred284_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25735:2: ( rule__TableBean__UnorderedGroup_2__1 )
-        // InternalTableDSL.g:25735:2: rule__TableBean__UnorderedGroup_2__1
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableBean__UnorderedGroup_2__1();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred284_InternalTableDSL
-
-    // $ANTLR start synpred285_InternalTableDSL
-    public final void synpred285_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25747:2: ( rule__TableBean__UnorderedGroup_2__2 )
-        // InternalTableDSL.g:25747:2: rule__TableBean__UnorderedGroup_2__2
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableBean__UnorderedGroup_2__2();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred285_InternalTableDSL
-
-    // $ANTLR start synpred286_InternalTableDSL
-    public final void synpred286_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25759:2: ( rule__TableBean__UnorderedGroup_2__3 )
-        // InternalTableDSL.g:25759:2: rule__TableBean__UnorderedGroup_2__3
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableBean__UnorderedGroup_2__3();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred286_InternalTableDSL
-
-    // $ANTLR start synpred287_InternalTableDSL
-    public final void synpred287_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25771:2: ( rule__TableBean__UnorderedGroup_2__4 )
-        // InternalTableDSL.g:25771:2: rule__TableBean__UnorderedGroup_2__4
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableBean__UnorderedGroup_2__4();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred287_InternalTableDSL
-
-    // $ANTLR start synpred288_InternalTableDSL
-    public final void synpred288_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25783:2: ( rule__TableBean__UnorderedGroup_2__5 )
-        // InternalTableDSL.g:25783:2: rule__TableBean__UnorderedGroup_2__5
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableBean__UnorderedGroup_2__5();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred288_InternalTableDSL
-
-    // $ANTLR start synpred289_InternalTableDSL
-    public final void synpred289_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25795:2: ( rule__TableBean__UnorderedGroup_2__6 )
-        // InternalTableDSL.g:25795:2: rule__TableBean__UnorderedGroup_2__6
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableBean__UnorderedGroup_2__6();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred289_InternalTableDSL
+    // $ANTLR end synpred270_InternalTableDSL
 
-    // $ANTLR start synpred290_InternalTableDSL
-    public final void synpred290_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25819:2: ( rule__TableValue__UnorderedGroup_3__0 )
-        // InternalTableDSL.g:25819:2: rule__TableValue__UnorderedGroup_3__0
+    // $ANTLR start synpred271_InternalTableDSL
+    public final void synpred271_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24926:2: ( rule__TableValue__UnorderedGroup_3__0 )
+        // InternalTableDSL.g:24926:2: rule__TableValue__UnorderedGroup_3__0
         {
         pushFollow(FOLLOW_2);
         rule__TableValue__UnorderedGroup_3__0();
@@ -102656,32 +97146,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred290_InternalTableDSL
+    // $ANTLR end synpred271_InternalTableDSL
 
-    // $ANTLR start synpred291_InternalTableDSL
-    public final void synpred291_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25834:3: ( ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) ) )
-        // InternalTableDSL.g:25834:3: ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) )
+    // $ANTLR start synpred272_InternalTableDSL
+    public final void synpred272_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24941:3: ( ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) ) )
+        // InternalTableDSL.g:24941:3: ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) )
         {
-        // InternalTableDSL.g:25834:3: ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) )
-        // InternalTableDSL.g:25835:4: {...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) )
+        // InternalTableDSL.g:24941:3: ({...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) ) )
+        // InternalTableDSL.g:24942:4: {...}? => ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred291_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0)");
+            throw new FailedPredicateException(input, "synpred272_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0)");
         }
-        // InternalTableDSL.g:25835:106: ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) )
-        // InternalTableDSL.g:25836:5: ( ( rule__TableValue__CollapsedAssignment_3_0 ) )
+        // InternalTableDSL.g:24942:106: ( ( ( rule__TableValue__CollapsedAssignment_3_0 ) ) )
+        // InternalTableDSL.g:24943:5: ( ( rule__TableValue__CollapsedAssignment_3_0 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0);
-        // InternalTableDSL.g:25842:5: ( ( rule__TableValue__CollapsedAssignment_3_0 ) )
-        // InternalTableDSL.g:25843:6: ( rule__TableValue__CollapsedAssignment_3_0 )
+        // InternalTableDSL.g:24949:5: ( ( rule__TableValue__CollapsedAssignment_3_0 ) )
+        // InternalTableDSL.g:24950:6: ( rule__TableValue__CollapsedAssignment_3_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getTableValueAccess().getCollapsedAssignment_3_0()); 
         }
-        // InternalTableDSL.g:25844:6: ( rule__TableValue__CollapsedAssignment_3_0 )
-        // InternalTableDSL.g:25844:7: rule__TableValue__CollapsedAssignment_3_0
+        // InternalTableDSL.g:24951:6: ( rule__TableValue__CollapsedAssignment_3_0 )
+        // InternalTableDSL.g:24951:7: rule__TableValue__CollapsedAssignment_3_0
         {
         pushFollow(FOLLOW_2);
         rule__TableValue__CollapsedAssignment_3_0();
@@ -102703,32 +97193,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred291_InternalTableDSL
+    // $ANTLR end synpred272_InternalTableDSL
 
-    // $ANTLR start synpred292_InternalTableDSL
-    public final void synpred292_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25849:3: ( ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) ) )
-        // InternalTableDSL.g:25849:3: ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) )
+    // $ANTLR start synpred273_InternalTableDSL
+    public final void synpred273_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24956:3: ( ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) ) )
+        // InternalTableDSL.g:24956:3: ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) )
         {
-        // InternalTableDSL.g:25849:3: ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) )
-        // InternalTableDSL.g:25850:4: {...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) )
+        // InternalTableDSL.g:24956:3: ({...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) ) )
+        // InternalTableDSL.g:24957:4: {...}? => ( ( ( rule__TableValue__Group_3_1__0 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred292_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1)");
+            throw new FailedPredicateException(input, "synpred273_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1)");
         }
-        // InternalTableDSL.g:25850:106: ( ( ( rule__TableValue__Group_3_1__0 ) ) )
-        // InternalTableDSL.g:25851:5: ( ( rule__TableValue__Group_3_1__0 ) )
+        // InternalTableDSL.g:24957:106: ( ( ( rule__TableValue__Group_3_1__0 ) ) )
+        // InternalTableDSL.g:24958:5: ( ( rule__TableValue__Group_3_1__0 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1);
-        // InternalTableDSL.g:25857:5: ( ( rule__TableValue__Group_3_1__0 ) )
-        // InternalTableDSL.g:25858:6: ( rule__TableValue__Group_3_1__0 )
+        // InternalTableDSL.g:24964:5: ( ( rule__TableValue__Group_3_1__0 ) )
+        // InternalTableDSL.g:24965:6: ( rule__TableValue__Group_3_1__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getTableValueAccess().getGroup_3_1()); 
         }
-        // InternalTableDSL.g:25859:6: ( rule__TableValue__Group_3_1__0 )
-        // InternalTableDSL.g:25859:7: rule__TableValue__Group_3_1__0
+        // InternalTableDSL.g:24966:6: ( rule__TableValue__Group_3_1__0 )
+        // InternalTableDSL.g:24966:7: rule__TableValue__Group_3_1__0
         {
         pushFollow(FOLLOW_2);
         rule__TableValue__Group_3_1__0();
@@ -102750,32 +97240,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred292_InternalTableDSL
+    // $ANTLR end synpred273_InternalTableDSL
 
-    // $ANTLR start synpred293_InternalTableDSL
-    public final void synpred293_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25864:3: ( ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) ) )
-        // InternalTableDSL.g:25864:3: ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) )
+    // $ANTLR start synpred274_InternalTableDSL
+    public final void synpred274_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24971:3: ( ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) ) )
+        // InternalTableDSL.g:24971:3: ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) )
         {
-        // InternalTableDSL.g:25864:3: ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) )
-        // InternalTableDSL.g:25865:4: {...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) )
+        // InternalTableDSL.g:24971:3: ({...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) ) )
+        // InternalTableDSL.g:24972:4: {...}? => ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred293_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2)");
+            throw new FailedPredicateException(input, "synpred274_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2)");
         }
-        // InternalTableDSL.g:25865:106: ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) )
-        // InternalTableDSL.g:25866:5: ( ( rule__TableValue__FormatterAssignment_3_2 ) )
+        // InternalTableDSL.g:24972:106: ( ( ( rule__TableValue__FormatterAssignment_3_2 ) ) )
+        // InternalTableDSL.g:24973:5: ( ( rule__TableValue__FormatterAssignment_3_2 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2);
-        // InternalTableDSL.g:25872:5: ( ( rule__TableValue__FormatterAssignment_3_2 ) )
-        // InternalTableDSL.g:25873:6: ( rule__TableValue__FormatterAssignment_3_2 )
+        // InternalTableDSL.g:24979:5: ( ( rule__TableValue__FormatterAssignment_3_2 ) )
+        // InternalTableDSL.g:24980:6: ( rule__TableValue__FormatterAssignment_3_2 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getTableValueAccess().getFormatterAssignment_3_2()); 
         }
-        // InternalTableDSL.g:25874:6: ( rule__TableValue__FormatterAssignment_3_2 )
-        // InternalTableDSL.g:25874:7: rule__TableValue__FormatterAssignment_3_2
+        // InternalTableDSL.g:24981:6: ( rule__TableValue__FormatterAssignment_3_2 )
+        // InternalTableDSL.g:24981:7: rule__TableValue__FormatterAssignment_3_2
         {
         pushFollow(FOLLOW_2);
         rule__TableValue__FormatterAssignment_3_2();
@@ -102797,32 +97287,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred293_InternalTableDSL
+    // $ANTLR end synpred274_InternalTableDSL
 
-    // $ANTLR start synpred294_InternalTableDSL
-    public final void synpred294_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25879:3: ( ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) ) )
-        // InternalTableDSL.g:25879:3: ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) )
+    // $ANTLR start synpred275_InternalTableDSL
+    public final void synpred275_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:24986:3: ( ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) ) )
+        // InternalTableDSL.g:24986:3: ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) )
         {
-        // InternalTableDSL.g:25879:3: ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) )
-        // InternalTableDSL.g:25880:4: {...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) )
+        // InternalTableDSL.g:24986:3: ({...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) ) )
+        // InternalTableDSL.g:24987:4: {...}? => ( ( ( rule__TableValue__Group_3_3__0 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred294_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3)");
+            throw new FailedPredicateException(input, "synpred275_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3)");
         }
-        // InternalTableDSL.g:25880:106: ( ( ( rule__TableValue__Group_3_3__0 ) ) )
-        // InternalTableDSL.g:25881:5: ( ( rule__TableValue__Group_3_3__0 ) )
+        // InternalTableDSL.g:24987:106: ( ( ( rule__TableValue__Group_3_3__0 ) ) )
+        // InternalTableDSL.g:24988:5: ( ( rule__TableValue__Group_3_3__0 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3);
-        // InternalTableDSL.g:25887:5: ( ( rule__TableValue__Group_3_3__0 ) )
-        // InternalTableDSL.g:25888:6: ( rule__TableValue__Group_3_3__0 )
+        // InternalTableDSL.g:24994:5: ( ( rule__TableValue__Group_3_3__0 ) )
+        // InternalTableDSL.g:24995:6: ( rule__TableValue__Group_3_3__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getTableValueAccess().getGroup_3_3()); 
         }
-        // InternalTableDSL.g:25889:6: ( rule__TableValue__Group_3_3__0 )
-        // InternalTableDSL.g:25889:7: rule__TableValue__Group_3_3__0
+        // InternalTableDSL.g:24996:6: ( rule__TableValue__Group_3_3__0 )
+        // InternalTableDSL.g:24996:7: rule__TableValue__Group_3_3__0
         {
         pushFollow(FOLLOW_2);
         rule__TableValue__Group_3_3__0();
@@ -102844,12 +97334,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred294_InternalTableDSL
+    // $ANTLR end synpred275_InternalTableDSL
 
-    // $ANTLR start synpred295_InternalTableDSL
-    public final void synpred295_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25923:2: ( rule__TableValue__UnorderedGroup_3__1 )
-        // InternalTableDSL.g:25923:2: rule__TableValue__UnorderedGroup_3__1
+    // $ANTLR start synpred276_InternalTableDSL
+    public final void synpred276_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:25030:2: ( rule__TableValue__UnorderedGroup_3__1 )
+        // InternalTableDSL.g:25030:2: rule__TableValue__UnorderedGroup_3__1
         {
         pushFollow(FOLLOW_2);
         rule__TableValue__UnorderedGroup_3__1();
@@ -102859,12 +97349,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred295_InternalTableDSL
+    // $ANTLR end synpred276_InternalTableDSL
 
-    // $ANTLR start synpred296_InternalTableDSL
-    public final void synpred296_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25935:2: ( rule__TableValue__UnorderedGroup_3__2 )
-        // InternalTableDSL.g:25935:2: rule__TableValue__UnorderedGroup_3__2
+    // $ANTLR start synpred277_InternalTableDSL
+    public final void synpred277_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:25042:2: ( rule__TableValue__UnorderedGroup_3__2 )
+        // InternalTableDSL.g:25042:2: rule__TableValue__UnorderedGroup_3__2
         {
         pushFollow(FOLLOW_2);
         rule__TableValue__UnorderedGroup_3__2();
@@ -102874,12 +97364,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred296_InternalTableDSL
+    // $ANTLR end synpred277_InternalTableDSL
 
-    // $ANTLR start synpred297_InternalTableDSL
-    public final void synpred297_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25947:2: ( rule__TableValue__UnorderedGroup_3__3 )
-        // InternalTableDSL.g:25947:2: rule__TableValue__UnorderedGroup_3__3
+    // $ANTLR start synpred278_InternalTableDSL
+    public final void synpred278_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:25054:2: ( rule__TableValue__UnorderedGroup_3__3 )
+        // InternalTableDSL.g:25054:2: rule__TableValue__UnorderedGroup_3__3
         {
         pushFollow(FOLLOW_2);
         rule__TableValue__UnorderedGroup_3__3();
@@ -102889,12 +97379,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred297_InternalTableDSL
+    // $ANTLR end synpred278_InternalTableDSL
 
-    // $ANTLR start synpred298_InternalTableDSL
-    public final void synpred298_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25959:2: ( rule__TableValue__UnorderedGroup_3__4 )
-        // InternalTableDSL.g:25959:2: rule__TableValue__UnorderedGroup_3__4
+    // $ANTLR start synpred279_InternalTableDSL
+    public final void synpred279_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:25066:2: ( rule__TableValue__UnorderedGroup_3__4 )
+        // InternalTableDSL.g:25066:2: rule__TableValue__UnorderedGroup_3__4
         {
         pushFollow(FOLLOW_2);
         rule__TableValue__UnorderedGroup_3__4();
@@ -102904,12 +97394,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred298_InternalTableDSL
+    // $ANTLR end synpred279_InternalTableDSL
 
-    // $ANTLR start synpred299_InternalTableDSL
-    public final void synpred299_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25983:2: ( rule__TableValue__UnorderedGroup_4__0 )
-        // InternalTableDSL.g:25983:2: rule__TableValue__UnorderedGroup_4__0
+    // $ANTLR start synpred280_InternalTableDSL
+    public final void synpred280_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:25090:2: ( rule__TableValue__UnorderedGroup_4__0 )
+        // InternalTableDSL.g:25090:2: rule__TableValue__UnorderedGroup_4__0
         {
         pushFollow(FOLLOW_2);
         rule__TableValue__UnorderedGroup_4__0();
@@ -102919,32 +97409,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred299_InternalTableDSL
+    // $ANTLR end synpred280_InternalTableDSL
 
-    // $ANTLR start synpred300_InternalTableDSL
-    public final void synpred300_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:25998:3: ( ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) ) )
-        // InternalTableDSL.g:25998:3: ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) )
+    // $ANTLR start synpred281_InternalTableDSL
+    public final void synpred281_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:25105:3: ( ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) ) )
+        // InternalTableDSL.g:25105:3: ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) )
         {
-        // InternalTableDSL.g:25998:3: ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) )
-        // InternalTableDSL.g:25999:4: {...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) )
+        // InternalTableDSL.g:25105:3: ({...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) ) )
+        // InternalTableDSL.g:25106:4: {...}? => ( ( ( rule__TableValue__Group_4_0__0 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred300_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0)");
+            throw new FailedPredicateException(input, "synpred281_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0)");
         }
-        // InternalTableDSL.g:25999:106: ( ( ( rule__TableValue__Group_4_0__0 ) ) )
-        // InternalTableDSL.g:26000:5: ( ( rule__TableValue__Group_4_0__0 ) )
+        // InternalTableDSL.g:25106:106: ( ( ( rule__TableValue__Group_4_0__0 ) ) )
+        // InternalTableDSL.g:25107:5: ( ( rule__TableValue__Group_4_0__0 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0);
-        // InternalTableDSL.g:26006:5: ( ( rule__TableValue__Group_4_0__0 ) )
-        // InternalTableDSL.g:26007:6: ( rule__TableValue__Group_4_0__0 )
+        // InternalTableDSL.g:25113:5: ( ( rule__TableValue__Group_4_0__0 ) )
+        // InternalTableDSL.g:25114:6: ( rule__TableValue__Group_4_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getTableValueAccess().getGroup_4_0()); 
         }
-        // InternalTableDSL.g:26008:6: ( rule__TableValue__Group_4_0__0 )
-        // InternalTableDSL.g:26008:7: rule__TableValue__Group_4_0__0
+        // InternalTableDSL.g:25115:6: ( rule__TableValue__Group_4_0__0 )
+        // InternalTableDSL.g:25115:7: rule__TableValue__Group_4_0__0
         {
         pushFollow(FOLLOW_2);
         rule__TableValue__Group_4_0__0();
@@ -102966,12 +97456,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred300_InternalTableDSL
+    // $ANTLR end synpred281_InternalTableDSL
 
-    // $ANTLR start synpred301_InternalTableDSL
-    public final void synpred301_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26042:2: ( rule__TableValue__UnorderedGroup_4__1 )
-        // InternalTableDSL.g:26042:2: rule__TableValue__UnorderedGroup_4__1
+    // $ANTLR start synpred282_InternalTableDSL
+    public final void synpred282_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:25149:2: ( rule__TableValue__UnorderedGroup_4__1 )
+        // InternalTableDSL.g:25149:2: rule__TableValue__UnorderedGroup_4__1
         {
         pushFollow(FOLLOW_2);
         rule__TableValue__UnorderedGroup_4__1();
@@ -102981,12 +97471,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred301_InternalTableDSL
+    // $ANTLR end synpred282_InternalTableDSL
 
-    // $ANTLR start synpred302_InternalTableDSL
-    public final void synpred302_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26066:2: ( rule__TableImage__UnorderedGroup_3__0 )
-        // InternalTableDSL.g:26066:2: rule__TableImage__UnorderedGroup_3__0
+    // $ANTLR start synpred283_InternalTableDSL
+    public final void synpred283_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:25173:2: ( rule__TableImage__UnorderedGroup_3__0 )
+        // InternalTableDSL.g:25173:2: rule__TableImage__UnorderedGroup_3__0
         {
         pushFollow(FOLLOW_2);
         rule__TableImage__UnorderedGroup_3__0();
@@ -102996,32 +97486,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred302_InternalTableDSL
+    // $ANTLR end synpred283_InternalTableDSL
 
-    // $ANTLR start synpred303_InternalTableDSL
-    public final void synpred303_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26081:3: ( ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) ) )
-        // InternalTableDSL.g:26081:3: ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) )
+    // $ANTLR start synpred284_InternalTableDSL
+    public final void synpred284_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:25188:3: ( ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) ) )
+        // InternalTableDSL.g:25188:3: ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) )
         {
-        // InternalTableDSL.g:26081:3: ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) )
-        // InternalTableDSL.g:26082:4: {...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) )
+        // InternalTableDSL.g:25188:3: ({...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) ) )
+        // InternalTableDSL.g:25189:4: {...}? => ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred303_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0)");
+            throw new FailedPredicateException(input, "synpred284_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0)");
         }
-        // InternalTableDSL.g:26082:106: ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) )
-        // InternalTableDSL.g:26083:5: ( ( rule__TableImage__HasParameterAssignment_3_0 ) )
+        // InternalTableDSL.g:25189:106: ( ( ( rule__TableImage__HasParameterAssignment_3_0 ) ) )
+        // InternalTableDSL.g:25190:5: ( ( rule__TableImage__HasParameterAssignment_3_0 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0);
-        // InternalTableDSL.g:26089:5: ( ( rule__TableImage__HasParameterAssignment_3_0 ) )
-        // InternalTableDSL.g:26090:6: ( rule__TableImage__HasParameterAssignment_3_0 )
+        // InternalTableDSL.g:25196:5: ( ( rule__TableImage__HasParameterAssignment_3_0 ) )
+        // InternalTableDSL.g:25197:6: ( rule__TableImage__HasParameterAssignment_3_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getTableImageAccess().getHasParameterAssignment_3_0()); 
         }
-        // InternalTableDSL.g:26091:6: ( rule__TableImage__HasParameterAssignment_3_0 )
-        // InternalTableDSL.g:26091:7: rule__TableImage__HasParameterAssignment_3_0
+        // InternalTableDSL.g:25198:6: ( rule__TableImage__HasParameterAssignment_3_0 )
+        // InternalTableDSL.g:25198:7: rule__TableImage__HasParameterAssignment_3_0
         {
         pushFollow(FOLLOW_2);
         rule__TableImage__HasParameterAssignment_3_0();
@@ -103043,32 +97533,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred303_InternalTableDSL
+    // $ANTLR end synpred284_InternalTableDSL
 
-    // $ANTLR start synpred304_InternalTableDSL
-    public final void synpred304_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26096:3: ( ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) ) )
-        // InternalTableDSL.g:26096:3: ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) )
+    // $ANTLR start synpred285_InternalTableDSL
+    public final void synpred285_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:25203:3: ( ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) ) )
+        // InternalTableDSL.g:25203:3: ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) )
         {
-        // InternalTableDSL.g:26096:3: ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) )
-        // InternalTableDSL.g:26097:4: {...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) )
+        // InternalTableDSL.g:25203:3: ({...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) ) )
+        // InternalTableDSL.g:25204:4: {...}? => ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred304_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1)");
+            throw new FailedPredicateException(input, "synpred285_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1)");
         }
-        // InternalTableDSL.g:26097:106: ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) )
-        // InternalTableDSL.g:26098:5: ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) )
+        // InternalTableDSL.g:25204:106: ( ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) ) )
+        // InternalTableDSL.g:25205:5: ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1);
-        // InternalTableDSL.g:26104:5: ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) )
-        // InternalTableDSL.g:26105:6: ( rule__TableImage__HideImageLabelAssignment_3_1 )
+        // InternalTableDSL.g:25211:5: ( ( rule__TableImage__HideImageLabelAssignment_3_1 ) )
+        // InternalTableDSL.g:25212:6: ( rule__TableImage__HideImageLabelAssignment_3_1 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getTableImageAccess().getHideImageLabelAssignment_3_1()); 
         }
-        // InternalTableDSL.g:26106:6: ( rule__TableImage__HideImageLabelAssignment_3_1 )
-        // InternalTableDSL.g:26106:7: rule__TableImage__HideImageLabelAssignment_3_1
+        // InternalTableDSL.g:25213:6: ( rule__TableImage__HideImageLabelAssignment_3_1 )
+        // InternalTableDSL.g:25213:7: rule__TableImage__HideImageLabelAssignment_3_1
         {
         pushFollow(FOLLOW_2);
         rule__TableImage__HideImageLabelAssignment_3_1();
@@ -103090,12 +97580,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred304_InternalTableDSL
+    // $ANTLR end synpred285_InternalTableDSL
 
-    // $ANTLR start synpred305_InternalTableDSL
-    public final void synpred305_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26140:2: ( rule__TableImage__UnorderedGroup_3__1 )
-        // InternalTableDSL.g:26140:2: rule__TableImage__UnorderedGroup_3__1
+    // $ANTLR start synpred286_InternalTableDSL
+    public final void synpred286_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:25247:2: ( rule__TableImage__UnorderedGroup_3__1 )
+        // InternalTableDSL.g:25247:2: rule__TableImage__UnorderedGroup_3__1
         {
         pushFollow(FOLLOW_2);
         rule__TableImage__UnorderedGroup_3__1();
@@ -103105,12 +97595,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred305_InternalTableDSL
+    // $ANTLR end synpred286_InternalTableDSL
 
-    // $ANTLR start synpred306_InternalTableDSL
-    public final void synpred306_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26152:2: ( rule__TableImage__UnorderedGroup_3__2 )
-        // InternalTableDSL.g:26152:2: rule__TableImage__UnorderedGroup_3__2
+    // $ANTLR start synpred287_InternalTableDSL
+    public final void synpred287_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:25259:2: ( rule__TableImage__UnorderedGroup_3__2 )
+        // InternalTableDSL.g:25259:2: rule__TableImage__UnorderedGroup_3__2
         {
         pushFollow(FOLLOW_2);
         rule__TableImage__UnorderedGroup_3__2();
@@ -103120,12 +97610,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred306_InternalTableDSL
+    // $ANTLR end synpred287_InternalTableDSL
 
-    // $ANTLR start synpred307_InternalTableDSL
-    public final void synpred307_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26176:2: ( rule__TableAxis__UnorderedGroup_2__0 )
-        // InternalTableDSL.g:26176:2: rule__TableAxis__UnorderedGroup_2__0
+    // $ANTLR start synpred288_InternalTableDSL
+    public final void synpred288_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:25283:2: ( rule__TableAxis__UnorderedGroup_2__0 )
+        // InternalTableDSL.g:25283:2: rule__TableAxis__UnorderedGroup_2__0
         {
         pushFollow(FOLLOW_2);
         rule__TableAxis__UnorderedGroup_2__0();
@@ -103135,32 +97625,32 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred307_InternalTableDSL
+    // $ANTLR end synpred288_InternalTableDSL
 
-    // $ANTLR start synpred308_InternalTableDSL
-    public final void synpred308_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26191:3: ( ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) ) )
-        // InternalTableDSL.g:26191:3: ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) )
+    // $ANTLR start synpred289_InternalTableDSL
+    public final void synpred289_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:25298:3: ( ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) ) )
+        // InternalTableDSL.g:25298:3: ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) )
         {
-        // InternalTableDSL.g:26191:3: ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) )
-        // InternalTableDSL.g:26192:4: {...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) )
+        // InternalTableDSL.g:25298:3: ({...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) ) )
+        // InternalTableDSL.g:25299:4: {...}? => ( ( ( rule__TableAxis__Group_2_0__0 ) ) )
         {
         if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0) ) {
             if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred308_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0)");
+            throw new FailedPredicateException(input, "synpred289_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0)");
         }
-        // InternalTableDSL.g:26192:105: ( ( ( rule__TableAxis__Group_2_0__0 ) ) )
-        // InternalTableDSL.g:26193:5: ( ( rule__TableAxis__Group_2_0__0 ) )
+        // InternalTableDSL.g:25299:105: ( ( ( rule__TableAxis__Group_2_0__0 ) ) )
+        // InternalTableDSL.g:25300:5: ( ( rule__TableAxis__Group_2_0__0 ) )
         {
         getUnorderedGroupHelper().select(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0);
-        // InternalTableDSL.g:26199:5: ( ( rule__TableAxis__Group_2_0__0 ) )
-        // InternalTableDSL.g:26200:6: ( rule__TableAxis__Group_2_0__0 )
+        // InternalTableDSL.g:25306:5: ( ( rule__TableAxis__Group_2_0__0 ) )
+        // InternalTableDSL.g:25307:6: ( rule__TableAxis__Group_2_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getTableAxisAccess().getGroup_2_0()); 
         }
-        // InternalTableDSL.g:26201:6: ( rule__TableAxis__Group_2_0__0 )
-        // InternalTableDSL.g:26201:7: rule__TableAxis__Group_2_0__0
+        // InternalTableDSL.g:25308:6: ( rule__TableAxis__Group_2_0__0 )
+        // InternalTableDSL.g:25308:7: rule__TableAxis__Group_2_0__0
         {
         pushFollow(FOLLOW_2);
         rule__TableAxis__Group_2_0__0();
@@ -103182,12 +97672,12 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred308_InternalTableDSL
+    // $ANTLR end synpred289_InternalTableDSL
 
-    // $ANTLR start synpred309_InternalTableDSL
-    public final void synpred309_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26235:2: ( rule__TableAxis__UnorderedGroup_2__1 )
-        // InternalTableDSL.g:26235:2: rule__TableAxis__UnorderedGroup_2__1
+    // $ANTLR start synpred290_InternalTableDSL
+    public final void synpred290_InternalTableDSL_fragment() throws RecognitionException {   
+        // InternalTableDSL.g:25342:2: ( rule__TableAxis__UnorderedGroup_2__1 )
+        // InternalTableDSL.g:25342:2: rule__TableAxis__UnorderedGroup_2__1
         {
         pushFollow(FOLLOW_2);
         rule__TableAxis__UnorderedGroup_2__1();
@@ -103197,657 +97687,15 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
 
         }
     }
-    // $ANTLR end synpred309_InternalTableDSL
-
-    // $ANTLR start synpred310_InternalTableDSL
-    public final void synpred310_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26259:2: ( rule__TableGrid__UnorderedGroup_2__0 )
-        // InternalTableDSL.g:26259:2: rule__TableGrid__UnorderedGroup_2__0
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableGrid__UnorderedGroup_2__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred310_InternalTableDSL
-
-    // $ANTLR start synpred311_InternalTableDSL
-    public final void synpred311_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26274:3: ( ({...}? => ( ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) ) ) ) )
-        // InternalTableDSL.g:26274:3: ({...}? => ( ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) ) ) )
-        {
-        // InternalTableDSL.g:26274:3: ({...}? => ( ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) ) ) )
-        // InternalTableDSL.g:26275:4: {...}? => ( ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred311_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0)");
-        }
-        // InternalTableDSL.g:26275:105: ( ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) ) )
-        // InternalTableDSL.g:26276:5: ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0);
-        // InternalTableDSL.g:26282:5: ( ( rule__TableGrid__SelectalwaysAssignment_2_0 ) )
-        // InternalTableDSL.g:26283:6: ( rule__TableGrid__SelectalwaysAssignment_2_0 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableGridAccess().getSelectalwaysAssignment_2_0()); 
-        }
-        // InternalTableDSL.g:26284:6: ( rule__TableGrid__SelectalwaysAssignment_2_0 )
-        // InternalTableDSL.g:26284:7: rule__TableGrid__SelectalwaysAssignment_2_0
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableGrid__SelectalwaysAssignment_2_0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred311_InternalTableDSL
-
-    // $ANTLR start synpred312_InternalTableDSL
-    public final void synpred312_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26318:2: ( rule__TableGrid__UnorderedGroup_2__1 )
-        // InternalTableDSL.g:26318:2: rule__TableGrid__UnorderedGroup_2__1
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableGrid__UnorderedGroup_2__1();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred312_InternalTableDSL
-
-    // $ANTLR start synpred313_InternalTableDSL
-    public final void synpred313_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26342:2: ( rule__TableGrid__UnorderedGroup_3__0 )
-        // InternalTableDSL.g:26342:2: rule__TableGrid__UnorderedGroup_3__0
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableGrid__UnorderedGroup_3__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred313_InternalTableDSL
-
-    // $ANTLR start synpred314_InternalTableDSL
-    public final void synpred314_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26357:3: ( ({...}? => ( ( ( rule__TableGrid__Group_3_0__0 ) ) ) ) )
-        // InternalTableDSL.g:26357:3: ({...}? => ( ( ( rule__TableGrid__Group_3_0__0 ) ) ) )
-        {
-        // InternalTableDSL.g:26357:3: ({...}? => ( ( ( rule__TableGrid__Group_3_0__0 ) ) ) )
-        // InternalTableDSL.g:26358:4: {...}? => ( ( ( rule__TableGrid__Group_3_0__0 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred314_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0)");
-        }
-        // InternalTableDSL.g:26358:105: ( ( ( rule__TableGrid__Group_3_0__0 ) ) )
-        // InternalTableDSL.g:26359:5: ( ( rule__TableGrid__Group_3_0__0 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0);
-        // InternalTableDSL.g:26365:5: ( ( rule__TableGrid__Group_3_0__0 ) )
-        // InternalTableDSL.g:26366:6: ( rule__TableGrid__Group_3_0__0 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableGridAccess().getGroup_3_0()); 
-        }
-        // InternalTableDSL.g:26367:6: ( rule__TableGrid__Group_3_0__0 )
-        // InternalTableDSL.g:26367:7: rule__TableGrid__Group_3_0__0
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableGrid__Group_3_0__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred314_InternalTableDSL
-
-    // $ANTLR start synpred315_InternalTableDSL
-    public final void synpred315_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26372:3: ( ({...}? => ( ( ( rule__TableGrid__FilteringAssignment_3_1 ) ) ) ) )
-        // InternalTableDSL.g:26372:3: ({...}? => ( ( ( rule__TableGrid__FilteringAssignment_3_1 ) ) ) )
-        {
-        // InternalTableDSL.g:26372:3: ({...}? => ( ( ( rule__TableGrid__FilteringAssignment_3_1 ) ) ) )
-        // InternalTableDSL.g:26373:4: {...}? => ( ( ( rule__TableGrid__FilteringAssignment_3_1 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred315_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1)");
-        }
-        // InternalTableDSL.g:26373:105: ( ( ( rule__TableGrid__FilteringAssignment_3_1 ) ) )
-        // InternalTableDSL.g:26374:5: ( ( rule__TableGrid__FilteringAssignment_3_1 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1);
-        // InternalTableDSL.g:26380:5: ( ( rule__TableGrid__FilteringAssignment_3_1 ) )
-        // InternalTableDSL.g:26381:6: ( rule__TableGrid__FilteringAssignment_3_1 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableGridAccess().getFilteringAssignment_3_1()); 
-        }
-        // InternalTableDSL.g:26382:6: ( rule__TableGrid__FilteringAssignment_3_1 )
-        // InternalTableDSL.g:26382:7: rule__TableGrid__FilteringAssignment_3_1
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableGrid__FilteringAssignment_3_1();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred315_InternalTableDSL
-
-    // $ANTLR start synpred316_InternalTableDSL
-    public final void synpred316_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26387:3: ( ({...}? => ( ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) ) ) ) )
-        // InternalTableDSL.g:26387:3: ({...}? => ( ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) ) ) )
-        {
-        // InternalTableDSL.g:26387:3: ({...}? => ( ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) ) ) )
-        // InternalTableDSL.g:26388:4: {...}? => ( ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) ) )
-        {
-        if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2) ) {
-            if (state.backtracking>0) {state.failed=true; return ;}
-            throw new FailedPredicateException(input, "synpred316_InternalTableDSL", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2)");
-        }
-        // InternalTableDSL.g:26388:105: ( ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) ) )
-        // InternalTableDSL.g:26389:5: ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) )
-        {
-        getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2);
-        // InternalTableDSL.g:26395:5: ( ( rule__TableGrid__EmbeddedAssignment_3_2 ) )
-        // InternalTableDSL.g:26396:6: ( rule__TableGrid__EmbeddedAssignment_3_2 )
-        {
-        if ( state.backtracking==0 ) {
-           before(grammarAccess.getTableGridAccess().getEmbeddedAssignment_3_2()); 
-        }
-        // InternalTableDSL.g:26397:6: ( rule__TableGrid__EmbeddedAssignment_3_2 )
-        // InternalTableDSL.g:26397:7: rule__TableGrid__EmbeddedAssignment_3_2
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableGrid__EmbeddedAssignment_3_2();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-
-
-        }
-    }
-    // $ANTLR end synpred316_InternalTableDSL
-
-    // $ANTLR start synpred317_InternalTableDSL
-    public final void synpred317_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26431:2: ( rule__TableGrid__UnorderedGroup_3__1 )
-        // InternalTableDSL.g:26431:2: rule__TableGrid__UnorderedGroup_3__1
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableGrid__UnorderedGroup_3__1();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred317_InternalTableDSL
-
-    // $ANTLR start synpred318_InternalTableDSL
-    public final void synpred318_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26443:2: ( rule__TableGrid__UnorderedGroup_3__2 )
-        // InternalTableDSL.g:26443:2: rule__TableGrid__UnorderedGroup_3__2
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableGrid__UnorderedGroup_3__2();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred318_InternalTableDSL
-
-    // $ANTLR start synpred319_InternalTableDSL
-    public final void synpred319_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:26455:2: ( rule__TableGrid__UnorderedGroup_3__3 )
-        // InternalTableDSL.g:26455:2: rule__TableGrid__UnorderedGroup_3__3
-        {
-        pushFollow(FOLLOW_2);
-        rule__TableGrid__UnorderedGroup_3__3();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred319_InternalTableDSL
+    // $ANTLR end synpred290_InternalTableDSL
 
     // Delegated rules
 
-    public final boolean synpred291_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred291_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred283_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred283_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred257_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred257_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred303_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred303_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred259_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred259_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred301_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred301_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred265_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred265_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred208_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred208_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred273_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred273_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred186_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred186_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred230_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred230_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred269_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred269_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred281_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred281_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred88_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred88_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred255_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred255_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred192_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred192_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred184_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred184_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred263_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred263_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred106_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred106_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred224_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred224_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred39_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred39_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred311_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred311_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred245_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred245_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred271_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred271_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred253_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred253_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred279_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred279_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred183_InternalTableDSL() {
+    public final boolean synpred258_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred183_InternalTableDSL_fragment(); // can never throw exception
+            synpred258_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -103857,11 +97705,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred261_InternalTableDSL() {
+    public final boolean synpred179_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred261_InternalTableDSL_fragment(); // can never throw exception
+            synpred179_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -103871,11 +97719,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred287_InternalTableDSL() {
+    public final boolean synpred283_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred287_InternalTableDSL_fragment(); // can never throw exception
+            synpred283_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -103885,11 +97733,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred316_InternalTableDSL() {
+    public final boolean synpred223_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred316_InternalTableDSL_fragment(); // can never throw exception
+            synpred223_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -103899,11 +97747,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred260_InternalTableDSL() {
+    public final boolean synpred266_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred260_InternalTableDSL_fragment(); // can never throw exception
+            synpred266_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -103913,11 +97761,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred278_InternalTableDSL() {
+    public final boolean synpred274_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred278_InternalTableDSL_fragment(); // can never throw exception
+            synpred274_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -103927,11 +97775,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred295_InternalTableDSL() {
+    public final boolean synpred257_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred295_InternalTableDSL_fragment(); // can never throw exception
+            synpred257_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -103941,11 +97789,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred308_InternalTableDSL() {
+    public final boolean synpred101_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred308_InternalTableDSL_fragment(); // can never throw exception
+            synpred101_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -103955,11 +97803,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred247_InternalTableDSL() {
+    public final boolean synpred187_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred247_InternalTableDSL_fragment(); // can never throw exception
+            synpred187_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -103969,11 +97817,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred286_InternalTableDSL() {
+    public final boolean synpred259_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred286_InternalTableDSL_fragment(); // can never throw exception
+            synpred259_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -103983,11 +97831,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred317_InternalTableDSL() {
+    public final boolean synpred265_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred317_InternalTableDSL_fragment(); // can never throw exception
+            synpred265_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -103997,11 +97845,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred239_InternalTableDSL() {
+    public final boolean synpred290_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred239_InternalTableDSL_fragment(); // can never throw exception
+            synpred290_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104011,11 +97859,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred313_InternalTableDSL() {
+    public final boolean synpred222_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred313_InternalTableDSL_fragment(); // can never throw exception
+            synpred222_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104025,11 +97873,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred264_InternalTableDSL() {
+    public final boolean synpred256_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred264_InternalTableDSL_fragment(); // can never throw exception
+            synpred256_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104039,11 +97887,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred280_InternalTableDSL() {
+    public final boolean synpred282_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred280_InternalTableDSL_fragment(); // can never throw exception
+            synpred282_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104053,11 +97901,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred38_InternalTableDSL() {
+    public final boolean synpred273_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred38_InternalTableDSL_fragment(); // can never throw exception
+            synpred273_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104067,11 +97915,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred40_InternalTableDSL() {
+    public final boolean synpred186_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred40_InternalTableDSL_fragment(); // can never throw exception
+            synpred186_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104081,11 +97929,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred298_InternalTableDSL() {
+    public final boolean synpred234_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred298_InternalTableDSL_fragment(); // can never throw exception
+            synpred234_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104095,11 +97943,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred305_InternalTableDSL() {
+    public final boolean synpred209_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred305_InternalTableDSL_fragment(); // can never throw exception
+            synpred209_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104109,11 +97957,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred66_InternalTableDSL() {
+    public final boolean synpred269_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred66_InternalTableDSL_fragment(); // can never throw exception
+            synpred269_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104123,11 +97971,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred105_InternalTableDSL() {
+    public final boolean synpred281_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred105_InternalTableDSL_fragment(); // can never throw exception
+            synpred281_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104137,11 +97985,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred272_InternalTableDSL() {
+    public final boolean synpred268_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred272_InternalTableDSL_fragment(); // can never throw exception
+            synpred268_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104151,11 +97999,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred241_InternalTableDSL() {
+    public final boolean synpred88_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred241_InternalTableDSL_fragment(); // can never throw exception
+            synpred88_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104165,11 +98013,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred267_InternalTableDSL() {
+    public final boolean synpred255_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred267_InternalTableDSL_fragment(); // can never throw exception
+            synpred255_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104179,11 +98027,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred236_InternalTableDSL() {
+    public final boolean synpred284_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred236_InternalTableDSL_fragment(); // can never throw exception
+            synpred284_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104193,11 +98041,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred275_InternalTableDSL() {
+    public final boolean synpred289_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred275_InternalTableDSL_fragment(); // can never throw exception
+            synpred289_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104207,11 +98055,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred302_InternalTableDSL() {
+    public final boolean synpred184_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred302_InternalTableDSL_fragment(); // can never throw exception
+            synpred184_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104221,11 +98069,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred258_InternalTableDSL() {
+    public final boolean synpred227_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred258_InternalTableDSL_fragment(); // can never throw exception
+            synpred227_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104235,11 +98083,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred179_InternalTableDSL() {
+    public final boolean synpred276_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred179_InternalTableDSL_fragment(); // can never throw exception
+            synpred276_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104249,11 +98097,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred266_InternalTableDSL() {
+    public final boolean synpred263_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred266_InternalTableDSL_fragment(); // can never throw exception
+            synpred263_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104263,11 +98111,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred231_InternalTableDSL() {
+    public final boolean synpred106_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred231_InternalTableDSL_fragment(); // can never throw exception
+            synpred106_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104277,11 +98125,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred274_InternalTableDSL() {
+    public final boolean synpred39_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred274_InternalTableDSL_fragment(); // can never throw exception
+            synpred39_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104291,11 +98139,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred310_InternalTableDSL() {
+    public final boolean synpred206_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred310_InternalTableDSL_fragment(); // can never throw exception
+            synpred206_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104305,11 +98153,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred101_InternalTableDSL() {
+    public final boolean synpred65_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred101_InternalTableDSL_fragment(); // can never throw exception
+            synpred65_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104319,11 +98167,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred187_InternalTableDSL() {
+    public final boolean synpred245_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred187_InternalTableDSL_fragment(); // can never throw exception
+            synpred245_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104333,11 +98181,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred290_InternalTableDSL() {
+    public final boolean synpred271_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred290_InternalTableDSL_fragment(); // can never throw exception
+            synpred271_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104347,11 +98195,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred225_InternalTableDSL() {
+    public final boolean synpred253_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred225_InternalTableDSL_fragment(); // can never throw exception
+            synpred253_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104361,11 +98209,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred299_InternalTableDSL() {
+    public final boolean synpred191_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred299_InternalTableDSL_fragment(); // can never throw exception
+            synpred191_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104375,11 +98223,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred304_InternalTableDSL() {
+    public final boolean synpred228_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred304_InternalTableDSL_fragment(); // can never throw exception
+            synpred228_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104389,11 +98237,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred256_InternalTableDSL() {
+    public final boolean synpred279_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred256_InternalTableDSL_fragment(); // can never throw exception
+            synpred279_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104403,11 +98251,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred282_InternalTableDSL() {
+    public final boolean synpred237_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred282_InternalTableDSL_fragment(); // can never throw exception
+            synpred237_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104417,11 +98265,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred300_InternalTableDSL() {
+    public final boolean synpred183_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred300_InternalTableDSL_fragment(); // can never throw exception
+            synpred183_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104431,11 +98279,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred294_InternalTableDSL() {
+    public final boolean synpred229_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred294_InternalTableDSL_fragment(); // can never throw exception
+            synpred229_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104445,11 +98293,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred309_InternalTableDSL() {
+    public final boolean synpred261_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred309_InternalTableDSL_fragment(); // can never throw exception
+            synpred261_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104459,11 +98307,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred268_InternalTableDSL() {
+    public final boolean synpred270_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred268_InternalTableDSL_fragment(); // can never throw exception
+            synpred270_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104473,11 +98321,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred248_InternalTableDSL() {
+    public final boolean synpred287_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred248_InternalTableDSL_fragment(); // can never throw exception
+            synpred287_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104487,11 +98335,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred189_InternalTableDSL() {
+    public final boolean synpred260_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred189_InternalTableDSL_fragment(); // can never throw exception
+            synpred260_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104501,11 +98349,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred284_InternalTableDSL() {
+    public final boolean synpred278_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred284_InternalTableDSL_fragment(); // can never throw exception
+            synpred278_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104515,11 +98363,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred319_InternalTableDSL() {
+    public final boolean synpred235_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred319_InternalTableDSL_fragment(); // can never throw exception
+            synpred235_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104529,11 +98377,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred289_InternalTableDSL() {
+    public final boolean synpred181_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred289_InternalTableDSL_fragment(); // can never throw exception
+            synpred181_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104543,11 +98391,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred314_InternalTableDSL() {
+    public final boolean synpred252_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred314_InternalTableDSL_fragment(); // can never throw exception
+            synpred252_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104557,11 +98405,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred297_InternalTableDSL() {
+    public final boolean synpred182_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred297_InternalTableDSL_fragment(); // can never throw exception
+            synpred182_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104571,11 +98419,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred306_InternalTableDSL() {
+    public final boolean synpred243_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred306_InternalTableDSL_fragment(); // can never throw exception
+            synpred243_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104585,11 +98433,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred276_InternalTableDSL() {
+    public final boolean synpred190_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred276_InternalTableDSL_fragment(); // can never throw exception
+            synpred190_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104599,11 +98447,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred292_InternalTableDSL() {
+    public final boolean synpred199_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred292_InternalTableDSL_fragment(); // can never throw exception
+            synpred199_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104613,11 +98461,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred211_InternalTableDSL() {
+    public final boolean synpred286_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred211_InternalTableDSL_fragment(); // can never throw exception
+            synpred286_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104627,11 +98475,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred65_InternalTableDSL() {
+    public final boolean synpred185_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred65_InternalTableDSL_fragment(); // can never throw exception
+            synpred185_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104641,11 +98489,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred296_InternalTableDSL() {
+    public final boolean synpred239_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred296_InternalTableDSL_fragment(); // can never throw exception
+            synpred239_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104655,11 +98503,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred307_InternalTableDSL() {
+    public final boolean synpred177_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred307_InternalTableDSL_fragment(); // can never throw exception
+            synpred177_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104669,11 +98517,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred237_InternalTableDSL() {
+    public final boolean synpred277_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred237_InternalTableDSL_fragment(); // can never throw exception
+            synpred277_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104683,11 +98531,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred229_InternalTableDSL() {
+    public final boolean synpred264_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred229_InternalTableDSL_fragment(); // can never throw exception
+            synpred264_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104697,11 +98545,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred270_InternalTableDSL() {
+    public final boolean synpred280_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred270_InternalTableDSL_fragment(); // can never throw exception
+            synpred280_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104711,11 +98559,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred201_InternalTableDSL() {
+    public final boolean synpred180_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred201_InternalTableDSL_fragment(); // can never throw exception
+            synpred180_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104725,11 +98573,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred181_InternalTableDSL() {
+    public final boolean synpred251_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred181_InternalTableDSL_fragment(); // can never throw exception
+            synpred251_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104739,11 +98587,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred238_InternalTableDSL() {
+    public final boolean synpred38_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred238_InternalTableDSL_fragment(); // can never throw exception
+            synpred38_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104753,11 +98601,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred182_InternalTableDSL() {
+    public final boolean synpred40_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred182_InternalTableDSL_fragment(); // can never throw exception
+            synpred40_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104767,11 +98615,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred190_InternalTableDSL() {
+    public final boolean synpred112_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred190_InternalTableDSL_fragment(); // can never throw exception
+            synpred112_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104781,11 +98629,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred185_InternalTableDSL() {
+    public final boolean synpred66_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred185_InternalTableDSL_fragment(); // can never throw exception
+            synpred66_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104795,11 +98643,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred277_InternalTableDSL() {
+    public final boolean synpred105_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred277_InternalTableDSL_fragment(); // can never throw exception
+            synpred105_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104809,11 +98657,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred193_InternalTableDSL() {
+    public final boolean synpred285_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred193_InternalTableDSL_fragment(); // can never throw exception
+            synpred285_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104823,11 +98671,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred293_InternalTableDSL() {
+    public final boolean synpred79_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred293_InternalTableDSL_fragment(); // can never throw exception
+            synpred79_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104837,11 +98685,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred112_InternalTableDSL() {
+    public final boolean synpred272_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred112_InternalTableDSL_fragment(); // can never throw exception
+            synpred272_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104851,11 +98699,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred312_InternalTableDSL() {
+    public final boolean synpred246_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred312_InternalTableDSL_fragment(); // can never throw exception
+            synpred246_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104865,11 +98713,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred285_InternalTableDSL() {
+    public final boolean synpred254_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred285_InternalTableDSL_fragment(); // can never throw exception
+            synpred254_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104879,11 +98727,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred318_InternalTableDSL() {
+    public final boolean synpred87_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred318_InternalTableDSL_fragment(); // can never throw exception
+            synpred87_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104893,11 +98741,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred79_InternalTableDSL() {
+    public final boolean synpred267_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred79_InternalTableDSL_fragment(); // can never throw exception
+            synpred267_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104907,11 +98755,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred254_InternalTableDSL() {
+    public final boolean synpred262_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred254_InternalTableDSL_fragment(); // can never throw exception
+            synpred262_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104921,11 +98769,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred87_InternalTableDSL() {
+    public final boolean synpred236_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred87_InternalTableDSL_fragment(); // can never throw exception
+            synpred236_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104935,11 +98783,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred262_InternalTableDSL() {
+    public final boolean synpred275_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred262_InternalTableDSL_fragment(); // can never throw exception
+            synpred275_InternalTableDSL_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -104963,20 +98811,6 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         state.failed=false;
         return success;
     }
-    public final boolean synpred315_InternalTableDSL() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred315_InternalTableDSL_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
     public final boolean synpred188_InternalTableDSL() {
         state.backtracking++;
         int start = input.mark();
@@ -105004,35 +98838,35 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     protected DFA38 dfa38 = new DFA38(this);
     protected DFA43 dfa43 = new DFA43(this);
     protected DFA46 dfa46 = new DFA46(this);
-    protected DFA101 dfa101 = new DFA101(this);
-    protected DFA107 dfa107 = new DFA107(this);
-    protected DFA114 dfa114 = new DFA114(this);
-    protected DFA115 dfa115 = new DFA115(this);
-    protected DFA123 dfa123 = new DFA123(this);
-    protected DFA133 dfa133 = new DFA133(this);
-    protected DFA146 dfa146 = new DFA146(this);
-    protected DFA147 dfa147 = new DFA147(this);
+    protected DFA99 dfa99 = new DFA99(this);
+    protected DFA105 dfa105 = new DFA105(this);
+    protected DFA112 dfa112 = new DFA112(this);
+    protected DFA113 dfa113 = new DFA113(this);
+    protected DFA121 dfa121 = new DFA121(this);
+    protected DFA131 dfa131 = new DFA131(this);
+    protected DFA144 dfa144 = new DFA144(this);
+    protected DFA145 dfa145 = new DFA145(this);
+    protected DFA149 dfa149 = new DFA149(this);
+    protected DFA150 dfa150 = new DFA150(this);
     protected DFA151 dfa151 = new DFA151(this);
-    protected DFA152 dfa152 = new DFA152(this);
-    protected DFA153 dfa153 = new DFA153(this);
-    protected DFA158 dfa158 = new DFA158(this);
-    protected DFA167 dfa167 = new DFA167(this);
-    protected DFA170 dfa170 = new DFA170(this);
+    protected DFA156 dfa156 = new DFA156(this);
+    protected DFA165 dfa165 = new DFA165(this);
+    protected DFA168 dfa168 = new DFA168(this);
     static final String dfa_1s = "\10\uffff";
-    static final String dfa_2s = "\2\uffff\1\5\4\uffff\1\5";
-    static final String dfa_3s = "\1\5\1\uffff\1\56\1\uffff\1\5\2\uffff\1\56";
-    static final String dfa_4s = "\1\u00b3\1\uffff\1\u0085\1\uffff\1\47\2\uffff\1\u0085";
-    static final String dfa_5s = "\1\uffff\1\1\1\uffff\1\4\1\uffff\1\2\1\3\1\uffff";
+    static final String dfa_2s = "\2\uffff\1\5\3\uffff\1\5\1\uffff";
+    static final String dfa_3s = "\1\5\1\uffff\1\56\1\uffff\1\5\1\uffff\1\56\1\uffff";
+    static final String dfa_4s = "\1\u00b0\1\uffff\1\u0085\1\uffff\1\47\1\uffff\1\u0085\1\uffff";
+    static final String dfa_5s = "\1\uffff\1\1\1\uffff\1\4\1\uffff\1\2\1\uffff\1\3";
     static final String dfa_6s = "\10\uffff}>";
     static final String[] dfa_7s = {
-            "\1\2\53\uffff\1\1\u0081\uffff\1\3",
+            "\1\2\53\uffff\1\1\176\uffff\1\3",
             "",
             "\1\4\3\uffff\1\5\27\uffff\1\5\72\uffff\1\5",
             "",
-            "\1\7\41\uffff\1\6",
+            "\1\6\41\uffff\1\7",
             "",
-            "",
-            "\1\4\3\uffff\1\5\27\uffff\1\5\72\uffff\1\5"
+            "\1\4\3\uffff\1\5\27\uffff\1\5\72\uffff\1\5",
+            ""
     };
 
     static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
@@ -105062,11 +98896,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     }
     static final String dfa_8s = "\43\uffff";
     static final String dfa_9s = "\1\4\1\0\41\uffff";
-    static final String dfa_10s = "\1\u00b8\1\0\41\uffff";
+    static final String dfa_10s = "\1\u00b5\1\0\41\uffff";
     static final String dfa_11s = "\2\uffff\1\2\37\uffff\1\1";
     static final String dfa_12s = "\1\uffff\1\0\41\uffff}>";
     static final String[] dfa_13s = {
-            "\1\2\1\1\3\2\12\uffff\2\2\13\uffff\1\2\12\uffff\1\2\4\uffff\6\2\25\uffff\1\2\72\uffff\2\2\3\uffff\2\2\1\uffff\1\2\1\uffff\1\2\2\uffff\11\2\1\uffff\1\2\32\uffff\1\2",
+            "\1\2\1\1\3\2\12\uffff\2\2\13\uffff\1\2\12\uffff\1\2\4\uffff\6\2\25\uffff\1\2\72\uffff\2\2\3\uffff\2\2\1\uffff\1\2\1\uffff\1\2\2\uffff\11\2\1\uffff\1\2\27\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -105154,7 +98988,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
     }
     static final String[] dfa_14s = {
-            "\5\2\12\uffff\2\2\13\uffff\1\2\12\uffff\1\2\4\uffff\6\2\25\uffff\1\2\72\uffff\2\2\3\uffff\1\1\1\2\1\uffff\1\2\1\uffff\1\2\2\uffff\11\2\1\uffff\1\2\32\uffff\1\2",
+            "\5\2\12\uffff\2\2\13\uffff\1\2\12\uffff\1\2\4\uffff\6\2\25\uffff\1\2\72\uffff\2\2\3\uffff\1\1\1\2\1\uffff\1\2\1\uffff\1\2\2\uffff\11\2\1\uffff\1\2\27\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -105325,19 +99159,19 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     static final String dfa_21s = "\12\uffff";
     static final String dfa_22s = "\4\uffff\5\3\1\uffff";
     static final String dfa_23s = "\1\56\2\5\1\uffff\5\4\1\uffff";
-    static final String dfa_24s = "\1\u00b5\2\64\1\uffff\5\u00b8\1\uffff";
+    static final String dfa_24s = "\1\u00b2\2\64\1\uffff\5\u00b5\1\uffff";
     static final String dfa_25s = "\3\uffff\1\2\5\uffff\1\1";
     static final String dfa_26s = "\12\uffff}>";
     static final String[] dfa_27s = {
-            "\1\1\u0085\uffff\1\2\1\3",
+            "\1\1\u0082\uffff\1\2\1\3",
             "\1\4\32\uffff\1\3\17\uffff\1\5\1\6\1\7\1\10\1\3",
             "\1\4\32\uffff\1\3\17\uffff\1\5\1\6\1\7\1\10\1\3",
             "",
-            "\5\3\6\uffff\1\11\2\3\1\uffff\43\3\16\uffff\1\3\6\uffff\2\3\1\uffff\1\3\66\uffff\1\3\1\uffff\30\3\25\uffff\2\3\1\uffff\2\3",
-            "\5\3\6\uffff\1\11\2\3\1\uffff\43\3\16\uffff\1\3\6\uffff\2\3\1\uffff\1\3\66\uffff\1\3\1\uffff\30\3\25\uffff\2\3\1\uffff\2\3",
-            "\5\3\6\uffff\1\11\2\3\1\uffff\43\3\16\uffff\1\3\6\uffff\2\3\1\uffff\1\3\66\uffff\1\3\1\uffff\30\3\25\uffff\2\3\1\uffff\2\3",
-            "\5\3\6\uffff\1\11\2\3\1\uffff\43\3\16\uffff\1\3\6\uffff\2\3\1\uffff\1\3\66\uffff\1\3\1\uffff\30\3\25\uffff\2\3\1\uffff\2\3",
-            "\5\3\6\uffff\1\11\2\3\1\uffff\43\3\16\uffff\1\3\6\uffff\2\3\1\uffff\1\3\66\uffff\1\3\1\uffff\30\3\25\uffff\2\3\1\uffff\2\3",
+            "\5\3\6\uffff\1\11\2\3\1\uffff\43\3\16\uffff\1\3\6\uffff\2\3\1\uffff\1\3\66\uffff\1\3\1\uffff\30\3\22\uffff\2\3\1\uffff\2\3",
+            "\5\3\6\uffff\1\11\2\3\1\uffff\43\3\16\uffff\1\3\6\uffff\2\3\1\uffff\1\3\66\uffff\1\3\1\uffff\30\3\22\uffff\2\3\1\uffff\2\3",
+            "\5\3\6\uffff\1\11\2\3\1\uffff\43\3\16\uffff\1\3\6\uffff\2\3\1\uffff\1\3\66\uffff\1\3\1\uffff\30\3\22\uffff\2\3\1\uffff\2\3",
+            "\5\3\6\uffff\1\11\2\3\1\uffff\43\3\16\uffff\1\3\6\uffff\2\3\1\uffff\1\3\66\uffff\1\3\1\uffff\30\3\22\uffff\2\3\1\uffff\2\3",
+            "\5\3\6\uffff\1\11\2\3\1\uffff\43\3\16\uffff\1\3\6\uffff\2\3\1\uffff\1\3\66\uffff\1\3\1\uffff\30\3\22\uffff\2\3\1\uffff\2\3",
             ""
     };
 
@@ -105367,11 +99201,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
     }
     static final String dfa_28s = "\1\4\2\0\40\uffff";
-    static final String dfa_29s = "\1\u00b8\2\0\40\uffff";
+    static final String dfa_29s = "\1\u00b5\2\0\40\uffff";
     static final String dfa_30s = "\3\uffff\1\1\1\uffff\1\2\35\uffff";
     static final String dfa_31s = "\1\uffff\1\0\1\1\40\uffff}>";
     static final String[] dfa_32s = {
-            "\1\5\1\1\3\5\12\uffff\2\5\13\uffff\1\5\3\uffff\1\3\6\uffff\1\5\4\uffff\6\5\25\uffff\1\5\73\uffff\1\2\3\uffff\2\5\1\uffff\1\5\1\uffff\1\5\2\uffff\11\5\1\uffff\1\5\30\uffff\1\3\1\uffff\1\5",
+            "\1\5\1\1\3\5\12\uffff\2\5\13\uffff\1\5\3\uffff\1\3\6\uffff\1\5\4\uffff\6\5\25\uffff\1\5\73\uffff\1\2\3\uffff\2\5\1\uffff\1\5\1\uffff\1\5\2\uffff\11\5\1\uffff\1\5\25\uffff\1\3\1\uffff\1\5",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -105473,11 +99307,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     }
     static final String dfa_33s = "\40\uffff";
     static final String dfa_34s = "\1\4\26\uffff\1\0\10\uffff";
-    static final String dfa_35s = "\1\u00b8\26\uffff\1\0\10\uffff";
+    static final String dfa_35s = "\1\u00b5\26\uffff\1\0\10\uffff";
     static final String dfa_36s = "\1\uffff\1\1\1\2\1\3\1\4\1\5\6\uffff\1\6\11\uffff\1\7\1\uffff\1\12\1\13\1\14\1\15\1\16\1\17\1\10\1\11";
     static final String dfa_37s = "\27\uffff\1\0\10\uffff}>";
     static final String[] dfa_38s = {
-            "\1\14\1\5\3\14\27\uffff\1\5\17\uffff\5\5\1\14\25\uffff\1\2\73\uffff\1\35\3\uffff\2\14\1\uffff\1\26\1\uffff\1\3\2\uffff\1\27\1\30\1\31\1\1\2\14\1\32\1\33\1\34\1\uffff\1\4\32\uffff\1\14",
+            "\1\14\1\5\3\14\27\uffff\1\5\17\uffff\5\5\1\14\25\uffff\1\2\73\uffff\1\35\3\uffff\2\14\1\uffff\1\26\1\uffff\1\3\2\uffff\1\27\1\30\1\31\1\1\2\14\1\32\1\33\1\34\1\uffff\1\4\27\uffff\1\14",
             "",
             "",
             "",
@@ -105562,7 +99396,7 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
         }
     }
     static final String[] dfa_39s = {
-            "\5\2\12\uffff\2\2\13\uffff\1\2\3\uffff\1\2\6\uffff\1\2\4\uffff\6\2\25\uffff\1\2\73\uffff\1\1\3\uffff\2\2\1\uffff\1\2\1\uffff\1\2\2\uffff\11\2\1\uffff\1\2\32\uffff\1\2",
+            "\5\2\12\uffff\2\2\13\uffff\1\2\3\uffff\1\2\6\uffff\1\2\4\uffff\6\2\25\uffff\1\2\73\uffff\1\1\3\uffff\2\2\1\uffff\1\2\1\uffff\1\2\2\uffff\11\2\1\uffff\1\2\27\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -105763,11 +99597,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     }
     static final String dfa_40s = "\1\10\11\uffff";
     static final String dfa_41s = "\1\4\7\0\2\uffff";
-    static final String dfa_42s = "\1\u00b8\7\0\2\uffff";
+    static final String dfa_42s = "\1\u00b5\7\0\2\uffff";
     static final String dfa_43s = "\10\uffff\1\2\1\1";
-    static final String dfa_44s = "\1\uffff\1\5\1\2\1\1\1\0\1\6\1\3\1\4\2\uffff}>";
+    static final String dfa_44s = "\1\uffff\1\1\1\5\1\6\1\0\1\2\1\4\1\3\2\uffff}>";
     static final String[] dfa_45s = {
-            "\5\10\7\uffff\2\10\1\uffff\2\10\1\1\1\2\1\3\1\4\1\5\5\10\1\7\1\6\25\10\16\uffff\1\10\6\uffff\2\10\1\uffff\1\10\66\uffff\1\10\1\uffff\30\10\25\uffff\2\10\1\uffff\2\10",
+            "\5\10\7\uffff\2\10\1\uffff\2\10\1\1\1\2\1\3\1\4\1\5\5\10\1\7\1\6\25\10\16\uffff\1\10\6\uffff\2\10\1\uffff\1\10\66\uffff\1\10\1\uffff\30\10\22\uffff\2\10\1\uffff\2\10",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -105785,11 +99619,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     static final short[] dfa_44 = DFA.unpackEncodedString(dfa_44s);
     static final short[][] dfa_45 = unpackEncodedStringArray(dfa_45s);
 
-    class DFA101 extends DFA {
+    class DFA99 extends DFA {
 
-        public DFA101(BaseRecognizer recognizer) {
+        public DFA99(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 101;
+            this.decisionNumber = 99;
             this.eot = dfa_21;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -105799,132 +99633,132 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             this.transition = dfa_45;
         }
         public String getDescription() {
-            return "13884:2: ( rule__XAssignment__Group_1_1__0 )?";
+            return "13263:2: ( rule__XAssignment__Group_1_1__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA101_4 = input.LA(1);
+                        int LA99_4 = input.LA(1);
 
                          
-                        int index101_4 = input.index();
+                        int index99_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred179_InternalTableDSL()) ) {s = 9;}
+                        if ( (synpred177_InternalTableDSL()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index101_4);
+                        input.seek(index99_4);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA101_3 = input.LA(1);
+                        int LA99_1 = input.LA(1);
 
                          
-                        int index101_3 = input.index();
+                        int index99_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred179_InternalTableDSL()) ) {s = 9;}
+                        if ( (synpred177_InternalTableDSL()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index101_3);
+                        input.seek(index99_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA101_2 = input.LA(1);
+                        int LA99_5 = input.LA(1);
 
                          
-                        int index101_2 = input.index();
+                        int index99_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred179_InternalTableDSL()) ) {s = 9;}
+                        if ( (synpred177_InternalTableDSL()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index101_2);
+                        input.seek(index99_5);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA101_6 = input.LA(1);
+                        int LA99_7 = input.LA(1);
 
                          
-                        int index101_6 = input.index();
+                        int index99_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred179_InternalTableDSL()) ) {s = 9;}
+                        if ( (synpred177_InternalTableDSL()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index101_6);
+                        input.seek(index99_7);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA101_7 = input.LA(1);
+                        int LA99_6 = input.LA(1);
 
                          
-                        int index101_7 = input.index();
+                        int index99_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred179_InternalTableDSL()) ) {s = 9;}
+                        if ( (synpred177_InternalTableDSL()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index101_7);
+                        input.seek(index99_6);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA101_1 = input.LA(1);
+                        int LA99_2 = input.LA(1);
 
                          
-                        int index101_1 = input.index();
+                        int index99_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred179_InternalTableDSL()) ) {s = 9;}
+                        if ( (synpred177_InternalTableDSL()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index101_1);
+                        input.seek(index99_2);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA101_5 = input.LA(1);
+                        int LA99_3 = input.LA(1);
 
                          
-                        int index101_5 = input.index();
+                        int index99_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred179_InternalTableDSL()) ) {s = 9;}
+                        if ( (synpred177_InternalTableDSL()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index101_5);
+                        input.seek(index99_3);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 101, _s, input);
+                new NoViableAltException(getDescription(), 99, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String dfa_46s = "\1\1\12\uffff";
     static final String dfa_47s = "\1\4\1\uffff\10\0\1\uffff";
-    static final String dfa_48s = "\1\u00b8\1\uffff\10\0\1\uffff";
+    static final String dfa_48s = "\1\u00b5\1\uffff\10\0\1\uffff";
     static final String dfa_49s = "\1\uffff\1\2\10\uffff\1\1";
-    static final String dfa_50s = "\2\uffff\1\2\1\6\1\7\1\0\1\3\1\4\1\5\1\1\1\uffff}>";
+    static final String dfa_50s = "\2\uffff\1\6\1\4\1\7\1\2\1\1\1\0\1\5\1\3\1\uffff}>";
     static final String[] dfa_51s = {
-            "\5\1\7\uffff\2\1\1\uffff\14\1\1\3\1\2\1\4\1\5\1\6\1\7\1\10\1\11\17\1\16\uffff\1\1\6\uffff\2\1\1\uffff\1\1\66\uffff\1\1\1\uffff\30\1\25\uffff\2\1\1\uffff\2\1",
+            "\5\1\7\uffff\2\1\1\uffff\14\1\1\3\1\2\1\4\1\5\1\6\1\7\1\10\1\11\17\1\16\uffff\1\1\6\uffff\2\1\1\uffff\1\1\66\uffff\1\1\1\uffff\30\1\22\uffff\2\1\1\uffff\2\1",
             "",
             "\1\uffff",
             "\1\uffff",
@@ -105943,11 +99777,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     static final short[] dfa_50 = DFA.unpackEncodedString(dfa_50s);
     static final short[][] dfa_51 = unpackEncodedStringArray(dfa_51s);
 
-    class DFA107 extends DFA {
+    class DFA105 extends DFA {
 
-        public DFA107(BaseRecognizer recognizer) {
+        public DFA105(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 107;
+            this.decisionNumber = 105;
             this.eot = dfa_15;
             this.eof = dfa_46;
             this.min = dfa_47;
@@ -105957,136 +99791,136 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             this.transition = dfa_51;
         }
         public String getDescription() {
-            return "()* loopback of 15180:2: ( rule__XOtherOperatorExpression__Group_1__0 )*";
+            return "()* loopback of 14559:2: ( rule__XOtherOperatorExpression__Group_1__0 )*";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA107_5 = input.LA(1);
+                        int LA105_7 = input.LA(1);
 
                          
-                        int index107_5 = input.index();
+                        int index105_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred185_InternalTableDSL()) ) {s = 10;}
+                        if ( (synpred183_InternalTableDSL()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index107_5);
+                        input.seek(index105_7);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA107_9 = input.LA(1);
+                        int LA105_6 = input.LA(1);
 
                          
-                        int index107_9 = input.index();
+                        int index105_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred185_InternalTableDSL()) ) {s = 10;}
+                        if ( (synpred183_InternalTableDSL()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index107_9);
+                        input.seek(index105_6);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA107_2 = input.LA(1);
+                        int LA105_5 = input.LA(1);
 
                          
-                        int index107_2 = input.index();
+                        int index105_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred185_InternalTableDSL()) ) {s = 10;}
+                        if ( (synpred183_InternalTableDSL()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index107_2);
+                        input.seek(index105_5);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA107_6 = input.LA(1);
+                        int LA105_9 = input.LA(1);
 
                          
-                        int index107_6 = input.index();
+                        int index105_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred185_InternalTableDSL()) ) {s = 10;}
+                        if ( (synpred183_InternalTableDSL()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index107_6);
+                        input.seek(index105_9);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA107_7 = input.LA(1);
+                        int LA105_3 = input.LA(1);
 
                          
-                        int index107_7 = input.index();
+                        int index105_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred185_InternalTableDSL()) ) {s = 10;}
+                        if ( (synpred183_InternalTableDSL()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index107_7);
+                        input.seek(index105_3);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA107_8 = input.LA(1);
+                        int LA105_8 = input.LA(1);
 
                          
-                        int index107_8 = input.index();
+                        int index105_8 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred185_InternalTableDSL()) ) {s = 10;}
+                        if ( (synpred183_InternalTableDSL()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index107_8);
+                        input.seek(index105_8);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA107_3 = input.LA(1);
+                        int LA105_2 = input.LA(1);
 
                          
-                        int index107_3 = input.index();
+                        int index105_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred185_InternalTableDSL()) ) {s = 10;}
+                        if ( (synpred183_InternalTableDSL()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index107_3);
+                        input.seek(index105_2);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA107_4 = input.LA(1);
+                        int LA105_4 = input.LA(1);
 
                          
-                        int index107_4 = input.index();
+                        int index105_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred185_InternalTableDSL()) ) {s = 10;}
+                        if ( (synpred183_InternalTableDSL()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index107_4);
+                        input.seek(index105_4);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 107, _s, input);
+                new NoViableAltException(getDescription(), 105, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -106094,11 +99928,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     static final String dfa_52s = "\116\uffff";
     static final String dfa_53s = "\1\2\115\uffff";
     static final String dfa_54s = "\1\4\1\0\114\uffff";
-    static final String dfa_55s = "\1\u00b8\1\0\114\uffff";
+    static final String dfa_55s = "\1\u00b5\1\0\114\uffff";
     static final String dfa_56s = "\2\uffff\1\2\112\uffff\1\1";
     static final String dfa_57s = "\1\uffff\1\0\114\uffff}>";
     static final String[] dfa_58s = {
-            "\5\2\7\uffff\2\2\1\uffff\43\2\16\uffff\1\2\6\uffff\2\2\1\uffff\1\2\66\uffff\1\2\1\uffff\1\1\27\2\25\uffff\2\2\1\uffff\2\2",
+            "\5\2\7\uffff\2\2\1\uffff\43\2\16\uffff\1\2\6\uffff\2\2\1\uffff\1\2\66\uffff\1\2\1\uffff\1\1\27\2\22\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -106186,11 +100020,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     static final short[] dfa_57 = DFA.unpackEncodedString(dfa_57s);
     static final short[][] dfa_58 = unpackEncodedStringArray(dfa_58s);
 
-    class DFA114 extends DFA {
+    class DFA112 extends DFA {
 
-        public DFA114(BaseRecognizer recognizer) {
+        public DFA112(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 114;
+            this.decisionNumber = 112;
             this.eot = dfa_52;
             this.eof = dfa_53;
             this.min = dfa_54;
@@ -106200,37 +100034,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             this.transition = dfa_58;
         }
         public String getDescription() {
-            return "16774:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?";
+            return "16153:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA114_1 = input.LA(1);
+                        int LA112_1 = input.LA(1);
 
                          
-                        int index114_1 = input.index();
+                        int index112_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred192_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred190_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index114_1);
+                        input.seek(index112_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 114, _s, input);
+                new NoViableAltException(getDescription(), 112, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String[] dfa_59s = {
-            "\5\2\7\uffff\2\2\1\uffff\43\2\16\uffff\1\2\6\uffff\2\2\1\uffff\1\2\66\uffff\1\2\1\uffff\5\2\1\1\22\2\25\uffff\2\2\1\uffff\2\2",
+            "\5\2\7\uffff\2\2\1\uffff\43\2\16\uffff\1\2\6\uffff\2\2\1\uffff\1\2\66\uffff\1\2\1\uffff\5\2\1\1\22\2\22\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -106311,11 +100145,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     };
     static final short[][] dfa_59 = unpackEncodedStringArray(dfa_59s);
 
-    class DFA115 extends DFA {
+    class DFA113 extends DFA {
 
-        public DFA115(BaseRecognizer recognizer) {
+        public DFA113(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 115;
+            this.decisionNumber = 113;
             this.eot = dfa_52;
             this.eof = dfa_53;
             this.min = dfa_54;
@@ -106325,42 +100159,42 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             this.transition = dfa_59;
         }
         public String getDescription() {
-            return "16800:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?";
+            return "16179:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA115_1 = input.LA(1);
+                        int LA113_1 = input.LA(1);
 
                          
-                        int index115_1 = input.index();
+                        int index113_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred193_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred191_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index115_1);
+                        input.seek(index113_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 115, _s, input);
+                new NoViableAltException(getDescription(), 113, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String dfa_60s = "\46\uffff";
     static final String dfa_61s = "\1\4\2\0\43\uffff";
-    static final String dfa_62s = "\1\u00b8\2\0\43\uffff";
+    static final String dfa_62s = "\1\u00b5\2\0\43\uffff";
     static final String dfa_63s = "\3\uffff\1\1\1\uffff\1\2\40\uffff";
     static final String dfa_64s = "\1\uffff\1\0\1\1\43\uffff}>";
     static final String[] dfa_65s = {
-            "\1\5\1\1\3\5\12\uffff\2\5\13\uffff\1\5\3\uffff\1\3\6\uffff\1\5\3\uffff\7\5\25\uffff\1\5\73\uffff\1\2\2\uffff\3\5\1\uffff\1\5\1\uffff\1\5\2\uffff\11\5\1\uffff\1\5\30\uffff\1\3\2\5",
+            "\1\5\1\1\3\5\12\uffff\2\5\13\uffff\1\5\3\uffff\1\3\6\uffff\1\5\3\uffff\7\5\25\uffff\1\5\73\uffff\1\2\2\uffff\3\5\1\uffff\1\5\1\uffff\1\5\2\uffff\11\5\1\uffff\1\5\25\uffff\1\3\2\5",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -106407,11 +100241,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     static final short[] dfa_64 = DFA.unpackEncodedString(dfa_64s);
     static final short[][] dfa_65 = unpackEncodedStringArray(dfa_65s);
 
-    class DFA123 extends DFA {
+    class DFA121 extends DFA {
 
-        public DFA123(BaseRecognizer recognizer) {
+        public DFA121(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 123;
+            this.decisionNumber = 121;
             this.eot = dfa_60;
             this.eof = dfa_60;
             this.min = dfa_61;
@@ -106421,57 +100255,57 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             this.transition = dfa_65;
         }
         public String getDescription() {
-            return "17773:2: ( rule__XClosure__Group_1__0 )?";
+            return "17152:2: ( rule__XClosure__Group_1__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA123_1 = input.LA(1);
+                        int LA121_1 = input.LA(1);
 
                          
-                        int index123_1 = input.index();
+                        int index121_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred201_InternalTableDSL()) ) {s = 3;}
+                        if ( (synpred199_InternalTableDSL()) ) {s = 3;}
 
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index123_1);
+                        input.seek(index121_1);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA123_2 = input.LA(1);
+                        int LA121_2 = input.LA(1);
 
                          
-                        int index123_2 = input.index();
+                        int index121_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred201_InternalTableDSL()) ) {s = 3;}
+                        if ( (synpred199_InternalTableDSL()) ) {s = 3;}
 
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index123_2);
+                        input.seek(index121_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 123, _s, input);
+                new NoViableAltException(getDescription(), 121, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String dfa_66s = "\42\uffff";
     static final String dfa_67s = "\1\4\2\0\37\uffff";
-    static final String dfa_68s = "\1\u00b8\2\0\37\uffff";
+    static final String dfa_68s = "\1\u00b5\2\0\37\uffff";
     static final String dfa_69s = "\3\uffff\1\1\1\2\35\uffff";
     static final String dfa_70s = "\1\uffff\1\0\1\1\37\uffff}>";
     static final String[] dfa_71s = {
-            "\1\4\1\1\3\4\12\uffff\2\4\13\uffff\1\4\3\uffff\1\3\6\uffff\1\4\4\uffff\6\4\25\uffff\1\4\73\uffff\1\2\3\uffff\2\4\1\uffff\1\4\1\uffff\1\4\2\uffff\11\4\1\uffff\1\4\32\uffff\1\4",
+            "\1\4\1\1\3\4\12\uffff\2\4\13\uffff\1\4\3\uffff\1\3\6\uffff\1\4\4\uffff\6\4\25\uffff\1\4\73\uffff\1\2\3\uffff\2\4\1\uffff\1\4\1\uffff\1\4\2\uffff\11\4\1\uffff\1\4\27\uffff\1\4",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -106514,11 +100348,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     static final short[] dfa_70 = DFA.unpackEncodedString(dfa_70s);
     static final short[][] dfa_71 = unpackEncodedStringArray(dfa_71s);
 
-    class DFA133 extends DFA {
+    class DFA131 extends DFA {
 
-        public DFA133(BaseRecognizer recognizer) {
+        public DFA131(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 133;
+            this.decisionNumber = 131;
             this.eot = dfa_66;
             this.eof = dfa_66;
             this.min = dfa_67;
@@ -106528,56 +100362,56 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             this.transition = dfa_71;
         }
         public String getDescription() {
-            return "19204:2: ( rule__XSwitchExpression__Group_2_1_0__0 )?";
+            return "18583:2: ( rule__XSwitchExpression__Group_2_1_0__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA133_1 = input.LA(1);
+                        int LA131_1 = input.LA(1);
 
                          
-                        int index133_1 = input.index();
+                        int index131_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred211_InternalTableDSL()) ) {s = 3;}
+                        if ( (synpred209_InternalTableDSL()) ) {s = 3;}
 
                         else if ( (true) ) {s = 4;}
 
                          
-                        input.seek(index133_1);
+                        input.seek(index131_1);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA133_2 = input.LA(1);
+                        int LA131_2 = input.LA(1);
 
                          
-                        int index133_2 = input.index();
+                        int index131_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred211_InternalTableDSL()) ) {s = 3;}
+                        if ( (synpred209_InternalTableDSL()) ) {s = 3;}
 
                         else if ( (true) ) {s = 4;}
 
                          
-                        input.seek(index133_2);
+                        input.seek(index131_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 133, _s, input);
+                new NoViableAltException(getDescription(), 131, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA146 extends DFA {
+    class DFA144 extends DFA {
 
-        public DFA146(BaseRecognizer recognizer) {
+        public DFA144(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 146;
+            this.decisionNumber = 144;
             this.eot = dfa_52;
             this.eof = dfa_53;
             this.min = dfa_54;
@@ -106587,41 +100421,41 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             this.transition = dfa_58;
         }
         public String getDescription() {
-            return "21337:2: ( rule__XFeatureCall__Group_3__0 )?";
+            return "20716:2: ( rule__XFeatureCall__Group_3__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA146_1 = input.LA(1);
+                        int LA144_1 = input.LA(1);
 
                          
-                        int index146_1 = input.index();
+                        int index144_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred224_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred222_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index146_1);
+                        input.seek(index144_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 146, _s, input);
+                new NoViableAltException(getDescription(), 144, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA147 extends DFA {
+    class DFA145 extends DFA {
 
-        public DFA147(BaseRecognizer recognizer) {
+        public DFA145(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 147;
+            this.decisionNumber = 145;
             this.eot = dfa_52;
             this.eof = dfa_53;
             this.min = dfa_54;
@@ -106631,37 +100465,37 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             this.transition = dfa_59;
         }
         public String getDescription() {
-            return "21363:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?";
+            return "20742:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA147_1 = input.LA(1);
+                        int LA145_1 = input.LA(1);
 
                          
-                        int index147_1 = input.index();
+                        int index145_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred225_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred223_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index147_1);
+                        input.seek(index145_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 147, _s, input);
+                new NoViableAltException(getDescription(), 145, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String[] dfa_72s = {
-            "\5\2\7\uffff\2\2\1\uffff\15\2\1\1\25\2\16\uffff\1\2\6\uffff\2\2\1\uffff\1\2\66\uffff\1\2\1\uffff\30\2\25\uffff\2\2\1\uffff\2\2",
+            "\5\2\7\uffff\2\2\1\uffff\15\2\1\1\25\2\16\uffff\1\2\6\uffff\2\2\1\uffff\1\2\66\uffff\1\2\1\uffff\30\2\22\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -106742,11 +100576,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     };
     static final short[][] dfa_72 = unpackEncodedStringArray(dfa_72s);
 
-    class DFA151 extends DFA {
+    class DFA149 extends DFA {
 
-        public DFA151(BaseRecognizer recognizer) {
+        public DFA149(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 151;
+            this.decisionNumber = 149;
             this.eot = dfa_52;
             this.eof = dfa_53;
             this.min = dfa_54;
@@ -106756,41 +100590,41 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             this.transition = dfa_72;
         }
         public String getDescription() {
-            return "21823:2: ( rule__XConstructorCall__Group_3__0 )?";
+            return "21202:2: ( rule__XConstructorCall__Group_3__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA151_1 = input.LA(1);
+                        int LA149_1 = input.LA(1);
 
                          
-                        int index151_1 = input.index();
+                        int index149_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred229_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred227_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index151_1);
+                        input.seek(index149_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 151, _s, input);
+                new NoViableAltException(getDescription(), 149, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA152 extends DFA {
+    class DFA150 extends DFA {
 
-        public DFA152(BaseRecognizer recognizer) {
+        public DFA150(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 152;
+            this.decisionNumber = 150;
             this.eot = dfa_52;
             this.eof = dfa_53;
             this.min = dfa_54;
@@ -106800,41 +100634,41 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             this.transition = dfa_58;
         }
         public String getDescription() {
-            return "21850:2: ( rule__XConstructorCall__Group_4__0 )?";
+            return "21229:2: ( rule__XConstructorCall__Group_4__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA152_1 = input.LA(1);
+                        int LA150_1 = input.LA(1);
 
                          
-                        int index152_1 = input.index();
+                        int index150_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred230_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred228_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index152_1);
+                        input.seek(index150_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 152, _s, input);
+                new NoViableAltException(getDescription(), 150, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA153 extends DFA {
+    class DFA151 extends DFA {
 
-        public DFA153(BaseRecognizer recognizer) {
+        public DFA151(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 153;
+            this.decisionNumber = 151;
             this.eot = dfa_52;
             this.eof = dfa_53;
             this.min = dfa_54;
@@ -106844,42 +100678,42 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             this.transition = dfa_59;
         }
         public String getDescription() {
-            return "21876:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )?";
+            return "21255:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA153_1 = input.LA(1);
+                        int LA151_1 = input.LA(1);
 
                          
-                        int index153_1 = input.index();
+                        int index151_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred231_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred229_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index153_1);
+                        input.seek(index151_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 153, _s, input);
+                new NoViableAltException(getDescription(), 151, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String dfa_73s = "\1\41\115\uffff";
     static final String dfa_74s = "\1\4\40\0\55\uffff";
-    static final String dfa_75s = "\1\u00b8\40\0\55\uffff";
+    static final String dfa_75s = "\1\u00b5\40\0\55\uffff";
     static final String dfa_76s = "\41\uffff\1\2\53\uffff\1\1";
     static final String dfa_77s = "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35\1\36\1\37\55\uffff}>";
     static final String[] dfa_78s = {
-            "\1\27\1\1\1\23\1\24\1\25\7\uffff\2\41\1\uffff\1\10\1\7\13\41\1\15\12\41\1\6\4\41\1\2\1\3\1\4\1\5\1\16\1\21\16\uffff\1\41\6\uffff\1\12\1\41\1\uffff\1\41\66\uffff\1\41\1\uffff\1\40\3\41\1\17\1\20\1\41\1\31\1\41\1\13\2\41\1\32\1\33\1\34\1\11\1\26\1\30\1\35\1\36\1\37\1\41\1\14\1\41\25\uffff\2\41\1\uffff\1\41\1\22",
+            "\1\27\1\1\1\23\1\24\1\25\7\uffff\2\41\1\uffff\1\10\1\7\13\41\1\15\12\41\1\6\4\41\1\2\1\3\1\4\1\5\1\16\1\21\16\uffff\1\41\6\uffff\1\12\1\41\1\uffff\1\41\66\uffff\1\41\1\uffff\1\40\3\41\1\17\1\20\1\41\1\31\1\41\1\13\2\41\1\32\1\33\1\34\1\11\1\26\1\30\1\35\1\36\1\37\1\41\1\14\1\41\22\uffff\2\41\1\uffff\1\41\1\22",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -106965,11 +100799,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     static final short[] dfa_77 = DFA.unpackEncodedString(dfa_77s);
     static final short[][] dfa_78 = unpackEncodedStringArray(dfa_78s);
 
-    class DFA158 extends DFA {
+    class DFA156 extends DFA {
 
-        public DFA158(BaseRecognizer recognizer) {
+        public DFA156(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 158;
+            this.decisionNumber = 156;
             this.eot = dfa_52;
             this.eof = dfa_73;
             this.min = dfa_74;
@@ -106979,496 +100813,496 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             this.transition = dfa_78;
         }
         public String getDescription() {
-            return "22767:2: ( rule__XReturnExpression__ExpressionAssignment_2 )?";
+            return "22146:2: ( rule__XReturnExpression__ExpressionAssignment_2 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA158_1 = input.LA(1);
+                        int LA156_1 = input.LA(1);
 
                          
-                        int index158_1 = input.index();
+                        int index156_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_1);
+                        input.seek(index156_1);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA158_2 = input.LA(1);
+                        int LA156_2 = input.LA(1);
 
                          
-                        int index158_2 = input.index();
+                        int index156_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_2);
+                        input.seek(index156_2);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA158_3 = input.LA(1);
+                        int LA156_3 = input.LA(1);
 
                          
-                        int index158_3 = input.index();
+                        int index156_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_3);
+                        input.seek(index156_3);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA158_4 = input.LA(1);
+                        int LA156_4 = input.LA(1);
 
                          
-                        int index158_4 = input.index();
+                        int index156_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_4);
+                        input.seek(index156_4);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA158_5 = input.LA(1);
+                        int LA156_5 = input.LA(1);
 
                          
-                        int index158_5 = input.index();
+                        int index156_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_5);
+                        input.seek(index156_5);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA158_6 = input.LA(1);
+                        int LA156_6 = input.LA(1);
 
                          
-                        int index158_6 = input.index();
+                        int index156_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_6);
+                        input.seek(index156_6);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA158_7 = input.LA(1);
+                        int LA156_7 = input.LA(1);
 
                          
-                        int index158_7 = input.index();
+                        int index156_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_7);
+                        input.seek(index156_7);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA158_8 = input.LA(1);
+                        int LA156_8 = input.LA(1);
 
                          
-                        int index158_8 = input.index();
+                        int index156_8 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_8);
+                        input.seek(index156_8);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA158_9 = input.LA(1);
+                        int LA156_9 = input.LA(1);
 
                          
-                        int index158_9 = input.index();
+                        int index156_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_9);
+                        input.seek(index156_9);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA158_10 = input.LA(1);
+                        int LA156_10 = input.LA(1);
 
                          
-                        int index158_10 = input.index();
+                        int index156_10 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_10);
+                        input.seek(index156_10);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA158_11 = input.LA(1);
+                        int LA156_11 = input.LA(1);
 
                          
-                        int index158_11 = input.index();
+                        int index156_11 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_11);
+                        input.seek(index156_11);
                         if ( s>=0 ) return s;
                         break;
                     case 11 : 
-                        int LA158_12 = input.LA(1);
+                        int LA156_12 = input.LA(1);
 
                          
-                        int index158_12 = input.index();
+                        int index156_12 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_12);
+                        input.seek(index156_12);
                         if ( s>=0 ) return s;
                         break;
                     case 12 : 
-                        int LA158_13 = input.LA(1);
+                        int LA156_13 = input.LA(1);
 
                          
-                        int index158_13 = input.index();
+                        int index156_13 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_13);
+                        input.seek(index156_13);
                         if ( s>=0 ) return s;
                         break;
                     case 13 : 
-                        int LA158_14 = input.LA(1);
+                        int LA156_14 = input.LA(1);
 
                          
-                        int index158_14 = input.index();
+                        int index156_14 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_14);
+                        input.seek(index156_14);
                         if ( s>=0 ) return s;
                         break;
                     case 14 : 
-                        int LA158_15 = input.LA(1);
+                        int LA156_15 = input.LA(1);
 
                          
-                        int index158_15 = input.index();
+                        int index156_15 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_15);
+                        input.seek(index156_15);
                         if ( s>=0 ) return s;
                         break;
                     case 15 : 
-                        int LA158_16 = input.LA(1);
+                        int LA156_16 = input.LA(1);
 
                          
-                        int index158_16 = input.index();
+                        int index156_16 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_16);
+                        input.seek(index156_16);
                         if ( s>=0 ) return s;
                         break;
                     case 16 : 
-                        int LA158_17 = input.LA(1);
+                        int LA156_17 = input.LA(1);
 
                          
-                        int index158_17 = input.index();
+                        int index156_17 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_17);
+                        input.seek(index156_17);
                         if ( s>=0 ) return s;
                         break;
                     case 17 : 
-                        int LA158_18 = input.LA(1);
+                        int LA156_18 = input.LA(1);
 
                          
-                        int index158_18 = input.index();
+                        int index156_18 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_18);
+                        input.seek(index156_18);
                         if ( s>=0 ) return s;
                         break;
                     case 18 : 
-                        int LA158_19 = input.LA(1);
+                        int LA156_19 = input.LA(1);
 
                          
-                        int index158_19 = input.index();
+                        int index156_19 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_19);
+                        input.seek(index156_19);
                         if ( s>=0 ) return s;
                         break;
                     case 19 : 
-                        int LA158_20 = input.LA(1);
+                        int LA156_20 = input.LA(1);
 
                          
-                        int index158_20 = input.index();
+                        int index156_20 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_20);
+                        input.seek(index156_20);
                         if ( s>=0 ) return s;
                         break;
                     case 20 : 
-                        int LA158_21 = input.LA(1);
+                        int LA156_21 = input.LA(1);
 
                          
-                        int index158_21 = input.index();
+                        int index156_21 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_21);
+                        input.seek(index156_21);
                         if ( s>=0 ) return s;
                         break;
                     case 21 : 
-                        int LA158_22 = input.LA(1);
+                        int LA156_22 = input.LA(1);
 
                          
-                        int index158_22 = input.index();
+                        int index156_22 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_22);
+                        input.seek(index156_22);
                         if ( s>=0 ) return s;
                         break;
                     case 22 : 
-                        int LA158_23 = input.LA(1);
+                        int LA156_23 = input.LA(1);
 
                          
-                        int index158_23 = input.index();
+                        int index156_23 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_23);
+                        input.seek(index156_23);
                         if ( s>=0 ) return s;
                         break;
                     case 23 : 
-                        int LA158_24 = input.LA(1);
+                        int LA156_24 = input.LA(1);
 
                          
-                        int index158_24 = input.index();
+                        int index156_24 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_24);
+                        input.seek(index156_24);
                         if ( s>=0 ) return s;
                         break;
                     case 24 : 
-                        int LA158_25 = input.LA(1);
+                        int LA156_25 = input.LA(1);
 
                          
-                        int index158_25 = input.index();
+                        int index156_25 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_25);
+                        input.seek(index156_25);
                         if ( s>=0 ) return s;
                         break;
                     case 25 : 
-                        int LA158_26 = input.LA(1);
+                        int LA156_26 = input.LA(1);
 
                          
-                        int index158_26 = input.index();
+                        int index156_26 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_26);
+                        input.seek(index156_26);
                         if ( s>=0 ) return s;
                         break;
                     case 26 : 
-                        int LA158_27 = input.LA(1);
+                        int LA156_27 = input.LA(1);
 
                          
-                        int index158_27 = input.index();
+                        int index156_27 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_27);
+                        input.seek(index156_27);
                         if ( s>=0 ) return s;
                         break;
                     case 27 : 
-                        int LA158_28 = input.LA(1);
+                        int LA156_28 = input.LA(1);
 
                          
-                        int index158_28 = input.index();
+                        int index156_28 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_28);
+                        input.seek(index156_28);
                         if ( s>=0 ) return s;
                         break;
                     case 28 : 
-                        int LA158_29 = input.LA(1);
+                        int LA156_29 = input.LA(1);
 
                          
-                        int index158_29 = input.index();
+                        int index156_29 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_29);
+                        input.seek(index156_29);
                         if ( s>=0 ) return s;
                         break;
                     case 29 : 
-                        int LA158_30 = input.LA(1);
+                        int LA156_30 = input.LA(1);
 
                          
-                        int index158_30 = input.index();
+                        int index156_30 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_30);
+                        input.seek(index156_30);
                         if ( s>=0 ) return s;
                         break;
                     case 30 : 
-                        int LA158_31 = input.LA(1);
+                        int LA156_31 = input.LA(1);
 
                          
-                        int index158_31 = input.index();
+                        int index156_31 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_31);
+                        input.seek(index156_31);
                         if ( s>=0 ) return s;
                         break;
                     case 31 : 
-                        int LA158_32 = input.LA(1);
+                        int LA156_32 = input.LA(1);
 
                          
-                        int index158_32 = input.index();
+                        int index156_32 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred236_InternalTableDSL()) ) {s = 77;}
+                        if ( (synpred234_InternalTableDSL()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index158_32);
+                        input.seek(index156_32);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 158, _s, input);
+                new NoViableAltException(getDescription(), 156, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -107476,11 +101310,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     static final String dfa_79s = "\117\uffff";
     static final String dfa_80s = "\1\2\116\uffff";
     static final String dfa_81s = "\1\4\1\0\115\uffff";
-    static final String dfa_82s = "\1\u00b8\1\0\115\uffff";
+    static final String dfa_82s = "\1\u00b5\1\0\115\uffff";
     static final String dfa_83s = "\2\uffff\1\2\113\uffff\1\1";
     static final String dfa_84s = "\1\uffff\1\0\115\uffff}>";
     static final String[] dfa_85s = {
-            "\5\2\7\uffff\2\2\1\uffff\15\2\1\1\25\2\16\uffff\1\2\6\uffff\2\2\1\uffff\1\2\66\uffff\1\2\1\uffff\30\2\1\uffff\1\2\23\uffff\2\2\1\uffff\2\2",
+            "\5\2\7\uffff\2\2\1\uffff\15\2\1\1\25\2\16\uffff\1\2\6\uffff\2\2\1\uffff\1\2\66\uffff\1\2\1\uffff\30\2\1\uffff\1\2\20\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -107569,11 +101403,11 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     static final short[] dfa_84 = DFA.unpackEncodedString(dfa_84s);
     static final short[][] dfa_85 = unpackEncodedStringArray(dfa_85s);
 
-    class DFA167 extends DFA {
+    class DFA165 extends DFA {
 
-        public DFA167(BaseRecognizer recognizer) {
+        public DFA165(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 167;
+            this.decisionNumber = 165;
             this.eot = dfa_79;
             this.eof = dfa_80;
             this.min = dfa_81;
@@ -107583,41 +101417,41 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             this.transition = dfa_85;
         }
         public String getDescription() {
-            return "24124:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )?";
+            return "23503:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA167_1 = input.LA(1);
+                        int LA165_1 = input.LA(1);
 
                          
-                        int index167_1 = input.index();
+                        int index165_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred245_InternalTableDSL()) ) {s = 78;}
+                        if ( (synpred243_InternalTableDSL()) ) {s = 78;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index167_1);
+                        input.seek(index165_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 167, _s, input);
+                new NoViableAltException(getDescription(), 165, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA170 extends DFA {
+    class DFA168 extends DFA {
 
-        public DFA170(BaseRecognizer recognizer) {
+        public DFA168(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 170;
+            this.decisionNumber = 168;
             this.eot = dfa_79;
             this.eof = dfa_80;
             this.min = dfa_81;
@@ -107627,31 +101461,31 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
             this.transition = dfa_85;
         }
         public String getDescription() {
-            return "24394:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?";
+            return "23773:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA170_1 = input.LA(1);
+                        int LA168_1 = input.LA(1);
 
                          
-                        int index170_1 = input.index();
+                        int index168_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred248_InternalTableDSL()) ) {s = 78;}
+                        if ( (synpred246_InternalTableDSL()) ) {s = 78;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index170_1);
+                        input.seek(index168_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 170, _s, input);
+                new NoViableAltException(getDescription(), 168, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -107670,183 +101504,180 @@ public class InternalTableDSLParser extends AbstractInternalContentAssistParser
     public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000000002L,0x0000000000002000L});
     public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
     public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L,0x0000000200000000L});
-    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000000L,0x000200000008A000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000000L,0x0002000000088000L});
     public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000000010L});
     public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
     public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000040000L,0x0000000000000000L,0x0000000400000000L});
-    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000000000L,0x0000000000030000L,0x0000007800000000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000000000L,0x0000000000030000L,0x0000003800000000L});
     public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
     public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000000000000L,0x000000000000000EL});
-    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x00000000000001C0L});
-    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000000000000L,0x0000080000000000L});
-    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000000000L,0x0000000000030000L,0x000000F800000000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000000000000L,0x0000080000000000L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000000000L,0x0000000000030000L,0x0000007800000000L});
     public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
     public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000000000000L,0x0000001FF0000000L});
-    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000010000000000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000008000000000L});
     public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
-    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000000000L,0x000000000A400000L,0x0000060000000000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000000000L,0x000000000A400000L,0x0000030000000000L});
     public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000000000000L,0x0000000001800000L});
     public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L,0x0000080000000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L,0x0000040000000000L});
     public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000000000L,0x000000E000001000L});
     public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000000000002L,0x000000E000000000L});
     public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000000000L,0x0000078000001000L});
     public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000000002L,0x0000078000000000L});
     public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
-    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000380000000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x00001C0000000000L});
     public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000000000L,0x0000000800000000L});
-    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000000000000000L,0x0000002000000000L});
-    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x00000000001001C0L});
-    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000000000000L,0x0001E00000400000L});
-    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000000000000L,0x0000004000000000L});
-    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000100080L});
-    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000000000000L,0x000000E000000000L});
-    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000000L,0x0000010000000000L});
-    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000000000000L,0x0000020000000000L});
-    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000000000000000L,0x0000040000000000L});
-    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000000000L,0x0000078000000000L});
-    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000000000000L,0x0000100000001000L});
-    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
-    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000000000000000L,0x00000000000003F0L});
-    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L,0x0000400000000000L});
-    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0001800000000000L});
-    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0000000000000000L,0x0000000000201000L});
-    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0000000000000002L,0x0000000000200000L});
-    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0000000000000000L,0x0000001FF0001000L});
-    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000000000000002L,0x0000001FF0000000L});
-    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0xF000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0000000000000000L,0x0002000000000000L});
-    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L,0x0002000000000000L});
-    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L,0x0000007000000000L});
-    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000000000000000L,0x0020000000000000L});
-    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
-    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x0000000000000000L,0x0010000000000000L});
-    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x0000000000000000L,0xB740000000000000L,0x000000000000000CL});
-    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x0000000000000000L,0x0008000000001000L,0x0004000000000000L});
-    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x0000000000000002L,0x0008000000000000L,0x0004000000000000L});
-    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0000000000000000L,0x0040000000000000L});
-    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x0000000000000000L,0x0100000000000000L});
-    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x0000000000000000L,0x0200000000000000L});
-    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x0000000000000000L,0x0400000000000000L});
-    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x0000000000000000L,0x0800000000000000L});
-    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x0000000000000000L,0x1000000000000000L});
-    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x0000000000000000L,0x2000000000000000L});
-    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x0000000000000000L,0x4000000000000000L});
-    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x0000000000180080L});
-    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000800L});
-    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x0000000000000000L,0x0000060000001000L});
-    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x0000000000000002L,0x0000060000000000L});
-    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x0FC0000000000000L});
-    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x0000000000000200L});
-    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x0002000000000020L,0x0000000000000000L,0x0008000000000000L});
-    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x0008000000000020L});
-    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0000008000000020L});
-    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x003F0801001801F0L,0x0000000000000800L,0x010000002FF959C0L});
-    public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x003F0801001801F0L,0x0000000000000800L,0x010000002FF958C0L});
-    public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x003F0801001801F0L,0x0000000000000800L,0x010000002FF95CC0L});
-    public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000001000L});
-    public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x000F000000000020L});
-    public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x0000000183E00000L});
-    public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x00000000C0000000L});
-    public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x0000000000010002L});
-    public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x0000000000020000L});
-    public static final BitSet FOLLOW_112 = new BitSet(new long[]{0x0000000000020002L});
-    public static final BitSet FOLLOW_113 = new BitSet(new long[]{0x000000003C000000L});
-    public static final BitSet FOLLOW_114 = new BitSet(new long[]{0x000000003C000002L});
-    public static final BitSet FOLLOW_115 = new BitSet(new long[]{0x00000001C0000000L,0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_116 = new BitSet(new long[]{0x00000001C0000002L,0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_117 = new BitSet(new long[]{0x0000001000000020L,0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_118 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_119 = new BitSet(new long[]{0x0000007F80000000L});
-    public static final BitSet FOLLOW_120 = new BitSet(new long[]{0x0000007F80000002L});
-    public static final BitSet FOLLOW_121 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_122 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_123 = new BitSet(new long[]{0x0000001100000000L});
-    public static final BitSet FOLLOW_124 = new BitSet(new long[]{0x0000000000180000L});
-    public static final BitSet FOLLOW_125 = new BitSet(new long[]{0x0000000000180002L});
-    public static final BitSet FOLLOW_126 = new BitSet(new long[]{0x0000078000000000L});
-    public static final BitSet FOLLOW_127 = new BitSet(new long[]{0x0000078000000002L});
-    public static final BitSet FOLLOW_128 = new BitSet(new long[]{0x0000080000180000L});
-    public static final BitSet FOLLOW_129 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_130 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
-    public static final BitSet FOLLOW_131 = new BitSet(new long[]{0x0000300000000000L});
-    public static final BitSet FOLLOW_132 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000000L,0x0030000000000000L});
-    public static final BitSet FOLLOW_133 = new BitSet(new long[]{0x0000400000000002L,0x0000000000000000L,0x0030000000000000L});
-    public static final BitSet FOLLOW_134 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000000L,0x0010000000000000L});
-    public static final BitSet FOLLOW_135 = new BitSet(new long[]{0x001F000100000020L});
-    public static final BitSet FOLLOW_136 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000001080L});
-    public static final BitSet FOLLOW_137 = new BitSet(new long[]{0x0000001000000020L,0x0000000000000000L,0x0000000080000080L});
-    public static final BitSet FOLLOW_138 = new BitSet(new long[]{0x0000000080000000L,0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_139 = new BitSet(new long[]{0x003F0811001801F0L,0x0000000000000800L,0x014000002FF959C0L});
-    public static final BitSet FOLLOW_140 = new BitSet(new long[]{0x003F0801001801F0L,0x0000000000001800L,0x010000002FF958C0L});
-    public static final BitSet FOLLOW_141 = new BitSet(new long[]{0x003F8811001801F0L,0x0000000000000800L,0x01C000002FF958C0L});
-    public static final BitSet FOLLOW_142 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_143 = new BitSet(new long[]{0x0000001000000020L,0x0000000000000000L,0x0040000000000080L});
-    public static final BitSet FOLLOW_144 = new BitSet(new long[]{0x003F8801001801F2L,0x0000000000000800L,0x018000002FF958C0L});
-    public static final BitSet FOLLOW_145 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_146 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_147 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_148 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000010000L});
-    public static final BitSet FOLLOW_149 = new BitSet(new long[]{0x003F0811001801F0L,0x0000000000000800L,0x010000002FF958C0L});
-    public static final BitSet FOLLOW_150 = new BitSet(new long[]{0x0000001000000020L,0x0000000000001010L,0x0000000000060280L});
-    public static final BitSet FOLLOW_151 = new BitSet(new long[]{0x0000001000000022L,0x0000000000000000L,0x0000000000060280L});
-    public static final BitSet FOLLOW_152 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000020000L});
-    public static final BitSet FOLLOW_153 = new BitSet(new long[]{0x0000001000000020L,0x0000000000000000L,0x0000000000060280L});
-    public static final BitSet FOLLOW_154 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_155 = new BitSet(new long[]{0x003F8801001801F0L,0x0000000000000800L,0x018000002FF958E0L});
-    public static final BitSet FOLLOW_156 = new BitSet(new long[]{0x003F0801001801F0L,0x0000000000000800L,0x010000002FF958E0L});
-    public static final BitSet FOLLOW_157 = new BitSet(new long[]{0x003F8801001801F0L,0x0000000000000800L,0x018000002FF958C0L});
-    public static final BitSet FOLLOW_158 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_159 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000200000L});
-    public static final BitSet FOLLOW_160 = new BitSet(new long[]{0x003F8801001801F0L,0x0000000000001800L,0x018000002FF958C0L});
-    public static final BitSet FOLLOW_161 = new BitSet(new long[]{0x0000800000000000L,0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_162 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000400000L});
-    public static final BitSet FOLLOW_163 = new BitSet(new long[]{0x0000000100000000L,0x0000000000000000L,0x0000000000001080L});
-    public static final BitSet FOLLOW_164 = new BitSet(new long[]{0x0020000000000000L,0x0000000000000000L,0x0100000000000000L});
-    public static final BitSet FOLLOW_165 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_166 = new BitSet(new long[]{0x00200000000001D0L,0x0000000000000000L,0x0100000001801800L});
-    public static final BitSet FOLLOW_167 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000001100L});
-    public static final BitSet FOLLOW_168 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000000001000L});
-    public static final BitSet FOLLOW_169 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000002000000L});
-    public static final BitSet FOLLOW_170 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_171 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000008000000L});
-    public static final BitSet FOLLOW_172 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000050000000L});
-    public static final BitSet FOLLOW_173 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_174 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000040000000L});
-    public static final BitSet FOLLOW_175 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_176 = new BitSet(new long[]{0x0000400000000002L});
-    public static final BitSet FOLLOW_177 = new BitSet(new long[]{0x0000000000000180L});
-    public static final BitSet FOLLOW_178 = new BitSet(new long[]{0x0000001000000020L,0x0000000000000000L,0x0000000000000180L});
-    public static final BitSet FOLLOW_179 = new BitSet(new long[]{0x0011000000000000L});
-    public static final BitSet FOLLOW_180 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000100000000L});
-    public static final BitSet FOLLOW_181 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000100000000L});
-    public static final BitSet FOLLOW_182 = new BitSet(new long[]{0x0000008000000000L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x00000000000001C0L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000000000000000L,0x0000000800000000L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000000000000L,0x0000002000000000L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x00000000001001C0L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000000000000L,0x0001E00000400000L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000000000L,0x0000004000000000L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000000100080L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000000L,0x000000E000000000L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000000000000L,0x0000010000000000L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000000000000000L,0x0000020000000000L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000000000L,0x0000040000000000L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000000000000L,0x0000078000000000L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000000000000L,0x0000100000001000L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000000000000000L,0x00000000000003F0L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L,0x0000200000000000L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000C00000000000L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0000000000000000L,0x0000000000201000L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0000000000000002L,0x0000000000200000L});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000000000000000L,0x0000001FF0001000L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0000000000000002L,0x0000001FF0000000L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0xF000000000000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000000000000000L,0x0010000000000000L});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0000000000000000L,0x5BA0000000000000L,0x000000000000000EL});
+    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x0000000000000000L,0x0006000000001000L});
+    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x0000000000000002L,0x0006000000000000L});
+    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x0000400000000000L});
+    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x0000000000000000L,0x0020000000000000L});
+    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x0000000000000000L,0x0040000000000000L});
+    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x0000000000000000L,0x0100000000000000L});
+    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x0000000000000000L,0x0200000000000000L});
+    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x0000000000000000L,0x0400000000000000L});
+    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x0000000000000000L,0x0800000000000000L});
+    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x0000000000000000L,0x1000000000000000L});
+    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x0000000000000000L,0x2000000000000000L});
+    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x0000000000180080L});
+    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x0000000000000000L,0x8000000000000000L});
+    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000002L});
+    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000004L});
+    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000008L});
+    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x0000000000000000L,0x0040000000000800L});
+    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x0000000000000000L,0x0000060000001000L});
+    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x0000000000000002L,0x0000060000000000L});
+    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x0FC0000000000000L});
+    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x0000000000000200L});
+    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x0004000000000000L});
+    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x0002000000000020L,0x0000000000000000L,0x0001000000000000L});
+    public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000020L});
+    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0008000000000020L});
+    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x0000008000000020L});
+    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000040L});
+    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x003F0801001801F0L,0x0000000000000800L,0x002000002FF959C0L});
+    public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x003F0801001801F0L,0x0000000000000800L,0x002000002FF958C0L});
+    public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x003F0801001801F0L,0x0000000000000800L,0x002000002FF95CC0L});
+    public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000800L});
+    public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000001000L});
+    public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x000F000000000020L});
+    public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x0000000183E00000L});
+    public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x0000000100000000L});
+    public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x00000000C0000000L});
+    public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x0000000000010002L});
+    public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x0000000000020000L});
+    public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x0000000000020002L});
+    public static final BitSet FOLLOW_112 = new BitSet(new long[]{0x000000003C000000L});
+    public static final BitSet FOLLOW_113 = new BitSet(new long[]{0x000000003C000002L});
+    public static final BitSet FOLLOW_114 = new BitSet(new long[]{0x00000001C0000000L,0x0000000000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_115 = new BitSet(new long[]{0x00000001C0000002L,0x0000000000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_116 = new BitSet(new long[]{0x0000001000000020L,0x0000000000000000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_117 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_118 = new BitSet(new long[]{0x0000007F80000000L});
+    public static final BitSet FOLLOW_119 = new BitSet(new long[]{0x0000007F80000002L});
+    public static final BitSet FOLLOW_120 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_121 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_122 = new BitSet(new long[]{0x0000001100000000L});
+    public static final BitSet FOLLOW_123 = new BitSet(new long[]{0x0000000000180000L});
+    public static final BitSet FOLLOW_124 = new BitSet(new long[]{0x0000000000180002L});
+    public static final BitSet FOLLOW_125 = new BitSet(new long[]{0x0000078000000000L});
+    public static final BitSet FOLLOW_126 = new BitSet(new long[]{0x0000078000000002L});
+    public static final BitSet FOLLOW_127 = new BitSet(new long[]{0x0000080000180000L});
+    public static final BitSet FOLLOW_128 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
+    public static final BitSet FOLLOW_129 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
+    public static final BitSet FOLLOW_130 = new BitSet(new long[]{0x0000300000000000L});
+    public static final BitSet FOLLOW_131 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000000L,0x0006000000000000L});
+    public static final BitSet FOLLOW_132 = new BitSet(new long[]{0x0000400000000002L,0x0000000000000000L,0x0006000000000000L});
+    public static final BitSet FOLLOW_133 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000000L,0x0002000000000000L});
+    public static final BitSet FOLLOW_134 = new BitSet(new long[]{0x001F000100000020L});
+    public static final BitSet FOLLOW_135 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000001080L});
+    public static final BitSet FOLLOW_136 = new BitSet(new long[]{0x0000001000000020L,0x0000000000000000L,0x0000000080000080L});
+    public static final BitSet FOLLOW_137 = new BitSet(new long[]{0x0000000080000000L,0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_138 = new BitSet(new long[]{0x003F0811001801F0L,0x0000000000000800L,0x002800002FF959C0L});
+    public static final BitSet FOLLOW_139 = new BitSet(new long[]{0x003F0801001801F0L,0x0000000000001800L,0x002000002FF958C0L});
+    public static final BitSet FOLLOW_140 = new BitSet(new long[]{0x003F8811001801F0L,0x0000000000000800L,0x003800002FF958C0L});
+    public static final BitSet FOLLOW_141 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_142 = new BitSet(new long[]{0x0000001000000020L,0x0000000000000000L,0x0008000000000080L});
+    public static final BitSet FOLLOW_143 = new BitSet(new long[]{0x003F8801001801F2L,0x0000000000000800L,0x003000002FF958C0L});
+    public static final BitSet FOLLOW_144 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_145 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000004000L});
+    public static final BitSet FOLLOW_146 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000008000L});
+    public static final BitSet FOLLOW_147 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000010000L});
+    public static final BitSet FOLLOW_148 = new BitSet(new long[]{0x003F0811001801F0L,0x0000000000000800L,0x002000002FF958C0L});
+    public static final BitSet FOLLOW_149 = new BitSet(new long[]{0x0000001000000020L,0x0000000000001010L,0x0000000000060280L});
+    public static final BitSet FOLLOW_150 = new BitSet(new long[]{0x0000001000000022L,0x0000000000000000L,0x0000000000060280L});
+    public static final BitSet FOLLOW_151 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000020000L});
+    public static final BitSet FOLLOW_152 = new BitSet(new long[]{0x0000001000000020L,0x0000000000000000L,0x0000000000060280L});
+    public static final BitSet FOLLOW_153 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_154 = new BitSet(new long[]{0x003F8801001801F0L,0x0000000000000800L,0x003000002FF958E0L});
+    public static final BitSet FOLLOW_155 = new BitSet(new long[]{0x003F0801001801F0L,0x0000000000000800L,0x002000002FF958E0L});
+    public static final BitSet FOLLOW_156 = new BitSet(new long[]{0x003F8801001801F0L,0x0000000000000800L,0x003000002FF958C0L});
+    public static final BitSet FOLLOW_157 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_158 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000200000L});
+    public static final BitSet FOLLOW_159 = new BitSet(new long[]{0x003F8801001801F0L,0x0000000000001800L,0x003000002FF958C0L});
+    public static final BitSet FOLLOW_160 = new BitSet(new long[]{0x0000800000000000L,0x0000000000000000L,0x0010000000000000L});
+    public static final BitSet FOLLOW_161 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000400000L});
+    public static final BitSet FOLLOW_162 = new BitSet(new long[]{0x0000000100000000L,0x0000000000000000L,0x0000000000001080L});
+    public static final BitSet FOLLOW_163 = new BitSet(new long[]{0x0020000000000000L,0x0000000000000000L,0x0020000000000000L});
+    public static final BitSet FOLLOW_164 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_165 = new BitSet(new long[]{0x00200000000001D0L,0x0000000000000000L,0x0020000001801800L});
+    public static final BitSet FOLLOW_166 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000001100L});
+    public static final BitSet FOLLOW_167 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000000001000L});
+    public static final BitSet FOLLOW_168 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_169 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_170 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_171 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000050000000L});
+    public static final BitSet FOLLOW_172 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000010000000L});
+    public static final BitSet FOLLOW_173 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000040000000L});
+    public static final BitSet FOLLOW_174 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000020000000L});
+    public static final BitSet FOLLOW_175 = new BitSet(new long[]{0x0000400000000002L});
+    public static final BitSet FOLLOW_176 = new BitSet(new long[]{0x0000000000000180L});
+    public static final BitSet FOLLOW_177 = new BitSet(new long[]{0x0000001000000020L,0x0000000000000000L,0x0000000000000180L});
+    public static final BitSet FOLLOW_178 = new BitSet(new long[]{0x0011000000000000L});
+    public static final BitSet FOLLOW_179 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000100000000L});
+    public static final BitSet FOLLOW_180 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000100000000L});
+    public static final BitSet FOLLOW_181 = new BitSet(new long[]{0x0000008000000000L});
+    public static final BitSet FOLLOW_182 = new BitSet(new long[]{0x0000000000000002L,0x0000000000030000L,0x0000003800000000L});
     public static final BitSet FOLLOW_183 = new BitSet(new long[]{0x0000000000000002L,0x0000000000030000L,0x0000007800000000L});
-    public static final BitSet FOLLOW_184 = new BitSet(new long[]{0x0000000000000002L,0x0000000000030000L,0x000000F800000000L});
-    public static final BitSet FOLLOW_185 = new BitSet(new long[]{0x0000000000000002L,0x000000000A400000L,0x0000060000000000L});
-    public static final BitSet FOLLOW_186 = new BitSet(new long[]{0x0000000000000002L,0x0000000001800000L});
-    public static final BitSet FOLLOW_187 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000380000000000L});
-    public static final BitSet FOLLOW_188 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L,0x0000400000000000L});
-    public static final BitSet FOLLOW_189 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L,0x0002000000000000L});
-    public static final BitSet FOLLOW_190 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L,0x0000007000000000L});
+    public static final BitSet FOLLOW_184 = new BitSet(new long[]{0x0000000000000002L,0x000000000A400000L,0x0000030000000000L});
+    public static final BitSet FOLLOW_185 = new BitSet(new long[]{0x0000000000000002L,0x0000000001800000L});
+    public static final BitSet FOLLOW_186 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x00001C0000000000L});
+    public static final BitSet FOLLOW_187 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L,0x0000200000000000L});
 
 }
diff --git a/org.eclipse.osbp.xtext.table.ide/src/org/eclipse/osbp/xtext/table/ide/TableDSLIdeModule.java b/org.eclipse.osbp.xtext.table.ide/src/org/eclipse/osbp/xtext/table/ide/TableDSLIdeModule.java
index 1e04d72..1cbd338 100644
--- a/org.eclipse.osbp.xtext.table.ide/src/org/eclipse/osbp/xtext/table/ide/TableDSLIdeModule.java
+++ b/org.eclipse.osbp.xtext.table.ide/src/org/eclipse/osbp/xtext/table/ide/TableDSLIdeModule.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.ide;
 
diff --git a/org.eclipse.osbp.xtext.table.ide/src/org/eclipse/osbp/xtext/table/ide/TableDSLIdeSetup.java b/org.eclipse.osbp.xtext.table.ide/src/org/eclipse/osbp/xtext/table/ide/TableDSLIdeSetup.java
index 32fabc8..d94fb17 100644
--- a/org.eclipse.osbp.xtext.table.ide/src/org/eclipse/osbp/xtext/table/ide/TableDSLIdeSetup.java
+++ b/org.eclipse.osbp.xtext.table.ide/src/org/eclipse/osbp/xtext/table/ide/TableDSLIdeSetup.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.ide;
 
diff --git a/org.eclipse.osbp.xtext.table.tests/LICENSE.txt b/org.eclipse.osbp.xtext.table.tests/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.xtext.table.tests/LICENSE.txt
+++ b/org.eclipse.osbp.xtext.table.tests/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION
-OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.
-A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate
-modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of
-its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute
-and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code
-form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the
-combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not
-apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no
-assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity
-based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property
-rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the
-Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to
-grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including
-warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
-other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it
-in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and
-the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes
-the Program in a commercial product offering should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions
-brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual
-property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may
- participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is
-then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.
-Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to
-those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result,
-the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for
-determining the appropriateness of using and distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance
-with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such
-Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such
-noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses
- granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement
-is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish
-new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the
-right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including Contributions) may always be
-distributed subject to the version of the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the
-new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States
-of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause
-of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-\ No newline at end of file
+Eclipse Foundation Software User Agreement
+
+November 22, 2017
+
+Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
+MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the Eclipse Foundation
+is provided to you under the terms and conditions of the Eclipse Public License
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
+"Program" will mean the Content.
+
+Content includes, but is not limited to, source code, object code, documentation
+and other files maintained in the Eclipse Foundation source code repository
+("Repository") in software modules ("Modules") and made available as
+downloadable archives ("Downloads").
+
+-   Content may be structured and packaged into modules to facilitate
+    delivering, extending, and upgrading the Content. Typical modules may
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and
+    features ("Features").
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR
+    (Java™ ARchive) in a directory named "plugins".
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and
+    associated material. Each Feature may be packaged as a sub-directory in a
+    directory named "features". Within a Feature, files named "feature.xml" may
+    contain a list of the names and version numbers of the Plug-ins and/or
+    Fragments associated with that Feature.
+-   Features may also include other Features ("Included Features"). Within a
+    Feature, files named "feature.xml" may contain a list of the names and
+    version numbers of Included Features.
+
+The terms and conditions governing Plug-ins and Fragments should be contained in
+files named "about.html" ("Abouts"). The terms and conditions governing Features
+and Included Features should be contained in files named "license.html"
+("Feature Licenses"). Abouts and Feature Licenses may be located in any
+directory of a Download or Module including, but not limited to the following
+locations:
+
+-   The top-level (root) directory
+-   Plug-in and Fragment directories
+-   Inside Plug-ins and Fragments packaged as JARs
+-   Sub-directories of the directory named "src" of certain Plug-ins
+-   Feature directories
+
+Note: if a Feature made available by the Eclipse Foundation is installed using
+the Provisioning Technology (as defined below), you must agree to a license
+("Feature Update License") during the installation process. If the Feature
+contains Included Features, the Feature Update License should either provide you
+with the terms and conditions governing the Included Features or inform you
+where you can locate them. Feature Update Licenses may be found in the "license"
+property of files named "feature.properties" found within a Feature. Such
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and
+conditions (or references to such terms and conditions) that govern your use of
+the associated Content in that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+-   Eclipse Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/epl-v10.html)
+-   Eclipse Distribution License Version 1.0 (available at
+    http://www.eclipse.org/licenses/edl-v1.0.html)
+-   Common Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/cpl-v10.html)
+-   Apache Software License 1.1 (available at
+    http://www.apache.org/licenses/LICENSE)
+-   Apache Software License 2.0 (available at
+    http://www.apache.org/licenses/LICENSE-2.0)
+-   Mozilla Public License Version 1.1 (available at
+    http://www.mozilla.org/MPL/MPL-1.1.html)
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is
+provided, please contact the Eclipse Foundation to determine what terms and
+conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which
+include, but are not limited to, p2 and the Eclipse Update Manager
+("Provisioning Technology") for the purpose of allowing users to install
+software, documentation, information and/or other materials (collectively
+"Installable Software"). This capability is provided with the intent of allowing
+such users to install, extend and update Eclipse-based products. Information
+about packaging Installable Software is available at
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
+
+You may use Provisioning Technology to allow other parties to install
+Installable Software. You shall be responsible for enabling the applicable
+license agreements relating to the Installable Software to be presented to, and
+accepted by, the users of the Provisioning Technology in accordance with the
+Specification. By using Provisioning Technology in such a manner and making it
+available in accordance with the Specification, you further acknowledge your
+agreement to, and the acquisition of all necessary rights to permit the
+following:
+
+1.  A series of actions may occur ("Provisioning Process") in which a user may
+    execute the Provisioning Technology on a machine ("Target Machine") with the
+    intent of installing, extending or updating the functionality of an
+    Eclipse-based product.
+2.  During the Provisioning Process, the Provisioning Technology may cause third
+    party Installable Software or a portion thereof to be accessed and copied to
+    the Target Machine.
+3.  Pursuant to the Specification, you will provide to the user the terms and
+    conditions that govern the use of the Installable Software ("Installable
+    Software Agreement") and such Installable Software Agreement shall be
+    accessed from the Target Machine in accordance with the Specification. Such
+    Installable Software Agreement must inform the user of the terms and
+    conditions that govern the Installable Software and must solicit acceptance
+    by the end user in the manner prescribed in such Installable
+    Software Agreement. Upon such indication of agreement by the user, the
+    provisioning Technology will complete installation of the
+    Installable Software.
+
+Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the
+United States, other countries, or both.
diff --git a/org.eclipse.osbp.xtext.table.tests/about.html b/org.eclipse.osbp.xtext.table.tests/about.html
index 64c0598..e8b834d 100644
--- a/org.eclipse.osbp.xtext.table.tests/about.html
+++ b/org.eclipse.osbp.xtext.table.tests/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 1, 2016</p>	
+<p>November 30, 2017</p>	
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/org.eclipse.osbp.xtext.table.tests/about.properties b/org.eclipse.osbp.xtext.table.tests/about.properties
index 1060156..5c4bd66 100644
--- a/org.eclipse.osbp.xtext.table.tests/about.properties
+++ b/org.eclipse.osbp.xtext.table.tests/about.properties
@@ -1,9 +1,11 @@
 #
 # Copyright (c) 2012, 2016 - Loetz GmbH&Co.KG (Heidelberg)
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0 
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
@@ -17,9 +19,11 @@ featureName=org.eclipse.osbp.xtext.table.tests
 featureText=\
 Copyright (c) 2012-2016 - Loetz GmbH&Co.KG \n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0 \n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
 \n\
 Contributors:\n\
     Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation\n
diff --git a/org.eclipse.osbp.xtext.table.tests/build.properties b/org.eclipse.osbp.xtext.table.tests/build.properties
index 431ea22..d9cd300 100644
--- a/org.eclipse.osbp.xtext.table.tests/build.properties
+++ b/org.eclipse.osbp.xtext.table.tests/build.properties
@@ -8,7 +8,7 @@ bin.includes = about.properties,  about.mappings,  about.ini,  about.html,  META
                .settings/,\
                license.html,\
                LICENSE.txt,\
-               epl-v10.html
+               epl-2.0.html
 src.includes = about.properties,  about.mappings,  about.ini,  about.html,  license.html,\
                LICENSE.txt,\
-               epl-v10.html			   
+               epl-2.0.html			   
diff --git a/org.eclipse.osbp.xtext.table.tests/epl-2.0.html b/org.eclipse.osbp.xtext.table.tests/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/org.eclipse.osbp.xtext.table.tests/epl-2.0.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Eclipse Public License - Version 2.0</title>
+    <style type="text/css">
+      body {
+        margin: 1.5em 3em;
+      }
+      h1{
+        font-size:1.5em;
+      }
+      h2{
+        font-size:1em;
+        margin-bottom:0.5em;
+        margin-top:1em;
+      }
+      p {
+        margin-top:  0.5em;
+        margin-bottom: 0.5em;
+      }
+      ul, ol{
+        list-style-type:none;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Eclipse Public License - v 2.0</h1>
+    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+      PUBLIC LICENSE (&ldquo;AGREEMENT&rdquo;). ANY USE, REPRODUCTION OR DISTRIBUTION
+      OF THE PROGRAM CONSTITUTES RECIPIENT&#039;S ACCEPTANCE OF THIS AGREEMENT.
+    </p>
+    <h2 id="definitions">1. DEFINITIONS</h2>
+    <p>&ldquo;Contribution&rdquo; means:</p>
+    <ul>
+      <li>a) in the case of the initial Contributor, the initial content
+        Distributed under this Agreement, and
+      </li>
+      <li>
+        b) in the case of each subsequent Contributor:
+        <ul>
+          <li>i) changes to the Program, and</li>
+          <li>ii) additions to the Program;</li>
+        </ul>
+        where such changes and/or additions to the Program originate from
+        and are Distributed by that particular Contributor. A Contribution
+        &ldquo;originates&rdquo; from a Contributor if it was added to the Program by such
+        Contributor itself or anyone acting on such Contributor&#039;s behalf.
+        Contributions do not include changes or additions to the Program that
+        are not Modified Works.
+      </li>
+    </ul>
+    <p>&ldquo;Contributor&rdquo; means any person or entity that Distributes the Program.</p>
+    <p>&ldquo;Licensed Patents&rdquo; mean patent claims licensable by a Contributor which
+      are necessarily infringed by the use or sale of its Contribution alone
+      or when combined with the Program.
+    </p>
+    <p>&ldquo;Program&rdquo; means the Contributions Distributed in accordance with this
+      Agreement.
+    </p>
+    <p>&ldquo;Recipient&rdquo; means anyone who receives the Program under this Agreement
+      or any Secondary License (as applicable), including Contributors.
+    </p>
+    <p>&ldquo;Derivative Works&rdquo; shall mean any work, whether in Source Code or other
+      form, that is based on (or derived from) the Program and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship.
+    </p>
+    <p>&ldquo;Modified Works&rdquo; shall mean any work in Source Code or other form that
+      results from an addition to, deletion from, or modification of the
+      contents of the Program, including, for purposes of clarity any new file
+      in Source Code form that contains any contents of the Program. Modified
+      Works shall not include works that contain only declarations, interfaces,
+      types, classes, structures, or files of the Program solely in each case
+      in order to link to, bind by name, or subclass the Program or Modified
+      Works thereof.
+    </p>
+    <p>&ldquo;Distribute&rdquo; means the acts of a) distributing or b) making available
+      in any manner that enables the transfer of a copy.
+    </p>
+    <p>&ldquo;Source Code&rdquo; means the form of a Program preferred for making
+      modifications, including but not limited to software source code,
+      documentation source, and configuration files.
+    </p>
+    <p>&ldquo;Secondary License&rdquo; means either the GNU General Public License,
+      Version 2.0, or any later versions of that license, including any
+      exceptions or additional permissions as identified by the initial
+      Contributor.
+    </p>
+    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+    <ul>
+      <li>a) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free copyright
+        license to reproduce, prepare Derivative Works of, publicly display,
+        publicly perform, Distribute and sublicense the Contribution of such
+        Contributor, if any, and such Derivative Works.
+      </li>
+      <li>b) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free patent
+        license under Licensed Patents to make, use, sell, offer to sell,
+        import and otherwise transfer the Contribution of such Contributor,
+        if any, in Source Code or other form. This patent license shall
+        apply to the combination of the Contribution and the Program if,
+        at the time the Contribution is added by the Contributor, such
+        addition of the Contribution causes such combination to be covered
+        by the Licensed Patents. The patent license shall not apply to any
+        other combinations which include the Contribution. No hardware per
+        se is licensed hereunder.
+      </li>
+      <li>c) Recipient understands that although each Contributor grants the
+        licenses to its Contributions set forth herein, no assurances are
+        provided by any Contributor that the Program does not infringe the
+        patent or other intellectual property rights of any other entity.
+        Each Contributor disclaims any liability to Recipient for claims
+        brought by any other entity based on infringement of intellectual
+        property rights or otherwise. As a condition to exercising the rights
+        and licenses granted hereunder, each Recipient hereby assumes sole
+        responsibility to secure any other intellectual property rights needed,
+        if any. For example, if a third party patent license is required to
+        allow Recipient to Distribute the Program, it is Recipient&#039;s
+        responsibility to acquire that license before distributing the Program.
+      </li>
+      <li>d) Each Contributor represents that to its knowledge it has sufficient
+        copyright rights in its Contribution, if any, to grant the copyright
+        license set forth in this Agreement.
+      </li>
+      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+        makes additional grants to any Recipient (other than those set forth
+        in this Agreement) as a result of such Recipient&#039;s receipt of the
+        Program under the terms of a Secondary License (if permitted under
+        the terms of Section 3).
+      </li>
+    </ul>
+    <h2 id="requirements">3. REQUIREMENTS</h2>
+    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+    <ul>
+      <li>a) the Program must also be made available as Source Code, in
+        accordance with section 3.2, and the Contributor must accompany
+        the Program with a statement that the Source Code for the Program
+        is available under this Agreement, and informs Recipients how to
+        obtain it in a reasonable manner on or through a medium customarily
+        used for software exchange; and
+      </li>
+      <li>
+        b) the Contributor may Distribute the Program under a license
+        different than this Agreement, provided that such license:
+        <ul>
+          <li>i) effectively disclaims on behalf of all other Contributors all
+            warranties and conditions, express and implied, including warranties
+            or conditions of title and non-infringement, and implied warranties
+            or conditions of merchantability and fitness for a particular purpose;
+          </li>
+          <li>ii) effectively excludes on behalf of all other Contributors all
+            liability for damages, including direct, indirect, special, incidental
+            and consequential damages, such as lost profits;
+          </li>
+          <li>iii) does not attempt to limit or alter the recipients&#039; rights in the
+            Source Code under section 3.2; and
+          </li>
+          <li>iv) requires any subsequent distribution of the Program by any party
+            to be under a license that satisfies the requirements of this section 3.
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <p>3.2 When the Program is Distributed as Source Code:</p>
+    <ul>
+      <li>a) it must be made available under this Agreement, or if the Program (i)
+        is combined with other material in a separate file or files made available
+        under a Secondary License, and (ii) the initial Contributor attached to
+        the Source Code the notice described in Exhibit A of this Agreement,
+        then the Program may be made available under the terms of such
+        Secondary Licenses, and
+      </li>
+      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+    </ul>
+    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+      attribution notices, disclaimers of warranty, or limitations of liability
+      (&lsquo;notices&rsquo;) contained within the Program from any copy of the Program which
+      they Distribute, provided that Contributors may add their own appropriate
+      notices.
+    </p>
+    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+    <p>Commercial distributors of software may accept certain responsibilities
+      with respect to end users, business partners and the like. While this
+      license is intended to facilitate the commercial use of the Program, the
+      Contributor who includes the Program in a commercial product offering should
+      do so in a manner which does not create potential liability for other
+      Contributors. Therefore, if a Contributor includes the Program in a
+      commercial product offering, such Contributor (&ldquo;Commercial Contributor&rdquo;)
+      hereby agrees to defend and indemnify every other Contributor
+      (&ldquo;Indemnified Contributor&rdquo;) against any losses, damages and costs
+      (collectively &ldquo;Losses&rdquo;) arising from claims, lawsuits and other legal actions
+      brought by a third party against the Indemnified Contributor to the extent
+      caused by the acts or omissions of such Commercial Contributor in connection
+      with its distribution of the Program in a commercial product offering.
+      The obligations in this section do not apply to any claims or Losses relating
+      to any actual or alleged intellectual property infringement. In order to
+      qualify, an Indemnified Contributor must: a) promptly notify the
+      Commercial Contributor in writing of such claim, and b) allow the Commercial
+      Contributor to control, and cooperate with the Commercial Contributor in,
+      the defense and any related settlement negotiations. The Indemnified
+      Contributor may participate in any such claim at its own expense.
+    </p>
+    <p>For example, a Contributor might include the Program
+      in a commercial product offering, Product X. That Contributor is then a
+      Commercial Contributor. If that Commercial Contributor then makes performance
+      claims, or offers warranties related to Product X, those performance claims
+      and warranties are such Commercial Contributor&#039;s responsibility alone.
+      Under this section, the Commercial Contributor would have to defend claims
+      against the other Contributors related to those performance claims and
+      warranties, and if a court requires any other Contributor to pay any damages
+      as a result, the Commercial Contributor must pay those damages.
+    </p>
+    <h2 id="warranty">5. NO WARRANTY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &ldquo;AS IS&rdquo; BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+      solely responsible for determining the appropriateness of using and
+      distributing the Program and assumes all risks associated with its
+      exercise of rights under this Agreement, including but not limited to the
+      risks and costs of program errors, compliance with applicable laws, damage
+      to or loss of data, programs or equipment, and unavailability or
+      interruption of operations.
+    </p>
+    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+    </p>
+    <h2 id="general">7. GENERAL</h2>
+    <p>If any provision of this Agreement is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability of the
+      remainder of the terms of this Agreement, and without further action by the
+      parties hereto, such provision shall be reformed to the minimum extent
+      necessary to make such provision valid and enforceable.
+    </p>
+    <p>If Recipient institutes patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+      (excluding combinations of the Program with other software or hardware)
+      infringes such Recipient&#039;s patent(s), then such Recipient&#039;s rights granted
+      under Section 2(b) shall terminate as of the date such litigation is filed.
+    </p>
+    <p>All Recipient&#039;s rights under this Agreement shall terminate if it fails to
+      comply with any of the material terms or conditions of this Agreement and
+      does not cure such failure in a reasonable period of time after becoming
+      aware of such noncompliance. If all Recipient&#039;s rights under this Agreement
+      terminate, Recipient agrees to cease use and distribution of the Program
+      as soon as reasonably practicable. However, Recipient&#039;s obligations under
+      this Agreement and any licenses granted by Recipient relating to the
+      Program shall continue and survive.
+    </p>
+    <p>Everyone is permitted to copy and distribute copies of this Agreement,
+      but in order to avoid inconsistency the Agreement is copyrighted and may
+      only be modified in the following manner. The Agreement Steward reserves
+      the right to publish new versions (including revisions) of this Agreement
+      from time to time. No one other than the Agreement Steward has the right
+      to modify this Agreement. The Eclipse Foundation is the initial Agreement
+      Steward. The Eclipse Foundation may assign the responsibility to serve as
+      the Agreement Steward to a suitable separate entity. Each new version of
+      the Agreement will be given a distinguishing version number. The Program
+      (including Contributions) may always be Distributed subject to the version
+      of the Agreement under which it was received. In addition, after a new
+      version of the Agreement is published, Contributor may elect to Distribute
+      the Program (including its Contributions) under the new version.
+    </p>
+    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+      receives no rights or licenses to the intellectual property of any
+      Contributor under this Agreement, whether expressly, by implication,
+      estoppel or otherwise. All rights in the Program not expressly granted
+      under this Agreement are reserved. Nothing in this Agreement is intended
+      to be enforceable by any entity that is not a Contributor or Recipient.
+      No third-party beneficiary rights are created under this Agreement.
+    </p>
+    <h2 id="exhibit-a">Exhibit A &ndash; Form of Secondary Licenses Notice</h2>
+    <p>&ldquo;This Source Code may also be made available under the following 
+    	Secondary Licenses when the conditions for such availability set forth 
+    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    	version(s), and exceptions or additional permissions here}.&rdquo;
+    </p>
+    <blockquote>
+      <p>Simply including a copy of this Agreement, including this Exhibit A
+        is not sufficient to license the Source Code under Secondary Licenses.
+      </p>
+      <p>If it is not possible or desirable to put the notice in a particular file,
+        then You may include the notice in a location (such as a LICENSE file in a
+        relevant directory) where a recipient would be likely to look for
+        such a notice.
+      </p>
+      <p>You may add additional accurate notices of copyright ownership.</p>
+    </blockquote>
+  </body>
+</html>
+\ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.table.tests/epl-v10.html b/org.eclipse.osbp.xtext.table.tests/epl-v10.html
deleted file mode 100644
index b398acc..0000000
--- a/org.eclipse.osbp.xtext.table.tests/epl-v10.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style>
-
-</head>
-
-<body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-
-
-</body></html>
-\ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.table.tests/license.html b/org.eclipse.osbp.xtext.table.tests/license.html
index 6e579a5..008b801 100644
--- a/org.eclipse.osbp.xtext.table.tests/license.html
+++ b/org.eclipse.osbp.xtext.table.tests/license.html
@@ -1,164 +1,189 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>Eclipse Foundation Software User Agreement</title>
 </head>
 
 <body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse
- Foundation is provided to you under the terms and conditions of the 
-Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also
- available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse Foundation 
-source code
-   repository ("Repository") in software modules ("Modules") and made 
-available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to 
-facilitate delivering, extending, and upgrading the Content.  Typical 
-modules may include plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&#8482; ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or 
-Fragments and associated material.  Each Feature may be packaged as a 
-sub-directory in a directory named "features".  Within a Feature, files 
-named "feature.xml" may contain a list of the names and version numbers 
-of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included 
-Features"). Within a Feature, files named "feature.xml" may contain a 
-list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be 
-contained in files named "about.html" ("Abouts"). The terms and 
-conditions governing Features and
-Included Features should be contained in files named "license.html" 
-("Feature Licenses").  Abouts and Feature Licenses may be located in any
- directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is 
-installed using the Provisioning Technology (as defined below), you must
- agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the 
-Feature Update License should either provide you with the terms and 
-conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be 
-found in the "license" property of files named "feature.properties" 
-found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the 
-terms and conditions (or references to such terms and conditions) that 
-govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER 
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
-  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND 
-CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, 
-or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions 
-govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, 
-examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of 
-allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This 
-capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about 
-packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install
- Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to
- be presented to, and accepted by, the users of the Provisioning 
-Technology
-   in accordance with the Specification. By using Provisioning 
-Technology in such a manner and making it available in accordance with 
-the
-   Specification, you further acknowledge your agreement to, and the 
-acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in 
-which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, 
-extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology 
-may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user 
-the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable 
-Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable 
-Software Agreement must inform the user of the terms and conditions that
- govern
-       the Installable Software and must solicit acceptance by the end 
-user in the manner prescribed in such Installable Software Agreement. 
-Upon such
-       indication of agreement by the user, the provisioning Technology 
-will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are
- currently may have restrictions on the import, possession, and use, 
-and/or re-export to
-   another country, of encryption software. BEFORE using any encryption 
-software, please check the country's laws, regulations and policies 
-concerning the import,
-   possession, or use, and re-export of encryption software, to see if 
-this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-
-
-</body></html>
-\ No newline at end of file
+	<h2>Eclipse Foundation Software User Agreement</h2>
+	<p>November 22, 2017</p>
+
+	<h3>Usage Of Content</h3>
+
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+		USE THE CONTENT.</p>
+
+	<h3>Applicable Licenses</h3>
+
+	<p>
+		Unless otherwise indicated, all Content made available by the Eclipse
+		Foundation is provided to you under the terms and conditions of the
+		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
+		EPL is provided with this Content and is also available at <a
+			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>Content includes, but is not limited to, source code, object
+		code, documentation and other files maintained in the Eclipse
+		Foundation source code repository (&quot;Repository&quot;) in software
+		modules (&quot;Modules&quot;) and made available as downloadable
+		archives (&quot;Downloads&quot;).</p>
+
+	<ul>
+		<li>Content may be structured and packaged into modules to
+			facilitate delivering, extending, and upgrading the Content. Typical
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
+			fragments (&quot;Fragments&quot;), and features
+			(&quot;Features&quot;).</li>
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
+			or JAR (Java&trade; ARchive) in a directory named
+			&quot;plugins&quot;.</li>
+		<li>A Feature is a bundle of one or more Plug-ins and/or
+			Fragments and associated material. Each Feature may be packaged as a
+			sub-directory in a directory named &quot;features&quot;. Within a
+			Feature, files named &quot;feature.xml&quot; may contain a list of
+			the names and version numbers of the Plug-ins and/or Fragments
+			associated with that Feature.</li>
+		<li>Features may also include other Features (&quot;Included
+			Features&quot;). Within a Feature, files named
+			&quot;feature.xml&quot; may contain a list of the names and version
+			numbers of Included Features.</li>
+	</ul>
+
+	<p>The terms and conditions governing Plug-ins and Fragments should
+		be contained in files named &quot;about.html&quot;
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
+		Included Features should be contained in files named
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
+		Feature Licenses may be located in any directory of a Download or
+		Module including, but not limited to the following locations:</p>
+
+	<ul>
+		<li>The top-level (root) directory</li>
+		<li>Plug-in and Fragment directories</li>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Sub-directories of the directory named &quot;src&quot; of
+			certain Plug-ins</li>
+		<li>Feature directories</li>
+	</ul>
+
+	<p>Note: if a Feature made available by the Eclipse Foundation is
+		installed using the Provisioning Technology (as defined below), you
+		must agree to a license (&quot;Feature Update License&quot;) during
+		the installation process. If the Feature contains Included Features,
+		the Feature Update License should either provide you with the terms
+		and conditions governing the Included Features or inform you where you
+		can locate them. Feature Update Licenses may be found in the
+		&quot;license&quot; property of files named
+		&quot;feature.properties&quot; found within a Feature. Such Abouts,
+		Feature Licenses, and Feature Update Licenses contain the terms and
+		conditions (or references to such terms and conditions) that govern
+		your use of the associated Content in that directory.</p>
+
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
+		ARE NOT LIMITED TO):</p>
+
+	<ul>
+		<li>Eclipse Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
+		</li>
+		<li>Eclipse Distribution License Version 1.0 (available at <a
+			href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
+		</li>
+		<li>Common Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
+		</li>
+		<li>Apache Software License 1.1 (available at <a
+			href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
+		</li>
+		<li>Apache Software License 2.0 (available at <a
+			href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
+		</li>
+		<li>Mozilla Public License Version 1.1 (available at <a
+			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
+		</li>
+	</ul>
+
+	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
+		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
+		or Feature Update License is provided, please contact the Eclipse
+		Foundation to determine what terms and conditions govern that
+		particular Content.</p>
+
+
+	<h3>Use of Provisioning Technology</h3>
+
+	<p>
+		The Eclipse Foundation makes available provisioning software, examples
+		of which include, but are not limited to, p2 and the Eclipse Update
+		Manager (&quot;Provisioning Technology&quot;) for the purpose of
+		allowing users to install software, documentation, information and/or
+		other materials (collectively &quot;Installable Software&quot;). This
+		capability is provided with the intent of allowing such users to
+		install, extend and update Eclipse-based products. Information about
+		packaging Installable Software is available at <a
+			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		(&quot;Specification&quot;).
+	</p>
+
+	<p>You may use Provisioning Technology to allow other parties to
+		install Installable Software. You shall be responsible for enabling
+		the applicable license agreements relating to the Installable Software
+		to be presented to, and accepted by, the users of the Provisioning
+		Technology in accordance with the Specification. By using Provisioning
+		Technology in such a manner and making it available in accordance with
+		the Specification, you further acknowledge your agreement to, and the
+		acquisition of all necessary rights to permit the following:</p>
+
+	<ol>
+		<li>A series of actions may occur (&quot;Provisioning
+			Process&quot;) in which a user may execute the Provisioning
+			Technology on a machine (&quot;Target Machine&quot;) with the intent
+			of installing, extending or updating the functionality of an
+			Eclipse-based product.</li>
+		<li>During the Provisioning Process, the Provisioning Technology
+			may cause third party Installable Software or a portion thereof to be
+			accessed and copied to the Target Machine.</li>
+		<li>Pursuant to the Specification, you will provide to the user
+			the terms and conditions that govern the use of the Installable
+			Software (&quot;Installable Software Agreement&quot;) and such
+			Installable Software Agreement shall be accessed from the Target
+			Machine in accordance with the Specification. Such Installable
+			Software Agreement must inform the user of the terms and conditions
+			that govern the Installable Software and must solicit acceptance by
+			the end user in the manner prescribed in such Installable Software
+			Agreement. Upon such indication of agreement by the user, the
+			provisioning Technology will complete installation of the Installable
+			Software.</li>
+	</ol>
+
+	<h3>Cryptography</h3>
+
+	<p>Content may contain encryption software. The country in which
+		you are currently may have restrictions on the import, possession, and
+		use, and/or re-export to another country, of encryption software.
+		BEFORE using any encryption software, please check the country's laws,
+		regulations and policies concerning the import, possession, or use,
+		and re-export of encryption software, to see if this is permitted.</p>
+
+	<p>
+		<small>Java and all Java-based trademarks are trademarks of
+			Oracle Corporation in the United States, other countries, or both.</small>
+	</p>
+</body>
+</html>
diff --git a/org.eclipse.osbp.xtext.table.tests/pom.xml b/org.eclipse.osbp.xtext.table.tests/pom.xml
index 47367f5..c3828f2 100644
--- a/org.eclipse.osbp.xtext.table.tests/pom.xml
+++ b/org.eclipse.osbp.xtext.table.tests/pom.xml
@@ -2,9 +2,11 @@
 <!--#======================================================================= -->
 <!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
 <!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
+<!--# are made available under the terms of the Eclipse Public License 2.0  -->
 <!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
+<!--# https://www.eclipse.org/legal/epl-2.0/    -->
+<!--#                                           -->
+<!--# SPDX-License-Identifier: EPL-2.0          -->
 <!--# -->
 <!--# Contributors: -->
 <!--#     Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
diff --git a/org.eclipse.osbp.xtext.table.tests/src-gen/org/eclipse/osbp/xtext/table/tests/TableDSLInjectorProvider.java b/org.eclipse.osbp.xtext.table.tests/src-gen/org/eclipse/osbp/xtext/table/tests/TableDSLInjectorProvider.java
index ff7d4f2..7550de7 100644
--- a/org.eclipse.osbp.xtext.table.tests/src-gen/org/eclipse/osbp/xtext/table/tests/TableDSLInjectorProvider.java
+++ b/org.eclipse.osbp.xtext.table.tests/src-gen/org/eclipse/osbp/xtext/table/tests/TableDSLInjectorProvider.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.tests;
 
diff --git a/org.eclipse.osbp.xtext.table.tests/src/org/eclipse/osbp/xtext/table/tests/TableDSLParsingTest.xtend b/org.eclipse.osbp.xtext.table.tests/src/org/eclipse/osbp/xtext/table/tests/TableDSLParsingTest.xtend
index e6b2d44..3e4d7b1 100644
--- a/org.eclipse.osbp.xtext.table.tests/src/org/eclipse/osbp/xtext/table/tests/TableDSLParsingTest.xtend
+++ b/org.eclipse.osbp.xtext.table.tests/src/org/eclipse/osbp/xtext/table/tests/TableDSLParsingTest.xtend
@@ -1,5 +1,20 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License 2.0        
+ *  which accompanies this distribution, and is available at                  
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ *  Contributors:                                                      
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
+ * 
+ *  This copyright notice shows up in the generated Java code
+ *
  */
 package org.eclipse.osbp.xtext.table.tests
 
diff --git a/org.eclipse.osbp.xtext.table.tests/xtend-gen/org/eclipse/osbp/xtext/table/tests/TableDSLParsingTest.java b/org.eclipse.osbp.xtext.table.tests/xtend-gen/org/eclipse/osbp/xtext/table/tests/TableDSLParsingTest.java
index f829026..831cc82 100644
--- a/org.eclipse.osbp.xtext.table.tests/xtend-gen/org/eclipse/osbp/xtext/table/tests/TableDSLParsingTest.java
+++ b/org.eclipse.osbp.xtext.table.tests/xtend-gen/org/eclipse/osbp/xtext/table/tests/TableDSLParsingTest.java
@@ -1,5 +1,16 @@
 /**
- * generated by Xtext 2.11.0
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.tests;
 
diff --git a/org.eclipse.osbp.xtext.table.ui/LICENSE.txt b/org.eclipse.osbp.xtext.table.ui/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.xtext.table.ui/LICENSE.txt
+++ b/org.eclipse.osbp.xtext.table.ui/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION
-OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.
-A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate
-modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of
-its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute
-and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code
-form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the
-combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not
-apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no
-assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity
-based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property
-rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the
-Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to
-grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including
-warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
-other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it
-in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and
-the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes
-the Program in a commercial product offering should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions
-brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual
-property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may
- participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is
-then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.
-Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to
-those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result,
-the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for
-determining the appropriateness of using and distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance
-with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such
-Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such
-noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses
- granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement
-is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish
-new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the
-right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including Contributions) may always be
-distributed subject to the version of the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the
-new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States
-of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause
-of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-\ No newline at end of file
+Eclipse Foundation Software User Agreement
+
+November 22, 2017
+
+Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
+MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the Eclipse Foundation
+is provided to you under the terms and conditions of the Eclipse Public License
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
+"Program" will mean the Content.
+
+Content includes, but is not limited to, source code, object code, documentation
+and other files maintained in the Eclipse Foundation source code repository
+("Repository") in software modules ("Modules") and made available as
+downloadable archives ("Downloads").
+
+-   Content may be structured and packaged into modules to facilitate
+    delivering, extending, and upgrading the Content. Typical modules may
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and
+    features ("Features").
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR
+    (Java™ ARchive) in a directory named "plugins".
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and
+    associated material. Each Feature may be packaged as a sub-directory in a
+    directory named "features". Within a Feature, files named "feature.xml" may
+    contain a list of the names and version numbers of the Plug-ins and/or
+    Fragments associated with that Feature.
+-   Features may also include other Features ("Included Features"). Within a
+    Feature, files named "feature.xml" may contain a list of the names and
+    version numbers of Included Features.
+
+The terms and conditions governing Plug-ins and Fragments should be contained in
+files named "about.html" ("Abouts"). The terms and conditions governing Features
+and Included Features should be contained in files named "license.html"
+("Feature Licenses"). Abouts and Feature Licenses may be located in any
+directory of a Download or Module including, but not limited to the following
+locations:
+
+-   The top-level (root) directory
+-   Plug-in and Fragment directories
+-   Inside Plug-ins and Fragments packaged as JARs
+-   Sub-directories of the directory named "src" of certain Plug-ins
+-   Feature directories
+
+Note: if a Feature made available by the Eclipse Foundation is installed using
+the Provisioning Technology (as defined below), you must agree to a license
+("Feature Update License") during the installation process. If the Feature
+contains Included Features, the Feature Update License should either provide you
+with the terms and conditions governing the Included Features or inform you
+where you can locate them. Feature Update Licenses may be found in the "license"
+property of files named "feature.properties" found within a Feature. Such
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and
+conditions (or references to such terms and conditions) that govern your use of
+the associated Content in that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+-   Eclipse Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/epl-v10.html)
+-   Eclipse Distribution License Version 1.0 (available at
+    http://www.eclipse.org/licenses/edl-v1.0.html)
+-   Common Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/cpl-v10.html)
+-   Apache Software License 1.1 (available at
+    http://www.apache.org/licenses/LICENSE)
+-   Apache Software License 2.0 (available at
+    http://www.apache.org/licenses/LICENSE-2.0)
+-   Mozilla Public License Version 1.1 (available at
+    http://www.mozilla.org/MPL/MPL-1.1.html)
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is
+provided, please contact the Eclipse Foundation to determine what terms and
+conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which
+include, but are not limited to, p2 and the Eclipse Update Manager
+("Provisioning Technology") for the purpose of allowing users to install
+software, documentation, information and/or other materials (collectively
+"Installable Software"). This capability is provided with the intent of allowing
+such users to install, extend and update Eclipse-based products. Information
+about packaging Installable Software is available at
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
+
+You may use Provisioning Technology to allow other parties to install
+Installable Software. You shall be responsible for enabling the applicable
+license agreements relating to the Installable Software to be presented to, and
+accepted by, the users of the Provisioning Technology in accordance with the
+Specification. By using Provisioning Technology in such a manner and making it
+available in accordance with the Specification, you further acknowledge your
+agreement to, and the acquisition of all necessary rights to permit the
+following:
+
+1.  A series of actions may occur ("Provisioning Process") in which a user may
+    execute the Provisioning Technology on a machine ("Target Machine") with the
+    intent of installing, extending or updating the functionality of an
+    Eclipse-based product.
+2.  During the Provisioning Process, the Provisioning Technology may cause third
+    party Installable Software or a portion thereof to be accessed and copied to
+    the Target Machine.
+3.  Pursuant to the Specification, you will provide to the user the terms and
+    conditions that govern the use of the Installable Software ("Installable
+    Software Agreement") and such Installable Software Agreement shall be
+    accessed from the Target Machine in accordance with the Specification. Such
+    Installable Software Agreement must inform the user of the terms and
+    conditions that govern the Installable Software and must solicit acceptance
+    by the end user in the manner prescribed in such Installable
+    Software Agreement. Upon such indication of agreement by the user, the
+    provisioning Technology will complete installation of the
+    Installable Software.
+
+Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the
+United States, other countries, or both.
diff --git a/org.eclipse.osbp.xtext.table.ui/about.html b/org.eclipse.osbp.xtext.table.ui/about.html
index 64c0598..e8b834d 100644
--- a/org.eclipse.osbp.xtext.table.ui/about.html
+++ b/org.eclipse.osbp.xtext.table.ui/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 1, 2016</p>	
+<p>November 30, 2017</p>	
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/org.eclipse.osbp.xtext.table.ui/about.properties b/org.eclipse.osbp.xtext.table.ui/about.properties
index a040603..8be0f46 100644
--- a/org.eclipse.osbp.xtext.table.ui/about.properties
+++ b/org.eclipse.osbp.xtext.table.ui/about.properties
@@ -1,9 +1,11 @@
 #
 # Copyright (c) 2012, 2016 - Loetz GmbH&Co.KG (Heidelberg)
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0 
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
@@ -17,9 +19,11 @@ featureName=org.eclipse.osbp.xtext.table.ui
 featureText=\
 Copyright (c) 2012-2016 - Loetz GmbH&Co.KG \n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0 \n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
 \n\
 Contributors:\n\
     Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation\n
diff --git a/org.eclipse.osbp.xtext.table.ui/build.properties b/org.eclipse.osbp.xtext.table.ui/build.properties
index 77467f6..cb2ad00 100644
--- a/org.eclipse.osbp.xtext.table.ui/build.properties
+++ b/org.eclipse.osbp.xtext.table.ui/build.properties
@@ -11,9 +11,9 @@ bin.includes = about.properties,  about.mappings,  about.ini,  about.html,  META
                templates/,\
                license.html,\
                LICENSE.txt,\
-               epl-v10.html,\
+               epl-2.0.html,\
                icons/
 src.includes = about.properties,  about.mappings,  about.ini,  about.html,  license.html,\
                LICENSE.txt,\
-               epl-v10.html,\
+               epl-2.0.html,\
                icons/
diff --git a/org.eclipse.osbp.xtext.table.ui/epl-2.0.html b/org.eclipse.osbp.xtext.table.ui/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/org.eclipse.osbp.xtext.table.ui/epl-2.0.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Eclipse Public License - Version 2.0</title>
+    <style type="text/css">
+      body {
+        margin: 1.5em 3em;
+      }
+      h1{
+        font-size:1.5em;
+      }
+      h2{
+        font-size:1em;
+        margin-bottom:0.5em;
+        margin-top:1em;
+      }
+      p {
+        margin-top:  0.5em;
+        margin-bottom: 0.5em;
+      }
+      ul, ol{
+        list-style-type:none;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Eclipse Public License - v 2.0</h1>
+    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+      PUBLIC LICENSE (&ldquo;AGREEMENT&rdquo;). ANY USE, REPRODUCTION OR DISTRIBUTION
+      OF THE PROGRAM CONSTITUTES RECIPIENT&#039;S ACCEPTANCE OF THIS AGREEMENT.
+    </p>
+    <h2 id="definitions">1. DEFINITIONS</h2>
+    <p>&ldquo;Contribution&rdquo; means:</p>
+    <ul>
+      <li>a) in the case of the initial Contributor, the initial content
+        Distributed under this Agreement, and
+      </li>
+      <li>
+        b) in the case of each subsequent Contributor:
+        <ul>
+          <li>i) changes to the Program, and</li>
+          <li>ii) additions to the Program;</li>
+        </ul>
+        where such changes and/or additions to the Program originate from
+        and are Distributed by that particular Contributor. A Contribution
+        &ldquo;originates&rdquo; from a Contributor if it was added to the Program by such
+        Contributor itself or anyone acting on such Contributor&#039;s behalf.
+        Contributions do not include changes or additions to the Program that
+        are not Modified Works.
+      </li>
+    </ul>
+    <p>&ldquo;Contributor&rdquo; means any person or entity that Distributes the Program.</p>
+    <p>&ldquo;Licensed Patents&rdquo; mean patent claims licensable by a Contributor which
+      are necessarily infringed by the use or sale of its Contribution alone
+      or when combined with the Program.
+    </p>
+    <p>&ldquo;Program&rdquo; means the Contributions Distributed in accordance with this
+      Agreement.
+    </p>
+    <p>&ldquo;Recipient&rdquo; means anyone who receives the Program under this Agreement
+      or any Secondary License (as applicable), including Contributors.
+    </p>
+    <p>&ldquo;Derivative Works&rdquo; shall mean any work, whether in Source Code or other
+      form, that is based on (or derived from) the Program and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship.
+    </p>
+    <p>&ldquo;Modified Works&rdquo; shall mean any work in Source Code or other form that
+      results from an addition to, deletion from, or modification of the
+      contents of the Program, including, for purposes of clarity any new file
+      in Source Code form that contains any contents of the Program. Modified
+      Works shall not include works that contain only declarations, interfaces,
+      types, classes, structures, or files of the Program solely in each case
+      in order to link to, bind by name, or subclass the Program or Modified
+      Works thereof.
+    </p>
+    <p>&ldquo;Distribute&rdquo; means the acts of a) distributing or b) making available
+      in any manner that enables the transfer of a copy.
+    </p>
+    <p>&ldquo;Source Code&rdquo; means the form of a Program preferred for making
+      modifications, including but not limited to software source code,
+      documentation source, and configuration files.
+    </p>
+    <p>&ldquo;Secondary License&rdquo; means either the GNU General Public License,
+      Version 2.0, or any later versions of that license, including any
+      exceptions or additional permissions as identified by the initial
+      Contributor.
+    </p>
+    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+    <ul>
+      <li>a) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free copyright
+        license to reproduce, prepare Derivative Works of, publicly display,
+        publicly perform, Distribute and sublicense the Contribution of such
+        Contributor, if any, and such Derivative Works.
+      </li>
+      <li>b) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free patent
+        license under Licensed Patents to make, use, sell, offer to sell,
+        import and otherwise transfer the Contribution of such Contributor,
+        if any, in Source Code or other form. This patent license shall
+        apply to the combination of the Contribution and the Program if,
+        at the time the Contribution is added by the Contributor, such
+        addition of the Contribution causes such combination to be covered
+        by the Licensed Patents. The patent license shall not apply to any
+        other combinations which include the Contribution. No hardware per
+        se is licensed hereunder.
+      </li>
+      <li>c) Recipient understands that although each Contributor grants the
+        licenses to its Contributions set forth herein, no assurances are
+        provided by any Contributor that the Program does not infringe the
+        patent or other intellectual property rights of any other entity.
+        Each Contributor disclaims any liability to Recipient for claims
+        brought by any other entity based on infringement of intellectual
+        property rights or otherwise. As a condition to exercising the rights
+        and licenses granted hereunder, each Recipient hereby assumes sole
+        responsibility to secure any other intellectual property rights needed,
+        if any. For example, if a third party patent license is required to
+        allow Recipient to Distribute the Program, it is Recipient&#039;s
+        responsibility to acquire that license before distributing the Program.
+      </li>
+      <li>d) Each Contributor represents that to its knowledge it has sufficient
+        copyright rights in its Contribution, if any, to grant the copyright
+        license set forth in this Agreement.
+      </li>
+      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+        makes additional grants to any Recipient (other than those set forth
+        in this Agreement) as a result of such Recipient&#039;s receipt of the
+        Program under the terms of a Secondary License (if permitted under
+        the terms of Section 3).
+      </li>
+    </ul>
+    <h2 id="requirements">3. REQUIREMENTS</h2>
+    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+    <ul>
+      <li>a) the Program must also be made available as Source Code, in
+        accordance with section 3.2, and the Contributor must accompany
+        the Program with a statement that the Source Code for the Program
+        is available under this Agreement, and informs Recipients how to
+        obtain it in a reasonable manner on or through a medium customarily
+        used for software exchange; and
+      </li>
+      <li>
+        b) the Contributor may Distribute the Program under a license
+        different than this Agreement, provided that such license:
+        <ul>
+          <li>i) effectively disclaims on behalf of all other Contributors all
+            warranties and conditions, express and implied, including warranties
+            or conditions of title and non-infringement, and implied warranties
+            or conditions of merchantability and fitness for a particular purpose;
+          </li>
+          <li>ii) effectively excludes on behalf of all other Contributors all
+            liability for damages, including direct, indirect, special, incidental
+            and consequential damages, such as lost profits;
+          </li>
+          <li>iii) does not attempt to limit or alter the recipients&#039; rights in the
+            Source Code under section 3.2; and
+          </li>
+          <li>iv) requires any subsequent distribution of the Program by any party
+            to be under a license that satisfies the requirements of this section 3.
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <p>3.2 When the Program is Distributed as Source Code:</p>
+    <ul>
+      <li>a) it must be made available under this Agreement, or if the Program (i)
+        is combined with other material in a separate file or files made available
+        under a Secondary License, and (ii) the initial Contributor attached to
+        the Source Code the notice described in Exhibit A of this Agreement,
+        then the Program may be made available under the terms of such
+        Secondary Licenses, and
+      </li>
+      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+    </ul>
+    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+      attribution notices, disclaimers of warranty, or limitations of liability
+      (&lsquo;notices&rsquo;) contained within the Program from any copy of the Program which
+      they Distribute, provided that Contributors may add their own appropriate
+      notices.
+    </p>
+    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+    <p>Commercial distributors of software may accept certain responsibilities
+      with respect to end users, business partners and the like. While this
+      license is intended to facilitate the commercial use of the Program, the
+      Contributor who includes the Program in a commercial product offering should
+      do so in a manner which does not create potential liability for other
+      Contributors. Therefore, if a Contributor includes the Program in a
+      commercial product offering, such Contributor (&ldquo;Commercial Contributor&rdquo;)
+      hereby agrees to defend and indemnify every other Contributor
+      (&ldquo;Indemnified Contributor&rdquo;) against any losses, damages and costs
+      (collectively &ldquo;Losses&rdquo;) arising from claims, lawsuits and other legal actions
+      brought by a third party against the Indemnified Contributor to the extent
+      caused by the acts or omissions of such Commercial Contributor in connection
+      with its distribution of the Program in a commercial product offering.
+      The obligations in this section do not apply to any claims or Losses relating
+      to any actual or alleged intellectual property infringement. In order to
+      qualify, an Indemnified Contributor must: a) promptly notify the
+      Commercial Contributor in writing of such claim, and b) allow the Commercial
+      Contributor to control, and cooperate with the Commercial Contributor in,
+      the defense and any related settlement negotiations. The Indemnified
+      Contributor may participate in any such claim at its own expense.
+    </p>
+    <p>For example, a Contributor might include the Program
+      in a commercial product offering, Product X. That Contributor is then a
+      Commercial Contributor. If that Commercial Contributor then makes performance
+      claims, or offers warranties related to Product X, those performance claims
+      and warranties are such Commercial Contributor&#039;s responsibility alone.
+      Under this section, the Commercial Contributor would have to defend claims
+      against the other Contributors related to those performance claims and
+      warranties, and if a court requires any other Contributor to pay any damages
+      as a result, the Commercial Contributor must pay those damages.
+    </p>
+    <h2 id="warranty">5. NO WARRANTY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &ldquo;AS IS&rdquo; BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+      solely responsible for determining the appropriateness of using and
+      distributing the Program and assumes all risks associated with its
+      exercise of rights under this Agreement, including but not limited to the
+      risks and costs of program errors, compliance with applicable laws, damage
+      to or loss of data, programs or equipment, and unavailability or
+      interruption of operations.
+    </p>
+    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+    </p>
+    <h2 id="general">7. GENERAL</h2>
+    <p>If any provision of this Agreement is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability of the
+      remainder of the terms of this Agreement, and without further action by the
+      parties hereto, such provision shall be reformed to the minimum extent
+      necessary to make such provision valid and enforceable.
+    </p>
+    <p>If Recipient institutes patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+      (excluding combinations of the Program with other software or hardware)
+      infringes such Recipient&#039;s patent(s), then such Recipient&#039;s rights granted
+      under Section 2(b) shall terminate as of the date such litigation is filed.
+    </p>
+    <p>All Recipient&#039;s rights under this Agreement shall terminate if it fails to
+      comply with any of the material terms or conditions of this Agreement and
+      does not cure such failure in a reasonable period of time after becoming
+      aware of such noncompliance. If all Recipient&#039;s rights under this Agreement
+      terminate, Recipient agrees to cease use and distribution of the Program
+      as soon as reasonably practicable. However, Recipient&#039;s obligations under
+      this Agreement and any licenses granted by Recipient relating to the
+      Program shall continue and survive.
+    </p>
+    <p>Everyone is permitted to copy and distribute copies of this Agreement,
+      but in order to avoid inconsistency the Agreement is copyrighted and may
+      only be modified in the following manner. The Agreement Steward reserves
+      the right to publish new versions (including revisions) of this Agreement
+      from time to time. No one other than the Agreement Steward has the right
+      to modify this Agreement. The Eclipse Foundation is the initial Agreement
+      Steward. The Eclipse Foundation may assign the responsibility to serve as
+      the Agreement Steward to a suitable separate entity. Each new version of
+      the Agreement will be given a distinguishing version number. The Program
+      (including Contributions) may always be Distributed subject to the version
+      of the Agreement under which it was received. In addition, after a new
+      version of the Agreement is published, Contributor may elect to Distribute
+      the Program (including its Contributions) under the new version.
+    </p>
+    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+      receives no rights or licenses to the intellectual property of any
+      Contributor under this Agreement, whether expressly, by implication,
+      estoppel or otherwise. All rights in the Program not expressly granted
+      under this Agreement are reserved. Nothing in this Agreement is intended
+      to be enforceable by any entity that is not a Contributor or Recipient.
+      No third-party beneficiary rights are created under this Agreement.
+    </p>
+    <h2 id="exhibit-a">Exhibit A &ndash; Form of Secondary Licenses Notice</h2>
+    <p>&ldquo;This Source Code may also be made available under the following 
+    	Secondary Licenses when the conditions for such availability set forth 
+    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    	version(s), and exceptions or additional permissions here}.&rdquo;
+    </p>
+    <blockquote>
+      <p>Simply including a copy of this Agreement, including this Exhibit A
+        is not sufficient to license the Source Code under Secondary Licenses.
+      </p>
+      <p>If it is not possible or desirable to put the notice in a particular file,
+        then You may include the notice in a location (such as a LICENSE file in a
+        relevant directory) where a recipient would be likely to look for
+        such a notice.
+      </p>
+      <p>You may add additional accurate notices of copyright ownership.</p>
+    </blockquote>
+  </body>
+</html>
+\ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.table.ui/epl-v10.html b/org.eclipse.osbp.xtext.table.ui/epl-v10.html
deleted file mode 100644
index b398acc..0000000
--- a/org.eclipse.osbp.xtext.table.ui/epl-v10.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style>
-
-</head>
-
-<body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-
-
-</body></html>
-\ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.table.ui/license.html b/org.eclipse.osbp.xtext.table.ui/license.html
index 6e579a5..008b801 100644
--- a/org.eclipse.osbp.xtext.table.ui/license.html
+++ b/org.eclipse.osbp.xtext.table.ui/license.html
@@ -1,164 +1,189 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>Eclipse Foundation Software User Agreement</title>
 </head>
 
 <body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse
- Foundation is provided to you under the terms and conditions of the 
-Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also
- available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse Foundation 
-source code
-   repository ("Repository") in software modules ("Modules") and made 
-available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to 
-facilitate delivering, extending, and upgrading the Content.  Typical 
-modules may include plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&#8482; ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or 
-Fragments and associated material.  Each Feature may be packaged as a 
-sub-directory in a directory named "features".  Within a Feature, files 
-named "feature.xml" may contain a list of the names and version numbers 
-of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included 
-Features"). Within a Feature, files named "feature.xml" may contain a 
-list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be 
-contained in files named "about.html" ("Abouts"). The terms and 
-conditions governing Features and
-Included Features should be contained in files named "license.html" 
-("Feature Licenses").  Abouts and Feature Licenses may be located in any
- directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is 
-installed using the Provisioning Technology (as defined below), you must
- agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the 
-Feature Update License should either provide you with the terms and 
-conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be 
-found in the "license" property of files named "feature.properties" 
-found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the 
-terms and conditions (or references to such terms and conditions) that 
-govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER 
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
-  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND 
-CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, 
-or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions 
-govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, 
-examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of 
-allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This 
-capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about 
-packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install
- Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to
- be presented to, and accepted by, the users of the Provisioning 
-Technology
-   in accordance with the Specification. By using Provisioning 
-Technology in such a manner and making it available in accordance with 
-the
-   Specification, you further acknowledge your agreement to, and the 
-acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in 
-which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, 
-extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology 
-may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user 
-the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable 
-Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable 
-Software Agreement must inform the user of the terms and conditions that
- govern
-       the Installable Software and must solicit acceptance by the end 
-user in the manner prescribed in such Installable Software Agreement. 
-Upon such
-       indication of agreement by the user, the provisioning Technology 
-will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are
- currently may have restrictions on the import, possession, and use, 
-and/or re-export to
-   another country, of encryption software. BEFORE using any encryption 
-software, please check the country's laws, regulations and policies 
-concerning the import,
-   possession, or use, and re-export of encryption software, to see if 
-this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-
-
-</body></html>
-\ No newline at end of file
+	<h2>Eclipse Foundation Software User Agreement</h2>
+	<p>November 22, 2017</p>
+
+	<h3>Usage Of Content</h3>
+
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+		USE THE CONTENT.</p>
+
+	<h3>Applicable Licenses</h3>
+
+	<p>
+		Unless otherwise indicated, all Content made available by the Eclipse
+		Foundation is provided to you under the terms and conditions of the
+		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
+		EPL is provided with this Content and is also available at <a
+			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>Content includes, but is not limited to, source code, object
+		code, documentation and other files maintained in the Eclipse
+		Foundation source code repository (&quot;Repository&quot;) in software
+		modules (&quot;Modules&quot;) and made available as downloadable
+		archives (&quot;Downloads&quot;).</p>
+
+	<ul>
+		<li>Content may be structured and packaged into modules to
+			facilitate delivering, extending, and upgrading the Content. Typical
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
+			fragments (&quot;Fragments&quot;), and features
+			(&quot;Features&quot;).</li>
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
+			or JAR (Java&trade; ARchive) in a directory named
+			&quot;plugins&quot;.</li>
+		<li>A Feature is a bundle of one or more Plug-ins and/or
+			Fragments and associated material. Each Feature may be packaged as a
+			sub-directory in a directory named &quot;features&quot;. Within a
+			Feature, files named &quot;feature.xml&quot; may contain a list of
+			the names and version numbers of the Plug-ins and/or Fragments
+			associated with that Feature.</li>
+		<li>Features may also include other Features (&quot;Included
+			Features&quot;). Within a Feature, files named
+			&quot;feature.xml&quot; may contain a list of the names and version
+			numbers of Included Features.</li>
+	</ul>
+
+	<p>The terms and conditions governing Plug-ins and Fragments should
+		be contained in files named &quot;about.html&quot;
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
+		Included Features should be contained in files named
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
+		Feature Licenses may be located in any directory of a Download or
+		Module including, but not limited to the following locations:</p>
+
+	<ul>
+		<li>The top-level (root) directory</li>
+		<li>Plug-in and Fragment directories</li>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Sub-directories of the directory named &quot;src&quot; of
+			certain Plug-ins</li>
+		<li>Feature directories</li>
+	</ul>
+
+	<p>Note: if a Feature made available by the Eclipse Foundation is
+		installed using the Provisioning Technology (as defined below), you
+		must agree to a license (&quot;Feature Update License&quot;) during
+		the installation process. If the Feature contains Included Features,
+		the Feature Update License should either provide you with the terms
+		and conditions governing the Included Features or inform you where you
+		can locate them. Feature Update Licenses may be found in the
+		&quot;license&quot; property of files named
+		&quot;feature.properties&quot; found within a Feature. Such Abouts,
+		Feature Licenses, and Feature Update Licenses contain the terms and
+		conditions (or references to such terms and conditions) that govern
+		your use of the associated Content in that directory.</p>
+
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
+		ARE NOT LIMITED TO):</p>
+
+	<ul>
+		<li>Eclipse Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
+		</li>
+		<li>Eclipse Distribution License Version 1.0 (available at <a
+			href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
+		</li>
+		<li>Common Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
+		</li>
+		<li>Apache Software License 1.1 (available at <a
+			href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
+		</li>
+		<li>Apache Software License 2.0 (available at <a
+			href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
+		</li>
+		<li>Mozilla Public License Version 1.1 (available at <a
+			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
+		</li>
+	</ul>
+
+	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
+		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
+		or Feature Update License is provided, please contact the Eclipse
+		Foundation to determine what terms and conditions govern that
+		particular Content.</p>
+
+
+	<h3>Use of Provisioning Technology</h3>
+
+	<p>
+		The Eclipse Foundation makes available provisioning software, examples
+		of which include, but are not limited to, p2 and the Eclipse Update
+		Manager (&quot;Provisioning Technology&quot;) for the purpose of
+		allowing users to install software, documentation, information and/or
+		other materials (collectively &quot;Installable Software&quot;). This
+		capability is provided with the intent of allowing such users to
+		install, extend and update Eclipse-based products. Information about
+		packaging Installable Software is available at <a
+			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		(&quot;Specification&quot;).
+	</p>
+
+	<p>You may use Provisioning Technology to allow other parties to
+		install Installable Software. You shall be responsible for enabling
+		the applicable license agreements relating to the Installable Software
+		to be presented to, and accepted by, the users of the Provisioning
+		Technology in accordance with the Specification. By using Provisioning
+		Technology in such a manner and making it available in accordance with
+		the Specification, you further acknowledge your agreement to, and the
+		acquisition of all necessary rights to permit the following:</p>
+
+	<ol>
+		<li>A series of actions may occur (&quot;Provisioning
+			Process&quot;) in which a user may execute the Provisioning
+			Technology on a machine (&quot;Target Machine&quot;) with the intent
+			of installing, extending or updating the functionality of an
+			Eclipse-based product.</li>
+		<li>During the Provisioning Process, the Provisioning Technology
+			may cause third party Installable Software or a portion thereof to be
+			accessed and copied to the Target Machine.</li>
+		<li>Pursuant to the Specification, you will provide to the user
+			the terms and conditions that govern the use of the Installable
+			Software (&quot;Installable Software Agreement&quot;) and such
+			Installable Software Agreement shall be accessed from the Target
+			Machine in accordance with the Specification. Such Installable
+			Software Agreement must inform the user of the terms and conditions
+			that govern the Installable Software and must solicit acceptance by
+			the end user in the manner prescribed in such Installable Software
+			Agreement. Upon such indication of agreement by the user, the
+			provisioning Technology will complete installation of the Installable
+			Software.</li>
+	</ol>
+
+	<h3>Cryptography</h3>
+
+	<p>Content may contain encryption software. The country in which
+		you are currently may have restrictions on the import, possession, and
+		use, and/or re-export to another country, of encryption software.
+		BEFORE using any encryption software, please check the country's laws,
+		regulations and policies concerning the import, possession, or use,
+		and re-export of encryption software, to see if this is permitted.</p>
+
+	<p>
+		<small>Java and all Java-based trademarks are trademarks of
+			Oracle Corporation in the United States, other countries, or both.</small>
+	</p>
+</body>
+</html>
diff --git a/org.eclipse.osbp.xtext.table.ui/pom.xml b/org.eclipse.osbp.xtext.table.ui/pom.xml
index 0afb461..2023601 100644
--- a/org.eclipse.osbp.xtext.table.ui/pom.xml
+++ b/org.eclipse.osbp.xtext.table.ui/pom.xml
@@ -2,9 +2,11 @@
 <!--#======================================================================= -->
 <!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
 <!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
+<!--# are made available under the terms of the Eclipse Public License 2.0  -->
 <!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
+<!--# https://www.eclipse.org/legal/epl-2.0/    -->
+<!--#                                           -->
+<!--# SPDX-License-Identifier: EPL-2.0          -->
 <!--# -->
 <!--# Contributors: -->
 <!--#     Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
diff --git a/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/AbstractTableDSLUiModule.java b/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/AbstractTableDSLUiModule.java
index 066ff39..b9aee15 100644
--- a/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/AbstractTableDSLUiModule.java
+++ b/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/AbstractTableDSLUiModule.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.ui;
 
diff --git a/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/TableDSLExecutableExtensionFactory.java b/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/TableDSLExecutableExtensionFactory.java
index ff2fd95..4b12c12 100644
--- a/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/TableDSLExecutableExtensionFactory.java
+++ b/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/TableDSLExecutableExtensionFactory.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.ui;
 
diff --git a/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/contentassist/AbstractTableDSLProposalProvider.java b/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/contentassist/AbstractTableDSLProposalProvider.java
index 62c15ee..da9909d 100644
--- a/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/contentassist/AbstractTableDSLProposalProvider.java
+++ b/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/contentassist/AbstractTableDSLProposalProvider.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.ui.contentassist;
 
@@ -51,12 +62,6 @@ public abstract class AbstractTableDSLProposalProvider extends OXtypeProposalPro
 	public void completeTableSelection_HeaderMode(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeTableSelection_Polling(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void completeTableSelection_PollingTime(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
 	public void completeTableSelection_Filtering(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
@@ -78,12 +83,6 @@ public abstract class AbstractTableDSLProposalProvider extends OXtypeProposalPro
 	public void completeTableTable_HeaderMode(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeTableTable_Polling(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void completeTableTable_PollingTime(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
 	public void completeTableTable_Filtering(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
@@ -96,33 +95,6 @@ public abstract class AbstractTableDSLProposalProvider extends OXtypeProposalPro
 	public void completeTableTable_Source(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeTableBean_Selectalways(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void completeTableBean_SelectById(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void completeTableBean_HeaderMode(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeTableBean_Polling(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void completeTableBean_PollingTime(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeTableBean_Filtering(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void completeTableBean_Embedded(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void completeTableBean_Toolbar(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeTableBean_Source(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
 	public void completeTablePreorder_Column(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
@@ -294,27 +266,6 @@ public abstract class AbstractTableDSLProposalProvider extends OXtypeProposalPro
 	public void completeTableTooltip_Tooltip(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeTableGrid_Selectalways(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void completeTableGrid_HeaderMode(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeTableGrid_Polling(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void completeTableGrid_PollingTime(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeTableGrid_Filtering(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void completeTableGrid_Embedded(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void completeTableGrid_Toolbar(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
-	}
 	public void completeTableGrid_Source(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
@@ -430,9 +381,6 @@ public abstract class AbstractTableDSLProposalProvider extends OXtypeProposalPro
 	public void complete_TableTable(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void complete_TableBean(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
 	public void complete_TablePreorder(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
@@ -583,6 +531,9 @@ public abstract class AbstractTableDSLProposalProvider extends OXtypeProposalPro
 	public void complete_PropertyTextStyle(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
+	public void complete_PropertyBlobImageStyle(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
 	public void complete_PropertyImageStyle(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
diff --git a/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/internal/TableActivator.java b/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/internal/TableActivator.java
index fc7cc98..f024e19 100644
--- a/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/internal/TableActivator.java
+++ b/org.eclipse.osbp.xtext.table.ui/src-gen/org/eclipse/osbp/xtext/table/ui/internal/TableActivator.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.ui.internal;
 
diff --git a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLDocumentationTranslator.java b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLDocumentationTranslator.java
index 239a4ff..eae5f15 100644
--- a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLDocumentationTranslator.java
+++ b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLDocumentationTranslator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLEObjectHover.java b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLEObjectHover.java
index 084f5c5..6820643 100644
--- a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLEObjectHover.java
+++ b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLEObjectHover.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLEObjectHoverDocumentationProvider.java b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLEObjectHoverDocumentationProvider.java
index 0acf174..b815f11 100644
--- a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLEObjectHoverDocumentationProvider.java
+++ b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLEObjectHoverDocumentationProvider.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLEObjectHoverProvider.java b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLEObjectHoverProvider.java
index 7fbd5c8..5f6495f 100644
--- a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLEObjectHoverProvider.java
+++ b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLEObjectHoverProvider.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
diff --git a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLUiModule.java b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLUiModule.java
index 2aca79f..668a6eb 100644
--- a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLUiModule.java
+++ b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/TableDSLUiModule.java
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/contentassist/TableDSLProposalProvider.xtend b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/contentassist/TableDSLProposalProvider.xtend
index edd34fc..b99714c 100644
--- a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/contentassist/TableDSLProposalProvider.xtend
+++ b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/contentassist/TableDSLProposalProvider.xtend
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
@@ -19,8 +21,12 @@ package org.eclipse.osbp.xtext.table.ui.contentassist
 import javax.inject.Inject
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.jface.viewers.StyledString
+import org.eclipse.osbp.dsl.common.datatypes.IDto
 import org.eclipse.osbp.fork.mihalis.opal.widgets.ImageSelectorDialog
+import org.eclipse.osbp.infogrid.model.gridsource.CxGridNestedField
+import org.eclipse.osbp.infogrid.model.gridsource.CxGridNestedPath
 import org.eclipse.osbp.infogrid.model.gridsource.CxGridProperty
+import org.eclipse.osbp.infogrid.model.gridsource.style.CxGridPropBlobImageStyle
 import org.eclipse.osbp.infogrid.model.gridsource.style.CxGridPropBooleanStyle
 import org.eclipse.osbp.infogrid.model.gridsource.style.CxGridPropButtonStyle
 import org.eclipse.osbp.infogrid.model.gridsource.style.CxGridPropDateStyle
@@ -64,15 +70,12 @@ import org.eclipse.xtext.Keyword
 import org.eclipse.xtext.ParserRule
 import org.eclipse.xtext.RuleCall
 import org.eclipse.xtext.XtextPackage
+import org.eclipse.xtext.common.types.JvmDeclaredType
 import org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider
 import org.eclipse.xtext.ui.editor.contentassist.ConfigurableCompletionProposal
 import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext
 import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor
 import org.eclipse.xtext.ui.editor.contentassist.ReplacementTextApplier
-import org.eclipse.osbp.dsl.common.datatypes.IDto
-import org.eclipse.xtext.common.types.JvmDeclaredType
-import org.eclipse.osbp.infogrid.model.gridsource.CxGridNestedField
-import org.eclipse.osbp.infogrid.model.gridsource.CxGridNestedPath
 
 class ImageFileNameTextApplier extends ReplacementTextApplier {
 	var ContentAssistContext context
@@ -143,7 +146,7 @@ class TableDSLProposalProvider extends AbstractTableDSLProposalProvider {
 	def imageFilePickerProposal(EObject model, Assignment assignment, ContentAssistContext context,
 		ICompletionProposalAcceptor acceptor, String fileExtensions) {
 		var fileName = createCompletionProposal(imageSelectionPrompt, context) as ConfigurableCompletionProposal
-		if (fileName != null) {
+		if (fileName !== null) {
 			var applier = new ImageFileNameTextApplier()
 			applier.setExtensions(fileExtensions.split(","))
 			applier.setContext(context)
@@ -199,7 +202,13 @@ class TableDSLProposalProvider extends AbstractTableDSLProposalProvider {
 						if (eObject !== null) {
 							var rule = eObject as ParserRule
 
-							if (nestedFieldType.boolean && rule.booleanStyle) {
+							// no dotted nested field attribute path but complete nested field
+							if (nestedFieldType===null) {
+								var ruleTypeClass = rule.type?.classifier.instanceClass
+								if (typeof(CxGridPropTextStyle).equals(ruleTypeClass)) {
+									context.setProposal(acceptor, keyword)
+								}
+							} else if (nestedFieldType.boolean && rule.booleanStyle) {
 								context.setProposal(acceptor, keyword)
 							} else if (nestedFieldType.string && rule.textStyle) {
 								context.setProposal(acceptor, keyword)
@@ -241,7 +250,7 @@ class TableDSLProposalProvider extends AbstractTableDSLProposalProvider {
 
 	def boolean isTextStyle(ParserRule rule){
 		var ruleTypeClass = rule.type?.classifier.instanceClass
-		return	(typeof(CxGridPropTextStyle).equals(ruleTypeClass) || typeof(CxGridPropHtmlStyle).equals(ruleTypeClass) || typeof(CxGridPropButtonStyle).equals(ruleTypeClass) || typeof(CxGridPropImageStyle).equals(ruleTypeClass))
+		return	(typeof(CxGridPropTextStyle).equals(ruleTypeClass) || typeof(CxGridPropHtmlStyle).equals(ruleTypeClass) || typeof(CxGridPropButtonStyle).equals(ruleTypeClass) || typeof(CxGridPropImageStyle).equals(ruleTypeClass) || typeof(CxGridPropBlobImageStyle).equals(ruleTypeClass))
 	}
 
 	def boolean isNumberStyle(ParserRule rule){
diff --git a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLDescriptionLabelProvider.xtend b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLDescriptionLabelProvider.xtend
index bcd0a92..6857957 100644
--- a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLDescriptionLabelProvider.xtend
+++ b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLDescriptionLabelProvider.xtend
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLLabelProvider.xtend b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLLabelProvider.xtend
index c1ba65b..1169f67 100644
--- a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLLabelProvider.xtend
+++ b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLLabelProvider.xtend
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/outline/TableDSLOutlineTreeProvider.xtend b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/outline/TableDSLOutlineTreeProvider.xtend
index 4b375c8..987092b 100644
--- a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/outline/TableDSLOutlineTreeProvider.xtend
+++ b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/outline/TableDSLOutlineTreeProvider.xtend
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/quickfix/TableDSLQuickfixProvider.xtend b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/quickfix/TableDSLQuickfixProvider.xtend
index 966037a..cb5f73f 100644
--- a/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/quickfix/TableDSLQuickfixProvider.xtend
+++ b/org.eclipse.osbp.xtext.table.ui/src/org/eclipse/osbp/xtext/table/ui/quickfix/TableDSLQuickfixProvider.xtend
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/contentassist/ImageFileNameTextApplier.java b/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/contentassist/ImageFileNameTextApplier.java
index 7412bce..4539c4e 100644
--- a/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/contentassist/ImageFileNameTextApplier.java
+++ b/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/contentassist/ImageFileNameTextApplier.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0 
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/contentassist/MyReplacementTextApplier.java b/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/contentassist/MyReplacementTextApplier.java
index 3e7a1ad..c4e28d1 100644
--- a/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/contentassist/MyReplacementTextApplier.java
+++ b/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/contentassist/MyReplacementTextApplier.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0 
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/contentassist/TableDSLProposalProvider.java b/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/contentassist/TableDSLProposalProvider.java
index 45161b8..e04b460 100644
--- a/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/contentassist/TableDSLProposalProvider.java
+++ b/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/contentassist/TableDSLProposalProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0 
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
@@ -26,6 +28,7 @@ import org.eclipse.osbp.dsl.common.datatypes.IDto;
 import org.eclipse.osbp.infogrid.model.gridsource.CxGridNestedField;
 import org.eclipse.osbp.infogrid.model.gridsource.CxGridNestedPath;
 import org.eclipse.osbp.infogrid.model.gridsource.CxGridProperty;
+import org.eclipse.osbp.infogrid.model.gridsource.style.CxGridPropBlobImageStyle;
 import org.eclipse.osbp.infogrid.model.gridsource.style.CxGridPropBooleanStyle;
 import org.eclipse.osbp.infogrid.model.gridsource.style.CxGridPropButtonStyle;
 import org.eclipse.osbp.infogrid.model.gridsource.style.CxGridPropDateStyle;
@@ -128,8 +131,7 @@ public class TableDSLProposalProvider extends AbstractTableDSLProposalProvider {
   public void imageFilePickerProposal(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor, final String fileExtensions) {
     ICompletionProposal _createCompletionProposal = this.createCompletionProposal(this.imageSelectionPrompt, context);
     ConfigurableCompletionProposal fileName = ((ConfigurableCompletionProposal) _createCompletionProposal);
-    boolean _notEquals = (!Objects.equal(fileName, null));
-    if (_notEquals) {
+    if ((fileName != null)) {
       ImageFileNameTextApplier applier = new ImageFileNameTextApplier();
       applier.setExtensions(fileExtensions.split(","));
       applier.setContext(context);
@@ -214,26 +216,39 @@ public class TableDSLProposalProvider extends AbstractTableDSLProposalProvider {
             }
             if ((eObject != null)) {
               ParserRule rule = ((ParserRule) eObject);
-              if ((this._typeHelper.isBoolean(nestedFieldType) && this.isBooleanStyle(rule))) {
-                this.setProposal(context, acceptor, keyword);
+              if ((nestedFieldType == null)) {
+                TypeRef _type_1 = rule.getType();
+                EClassifier _classifier = null;
+                if (_type_1!=null) {
+                  _classifier=_type_1.getClassifier();
+                }
+                Class<?> ruleTypeClass = _classifier.getInstanceClass();
+                boolean _equals_2 = CxGridPropTextStyle.class.equals(ruleTypeClass);
+                if (_equals_2) {
+                  this.setProposal(context, acceptor, keyword);
+                }
               } else {
-                if ((this._typeHelper.isString(nestedFieldType) && this.isTextStyle(rule))) {
+                if ((this._typeHelper.isBoolean(nestedFieldType) && this.isBooleanStyle(rule))) {
                   this.setProposal(context, acceptor, keyword);
                 } else {
-                  boolean _isNumber = this._typeHelper.isNumber(nestedFieldType);
-                  if (_isNumber) {
-                    if ((this._typeHelper.isNumberWithDigits(nestedFieldType) && this.isProgressStyle(rule))) {
-                      this.setProposal(context, acceptor, keyword);
+                  if ((this._typeHelper.isString(nestedFieldType) && this.isTextStyle(rule))) {
+                    this.setProposal(context, acceptor, keyword);
+                  } else {
+                    boolean _isNumber = this._typeHelper.isNumber(nestedFieldType);
+                    if (_isNumber) {
+                      if ((this._typeHelper.isNumberWithDigits(nestedFieldType) && this.isProgressStyle(rule))) {
+                        this.setProposal(context, acceptor, keyword);
+                      } else {
+                        boolean _isNumberStyle = this.isNumberStyle(rule);
+                        if (_isNumberStyle) {
+                          this.setProposal(context, acceptor, keyword);
+                        }
+                      }
                     } else {
-                      boolean _isNumberStyle = this.isNumberStyle(rule);
-                      if (_isNumberStyle) {
+                      if ((this._typeHelper.isDate(nestedFieldType) && this.isDateStyle(rule))) {
                         this.setProposal(context, acceptor, keyword);
                       }
                     }
-                  } else {
-                    if ((this._typeHelper.isDate(nestedFieldType) && this.isDateStyle(rule))) {
-                      this.setProposal(context, acceptor, keyword);
-                    }
                   }
                 }
               }
@@ -282,7 +297,7 @@ public class TableDSLProposalProvider extends AbstractTableDSLProposalProvider {
       _classifier=_type.getClassifier();
     }
     Class<?> ruleTypeClass = _classifier.getInstanceClass();
-    return (((CxGridPropTextStyle.class.equals(ruleTypeClass) || CxGridPropHtmlStyle.class.equals(ruleTypeClass)) || CxGridPropButtonStyle.class.equals(ruleTypeClass)) || CxGridPropImageStyle.class.equals(ruleTypeClass));
+    return ((((CxGridPropTextStyle.class.equals(ruleTypeClass) || CxGridPropHtmlStyle.class.equals(ruleTypeClass)) || CxGridPropButtonStyle.class.equals(ruleTypeClass)) || CxGridPropImageStyle.class.equals(ruleTypeClass)) || CxGridPropBlobImageStyle.class.equals(ruleTypeClass));
   }
   
   public boolean isNumberStyle(final ParserRule rule) {
diff --git a/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLDescriptionLabelProvider.java b/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLDescriptionLabelProvider.java
index 1ef55c4..e7f802e 100644
--- a/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLDescriptionLabelProvider.java
+++ b/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLDescriptionLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0 
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLLabelProvider.java b/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLLabelProvider.java
index 77b7e27..0dbf3fc 100644
--- a/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLLabelProvider.java
+++ b/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/labeling/TableDSLLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0 
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/outline/TableDSLOutlineTreeProvider.java b/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/outline/TableDSLOutlineTreeProvider.java
index 4290861..211c5fb 100644
--- a/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/outline/TableDSLOutlineTreeProvider.java
+++ b/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/outline/TableDSLOutlineTreeProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0 
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/quickfix/TableDSLQuickfixProvider.java b/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/quickfix/TableDSLQuickfixProvider.java
index ea9247a..9c20204 100644
--- a/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/quickfix/TableDSLQuickfixProvider.java
+++ b/org.eclipse.osbp.xtext.table.ui/xtend-gen/org/eclipse/osbp/xtext/table/ui/quickfix/TableDSLQuickfixProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0 
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/LICENSE.txt b/org.eclipse.osbp.xtext.table/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.xtext.table/LICENSE.txt
+++ b/org.eclipse.osbp.xtext.table/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION
-OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.
-A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate
-modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of
-its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute
-and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code
-form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the
-combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not
-apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no
-assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity
-based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property
-rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the
-Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to
-grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including
-warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
-other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it
-in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and
-the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes
-the Program in a commercial product offering should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions
-brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual
-property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may
- participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is
-then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.
-Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to
-those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result,
-the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for
-determining the appropriateness of using and distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance
-with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such
-Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such
-noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses
- granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement
-is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish
-new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the
-right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including Contributions) may always be
-distributed subject to the version of the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the
-new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States
-of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause
-of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-\ No newline at end of file
+Eclipse Foundation Software User Agreement
+
+November 22, 2017
+
+Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
+MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the Eclipse Foundation
+is provided to you under the terms and conditions of the Eclipse Public License
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
+"Program" will mean the Content.
+
+Content includes, but is not limited to, source code, object code, documentation
+and other files maintained in the Eclipse Foundation source code repository
+("Repository") in software modules ("Modules") and made available as
+downloadable archives ("Downloads").
+
+-   Content may be structured and packaged into modules to facilitate
+    delivering, extending, and upgrading the Content. Typical modules may
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and
+    features ("Features").
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR
+    (Java™ ARchive) in a directory named "plugins".
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and
+    associated material. Each Feature may be packaged as a sub-directory in a
+    directory named "features". Within a Feature, files named "feature.xml" may
+    contain a list of the names and version numbers of the Plug-ins and/or
+    Fragments associated with that Feature.
+-   Features may also include other Features ("Included Features"). Within a
+    Feature, files named "feature.xml" may contain a list of the names and
+    version numbers of Included Features.
+
+The terms and conditions governing Plug-ins and Fragments should be contained in
+files named "about.html" ("Abouts"). The terms and conditions governing Features
+and Included Features should be contained in files named "license.html"
+("Feature Licenses"). Abouts and Feature Licenses may be located in any
+directory of a Download or Module including, but not limited to the following
+locations:
+
+-   The top-level (root) directory
+-   Plug-in and Fragment directories
+-   Inside Plug-ins and Fragments packaged as JARs
+-   Sub-directories of the directory named "src" of certain Plug-ins
+-   Feature directories
+
+Note: if a Feature made available by the Eclipse Foundation is installed using
+the Provisioning Technology (as defined below), you must agree to a license
+("Feature Update License") during the installation process. If the Feature
+contains Included Features, the Feature Update License should either provide you
+with the terms and conditions governing the Included Features or inform you
+where you can locate them. Feature Update Licenses may be found in the "license"
+property of files named "feature.properties" found within a Feature. Such
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and
+conditions (or references to such terms and conditions) that govern your use of
+the associated Content in that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+-   Eclipse Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/epl-v10.html)
+-   Eclipse Distribution License Version 1.0 (available at
+    http://www.eclipse.org/licenses/edl-v1.0.html)
+-   Common Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/cpl-v10.html)
+-   Apache Software License 1.1 (available at
+    http://www.apache.org/licenses/LICENSE)
+-   Apache Software License 2.0 (available at
+    http://www.apache.org/licenses/LICENSE-2.0)
+-   Mozilla Public License Version 1.1 (available at
+    http://www.mozilla.org/MPL/MPL-1.1.html)
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is
+provided, please contact the Eclipse Foundation to determine what terms and
+conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which
+include, but are not limited to, p2 and the Eclipse Update Manager
+("Provisioning Technology") for the purpose of allowing users to install
+software, documentation, information and/or other materials (collectively
+"Installable Software"). This capability is provided with the intent of allowing
+such users to install, extend and update Eclipse-based products. Information
+about packaging Installable Software is available at
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
+
+You may use Provisioning Technology to allow other parties to install
+Installable Software. You shall be responsible for enabling the applicable
+license agreements relating to the Installable Software to be presented to, and
+accepted by, the users of the Provisioning Technology in accordance with the
+Specification. By using Provisioning Technology in such a manner and making it
+available in accordance with the Specification, you further acknowledge your
+agreement to, and the acquisition of all necessary rights to permit the
+following:
+
+1.  A series of actions may occur ("Provisioning Process") in which a user may
+    execute the Provisioning Technology on a machine ("Target Machine") with the
+    intent of installing, extending or updating the functionality of an
+    Eclipse-based product.
+2.  During the Provisioning Process, the Provisioning Technology may cause third
+    party Installable Software or a portion thereof to be accessed and copied to
+    the Target Machine.
+3.  Pursuant to the Specification, you will provide to the user the terms and
+    conditions that govern the use of the Installable Software ("Installable
+    Software Agreement") and such Installable Software Agreement shall be
+    accessed from the Target Machine in accordance with the Specification. Such
+    Installable Software Agreement must inform the user of the terms and
+    conditions that govern the Installable Software and must solicit acceptance
+    by the end user in the manner prescribed in such Installable
+    Software Agreement. Upon such indication of agreement by the user, the
+    provisioning Technology will complete installation of the
+    Installable Software.
+
+Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the
+United States, other countries, or both.
diff --git a/org.eclipse.osbp.xtext.table/about.html b/org.eclipse.osbp.xtext.table/about.html
index 64c0598..e8b834d 100644
--- a/org.eclipse.osbp.xtext.table/about.html
+++ b/org.eclipse.osbp.xtext.table/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>June 1, 2016</p>	
+<p>November 30, 2017</p>	
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/org.eclipse.osbp.xtext.table/about.properties b/org.eclipse.osbp.xtext.table/about.properties
index b3fe48f..2a9f844 100644
--- a/org.eclipse.osbp.xtext.table/about.properties
+++ b/org.eclipse.osbp.xtext.table/about.properties
@@ -1,9 +1,11 @@
 #
 # Copyright (c) 2012, 2016 - Loetz GmbH&Co.KG (Heidelberg)
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0 
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
@@ -17,9 +19,11 @@ featureName=org.eclipse.osbp.xtext.table
 featureText=\
 Copyright (c) 2012-2016 - Loetz GmbH&Co.KG \n\
 All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0 \n\
 which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
 \n\
 Contributors:\n\
     Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation\n
diff --git a/org.eclipse.osbp.xtext.table/build.properties b/org.eclipse.osbp.xtext.table/build.properties
index 87243ce..667d304 100644
--- a/org.eclipse.osbp.xtext.table/build.properties
+++ b/org.eclipse.osbp.xtext.table/build.properties
@@ -1,12 +1,12 @@
 # Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
 #  All rights reserved. This program and the accompanying materials 
-#  are made available under the terms of the Eclipse Public License v1.0 
+#  are made available under the terms of the Eclipse Public License 2.0  
 #  which accompanies this distribution, and is available at 
-#  http{//www.eclipse.org/legal/epl-v10.html 
+#  http{//www.eclipse.org/legal/epl-2.0.html 
 # 
 #  Based on ideas from Xtext, Xtend, Xcore
 #   
-#  Contributors{  
+#  Contributors:  
 #  		Joerg Riegel - Initial implementation 
 #  
 
@@ -24,8 +24,8 @@ bin.includes = about.properties,  about.mappings,  about.ini,  about.html,  mode
                .settings/,\
                license.html,\
                LICENSE.txt,\
-               epl-v10.html
+               epl-2.0.html
 src.includes = about.properties,  about.mappings,  about.ini,  about.html,  license.html,\
                LICENSE.txt,\
-               epl-v10.html			   
+               epl-2.0.html			   
 
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Calculation.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Calculation.java
index a240e31..91addf1 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Calculation.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Calculation.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/ConditionalExpression.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/ConditionalExpression.java
index 15e15ef..b71fa37 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/ConditionalExpression.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/ConditionalExpression.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Conjunction.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Conjunction.java
index 0a2e92d..16bf8f5 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Conjunction.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Conjunction.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Disjunction.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Disjunction.java
index b464207..49929ba 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Disjunction.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Disjunction.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Expression.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Expression.java
index fe6f437..994b89a 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Expression.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Expression.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/OperatorEnum.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/OperatorEnum.java
index dc4fd9c..8924507 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/OperatorEnum.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/OperatorEnum.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/RowHeaderMode.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/RowHeaderMode.java
index 5d388df..c2f1279 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/RowHeaderMode.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/RowHeaderMode.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Table.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Table.java
index bb9d556..18dec13 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Table.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/Table.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAggregation.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAggregation.java
index fd9c1f7..93e0c38 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAggregation.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAggregation.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAllColumns.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAllColumns.java
index a5cc2f9..32bf70b 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAllColumns.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAllColumns.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAttribute.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAttribute.java
index bcbca3e..dcff099 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAttribute.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAttribute.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAxis.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAxis.java
index 7419339..cd9043a 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAxis.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableAxis.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableBase.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableBase.java
index 468c74a..b2a88f7 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableBase.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableBase.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableBean.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableBean.java
deleted file mode 100644
index cb44084..0000000
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableBean.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
- *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
- *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
- * 
- *  Based on ideas from Xtext, Xtend, Xcore
- * 
- *  Contributors{  
- *  		Joerg Riegel - Initial implementation 
- *  
- */
-package org.eclipse.osbp.xtext.table;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Table Bean</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.osbp.xtext.table.TableBean#isSelectById <em>Select By Id</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.TableBean#isSelectalways <em>Selectalways</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.TableBean#getHeaderMode <em>Header Mode</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.TableBean#getSource <em>Source</em>}</li>
- * </ul>
- *
- * @see org.eclipse.osbp.xtext.table.TableDSLPackage#getTableBean()
- * @model
- * @generated
- */
-public interface TableBean extends TableOption {
-	/**
-	 * Returns the value of the '<em><b>Select By Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Select By Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Select By Id</em>' attribute.
-	 * @see #setSelectById(boolean)
-	 * @see org.eclipse.osbp.xtext.table.TableDSLPackage#getTableBean_SelectById()
-	 * @model unique="false"
-	 * @generated
-	 */
-	boolean isSelectById();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.table.TableBean#isSelectById <em>Select By Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Select By Id</em>' attribute.
-	 * @see #isSelectById()
-	 * @generated
-	 */
-	void setSelectById(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Selectalways</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Selectalways</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Selectalways</em>' attribute.
-	 * @see #setSelectalways(boolean)
-	 * @see org.eclipse.osbp.xtext.table.TableDSLPackage#getTableBean_Selectalways()
-	 * @model unique="false"
-	 * @generated
-	 */
-	boolean isSelectalways();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.table.TableBean#isSelectalways <em>Selectalways</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Selectalways</em>' attribute.
-	 * @see #isSelectalways()
-	 * @generated
-	 */
-	void setSelectalways(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Header Mode</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.osbp.xtext.table.RowHeaderMode}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Header Mode</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Header Mode</em>' attribute.
-	 * @see org.eclipse.osbp.xtext.table.RowHeaderMode
-	 * @see #setHeaderMode(RowHeaderMode)
-	 * @see org.eclipse.osbp.xtext.table.TableDSLPackage#getTableBean_HeaderMode()
-	 * @model unique="false"
-	 * @generated
-	 */
-	RowHeaderMode getHeaderMode();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.table.TableBean#getHeaderMode <em>Header Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Header Mode</em>' attribute.
-	 * @see org.eclipse.osbp.xtext.table.RowHeaderMode
-	 * @see #getHeaderMode()
-	 * @generated
-	 */
-	void setHeaderMode(RowHeaderMode value);
-
-	/**
-	 * Returns the value of the '<em><b>Source</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Source</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Source</em>' containment reference.
-	 * @see #setSource(TableDatamart)
-	 * @see org.eclipse.osbp.xtext.table.TableDSLPackage#getTableBean_Source()
-	 * @model containment="true"
-	 * @generated
-	 */
-	TableDatamart getSource();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.table.TableBean#getSource <em>Source</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source</em>' containment reference.
-	 * @see #getSource()
-	 * @generated
-	 */
-	void setSource(TableDatamart value);
-
-} // TableBean
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableBeanDatasource.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableBeanDatasource.java
deleted file mode 100644
index 695446d..0000000
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableBeanDatasource.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
- *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
- *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
- * 
- *  Based on ideas from Xtext, Xtend, Xcore
- * 
- *  Contributors{  
- *  		Joerg Riegel - Initial implementation 
- *  
- */
-package org.eclipse.osbp.xtext.table;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.osbp.xtext.datamartdsl.DatamartDefinition;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Table Bean Datasource</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.osbp.xtext.table.TableBeanDatasource#getDatamartRef <em>Datamart Ref</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.TableBeanDatasource#getElements <em>Elements</em>}</li>
- * </ul>
- *
- * @see org.eclipse.osbp.xtext.table.TableDSLPackage#getTableBeanDatasource()
- * @model
- * @generated
- */
-public interface TableBeanDatasource extends TableLazyResolver {
-	/**
-	 * Returns the value of the '<em><b>Datamart Ref</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Datamart Ref</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Datamart Ref</em>' reference.
-	 * @see #setDatamartRef(DatamartDefinition)
-	 * @see org.eclipse.osbp.xtext.table.TableDSLPackage#getTableBeanDatasource_DatamartRef()
-	 * @model
-	 * @generated
-	 */
-	DatamartDefinition getDatamartRef();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.table.TableBeanDatasource#getDatamartRef <em>Datamart Ref</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Datamart Ref</em>' reference.
-	 * @see #getDatamartRef()
-	 * @generated
-	 */
-	void setDatamartRef(DatamartDefinition value);
-
-	/**
-	 * Returns the value of the '<em><b>Elements</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.osbp.xtext.table.TableElement}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Elements</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Elements</em>' containment reference list.
-	 * @see org.eclipse.osbp.xtext.table.TableDSLPackage#getTableBeanDatasource_Elements()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<TableElement> getElements();
-
-} // TableBeanDatasource
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableCellColor.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableCellColor.java
index a57d93e..02b5fa3 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableCellColor.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableCellColor.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableColumn.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableColumn.java
index 78b1dd1..e4deb2d 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableColumn.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableColumn.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDSLFactory.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDSLFactory.java
index 28042f5..75639cf 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDSLFactory.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDSLFactory.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
@@ -105,24 +107,6 @@ public interface TableDSLFactory extends EFactory {
 	TableGrid createTableGrid();
 
 	/**
-	 * Returns a new object of class '<em>Table Bean</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Table Bean</em>'.
-	 * @generated
-	 */
-	TableBean createTableBean();
-
-	/**
-	 * Returns a new object of class '<em>Table Bean Datasource</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Table Bean Datasource</em>'.
-	 * @generated
-	 */
-	TableBeanDatasource createTableBeanDatasource();
-
-	/**
 	 * Returns a new object of class '<em>Table Dto Datasource</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDSLPackage.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDSLPackage.java
index df0b074..b65c2f9 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDSLPackage.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDSLPackage.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
@@ -37,7 +39,9 @@ import org.eclipse.osbp.infogrid.model.gridsource.CxGridSourcePackage;
  * <!-- end-user-doc -->
  * @see org.eclipse.osbp.xtext.table.TableDSLFactory
  * @model kind="package"
- *        annotation="http://www.eclipse.org/emf/2002/GenModel fileExtensions='table' modelName='TableDSL' prefix='TableDSL' operationReflection='false' updateClasspath='false' loadInitialization='false' literalsInterface='true' copyrightText='Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)\r\n All rights reserved. This program and the accompanying materials \r\n are made available under the terms of the Eclipse Public License v1.0 \r\n which accompanies this distribution, and is available at \r\n http{//www.eclipse.org/legal/epl-v10.html \r\n\r\n Based on ideas from Xtext, Xtend, Xcore\r\n\r\n Contributors{  \r\n \t\tJoerg Riegel - Initial implementation \r\n ' basePackage='org.eclipse.osbp.xtext'"
+n https://www.eclipse.org/legal/epl-2.0/ \r\n\r\n Based on ideas from Xtext, Xtend, Xcore\r\n\r\n Contributors:  \r\n \t\tJoerg Riegel - Initial implementation \r\n ' basePackage='org.eclipse.osbp.xtext'"
+n \r\n\r\n Based on ideas from Xtext, Xtend, Xcore\r\n\r\n Contributors:  \r\n \t\tJoerg Riegel - Initial implementation \r\n ' basePackage='org.eclipse.osbp.xtext'"
+n SPDX-License-Identifier: EPL-2.0 \r\n\r\n Based on ideas from Xtext, Xtend, Xcore\r\n\r\n Contributors:  \r\n \t\tJoerg Riegel - Initial implementation \r\n ' basePackage='org.eclipse.osbp.xtext'"
  *        annotation="http://www.eclipse.org/emf/2002/Ecore rootPackage='tabledsl'"
  * @generated
  */
@@ -261,31 +265,13 @@ public interface TableDSLPackage extends EPackage {
 	int TABLE_OPTION = 5;
 
 	/**
-	 * The feature id for the '<em><b>Polling</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_OPTION__POLLING = TABLE_LAZY_RESOLVER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Polling Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_OPTION__POLLING_TIME = TABLE_LAZY_RESOLVER_FEATURE_COUNT + 1;
-
-	/**
 	 * The feature id for the '<em><b>Filtering</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int TABLE_OPTION__FILTERING = TABLE_LAZY_RESOLVER_FEATURE_COUNT + 2;
+	int TABLE_OPTION__FILTERING = TABLE_LAZY_RESOLVER_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Toolbar</b></em>' reference.
@@ -294,7 +280,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TABLE_OPTION__TOOLBAR = TABLE_LAZY_RESOLVER_FEATURE_COUNT + 3;
+	int TABLE_OPTION__TOOLBAR = TABLE_LAZY_RESOLVER_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Embedded</b></em>' attribute.
@@ -303,7 +289,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TABLE_OPTION__EMBEDDED = TABLE_LAZY_RESOLVER_FEATURE_COUNT + 4;
+	int TABLE_OPTION__EMBEDDED = TABLE_LAZY_RESOLVER_FEATURE_COUNT + 2;
 
 	/**
 	 * The number of structural features of the '<em>Table Option</em>' class.
@@ -312,7 +298,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TABLE_OPTION_FEATURE_COUNT = TABLE_LAZY_RESOLVER_FEATURE_COUNT + 5;
+	int TABLE_OPTION_FEATURE_COUNT = TABLE_LAZY_RESOLVER_FEATURE_COUNT + 3;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.xtext.table.impl.TableTableImpl <em>Table Table</em>}' class.
@@ -325,24 +311,6 @@ public interface TableDSLPackage extends EPackage {
 	int TABLE_TABLE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Polling</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_TABLE__POLLING = TABLE_OPTION__POLLING;
-
-	/**
-	 * The feature id for the '<em><b>Polling Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_TABLE__POLLING_TIME = TABLE_OPTION__POLLING_TIME;
-
-	/**
 	 * The feature id for the '<em><b>Filtering</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -425,24 +393,6 @@ public interface TableDSLPackage extends EPackage {
 	int TABLE_SELECTION = 6;
 
 	/**
-	 * The feature id for the '<em><b>Polling</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_SELECTION__POLLING = TABLE_TABLE__POLLING;
-
-	/**
-	 * The feature id for the '<em><b>Polling Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_SELECTION__POLLING_TIME = TABLE_TABLE__POLLING_TIME;
-
-	/**
 	 * The feature id for the '<em><b>Filtering</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -534,24 +484,6 @@ public interface TableDSLPackage extends EPackage {
 	int TABLE_GRID = 8;
 
 	/**
-	 * The feature id for the '<em><b>Polling</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_GRID__POLLING = TABLE_OPTION__POLLING;
-
-	/**
-	 * The feature id for the '<em><b>Polling Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_GRID__POLLING_TIME = TABLE_OPTION__POLLING_TIME;
-
-	/**
 	 * The feature id for the '<em><b>Filtering</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -615,143 +547,6 @@ public interface TableDSLPackage extends EPackage {
 	int TABLE_GRID_FEATURE_COUNT = TABLE_OPTION_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.osbp.xtext.table.impl.TableBeanImpl <em>Table Bean</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.osbp.xtext.table.impl.TableBeanImpl
-	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableBean()
-	 * @generated
-	 */
-	int TABLE_BEAN = 9;
-
-	/**
-	 * The feature id for the '<em><b>Polling</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_BEAN__POLLING = TABLE_OPTION__POLLING;
-
-	/**
-	 * The feature id for the '<em><b>Polling Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_BEAN__POLLING_TIME = TABLE_OPTION__POLLING_TIME;
-
-	/**
-	 * The feature id for the '<em><b>Filtering</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_BEAN__FILTERING = TABLE_OPTION__FILTERING;
-
-	/**
-	 * The feature id for the '<em><b>Toolbar</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_BEAN__TOOLBAR = TABLE_OPTION__TOOLBAR;
-
-	/**
-	 * The feature id for the '<em><b>Embedded</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_BEAN__EMBEDDED = TABLE_OPTION__EMBEDDED;
-
-	/**
-	 * The feature id for the '<em><b>Select By Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_BEAN__SELECT_BY_ID = TABLE_OPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Selectalways</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_BEAN__SELECTALWAYS = TABLE_OPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Header Mode</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_BEAN__HEADER_MODE = TABLE_OPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_BEAN__SOURCE = TABLE_OPTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Table Bean</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_BEAN_FEATURE_COUNT = TABLE_OPTION_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.osbp.xtext.table.impl.TableBeanDatasourceImpl <em>Table Bean Datasource</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.osbp.xtext.table.impl.TableBeanDatasourceImpl
-	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableBeanDatasource()
-	 * @generated
-	 */
-	int TABLE_BEAN_DATASOURCE = 10;
-
-	/**
-	 * The feature id for the '<em><b>Datamart Ref</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_BEAN_DATASOURCE__DATAMART_REF = TABLE_LAZY_RESOLVER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Elements</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_BEAN_DATASOURCE__ELEMENTS = TABLE_LAZY_RESOLVER_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Table Bean Datasource</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_BEAN_DATASOURCE_FEATURE_COUNT = TABLE_LAZY_RESOLVER_FEATURE_COUNT + 2;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.xtext.table.impl.TableDtoDatasourceImpl <em>Table Dto Datasource</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -759,7 +554,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableDtoDatasource()
 	 * @generated
 	 */
-	int TABLE_DTO_DATASOURCE = 11;
+	int TABLE_DTO_DATASOURCE = 9;
 
 	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
@@ -834,6 +629,15 @@ public interface TableDSLPackage extends EPackage {
 	int TABLE_DTO_DATASOURCE__SELECTION_EVENT_TOPIC = CxGridSourcePackage.CX_GRID_SOURCE__SELECTION_EVENT_TOPIC;
 
 	/**
+	 * The feature id for the '<em><b>Group Nested Types</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_DTO_DATASOURCE__GROUP_NESTED_TYPES = CxGridSourcePackage.CX_GRID_SOURCE__GROUP_NESTED_TYPES;
+
+	/**
 	 * The feature id for the '<em><b>Dto Source</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -859,7 +663,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableGridProperty()
 	 * @generated
 	 */
-	int TABLE_GRID_PROPERTY = 12;
+	int TABLE_GRID_PROPERTY = 10;
 
 	/**
 	 * The feature id for the '<em><b>Path</b></em>' containment reference.
@@ -914,7 +718,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTablePreorder()
 	 * @generated
 	 */
-	int TABLE_PREORDER = 13;
+	int TABLE_PREORDER = 11;
 
 	/**
 	 * The feature id for the '<em><b>Column</b></em>' containment reference.
@@ -951,7 +755,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableValue()
 	 * @generated
 	 */
-	int TABLE_VALUE = 14;
+	int TABLE_VALUE = 12;
 
 	/**
 	 * The feature id for the '<em><b>Column</b></em>' containment reference.
@@ -1069,7 +873,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableFormatter()
 	 * @generated
 	 */
-	int TABLE_FORMATTER = 15;
+	int TABLE_FORMATTER = 13;
 
 	/**
 	 * The feature id for the '<em><b>Format</b></em>' attribute.
@@ -1097,7 +901,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableImage()
 	 * @generated
 	 */
-	int TABLE_IMAGE = 16;
+	int TABLE_IMAGE = 14;
 
 	/**
 	 * The feature id for the '<em><b>Image Path Pattern</b></em>' attribute.
@@ -1170,7 +974,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableTooltipPattern()
 	 * @generated
 	 */
-	int TABLE_TOOLTIP_PATTERN = 17;
+	int TABLE_TOOLTIP_PATTERN = 15;
 
 	/**
 	 * The feature id for the '<em><b>Tooltip Pattern</b></em>' attribute.
@@ -1198,7 +1002,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableValueElement()
 	 * @generated
 	 */
-	int TABLE_VALUE_ELEMENT = 18;
+	int TABLE_VALUE_ELEMENT = 16;
 
 	/**
 	 * The number of structural features of the '<em>Table Value Element</em>' class.
@@ -1217,7 +1021,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getExpression()
 	 * @generated
 	 */
-	int EXPRESSION = 47;
+	int EXPRESSION = 45;
 
 	/**
 	 * The feature id for the '<em><b>Number Value</b></em>' attribute.
@@ -1254,7 +1058,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableTask()
 	 * @generated
 	 */
-	int TABLE_TASK = 19;
+	int TABLE_TASK = 17;
 
 	/**
 	 * The feature id for the '<em><b>Number Value</b></em>' attribute.
@@ -1291,7 +1095,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableAllColumns()
 	 * @generated
 	 */
-	int TABLE_ALL_COLUMNS = 20;
+	int TABLE_ALL_COLUMNS = 18;
 
 	/**
 	 * The feature id for the '<em><b>Number Value</b></em>' attribute.
@@ -1328,7 +1132,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableOrdinal()
 	 * @generated
 	 */
-	int TABLE_ORDINAL = 21;
+	int TABLE_ORDINAL = 19;
 
 	/**
 	 * The feature id for the '<em><b>Number Value</b></em>' attribute.
@@ -1374,7 +1178,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableColumn()
 	 * @generated
 	 */
-	int TABLE_COLUMN = 22;
+	int TABLE_COLUMN = 20;
 
 	/**
 	 * The feature id for the '<em><b>Number Value</b></em>' attribute.
@@ -1420,7 +1224,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableMeasure()
 	 * @generated
 	 */
-	int TABLE_MEASURE = 23;
+	int TABLE_MEASURE = 21;
 
 	/**
 	 * The feature id for the '<em><b>Number Value</b></em>' attribute.
@@ -1466,7 +1270,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableDerived()
 	 * @generated
 	 */
-	int TABLE_DERIVED = 24;
+	int TABLE_DERIVED = 22;
 
 	/**
 	 * The feature id for the '<em><b>Number Value</b></em>' attribute.
@@ -1512,7 +1316,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableHierarchy()
 	 * @generated
 	 */
-	int TABLE_HIERARCHY = 25;
+	int TABLE_HIERARCHY = 23;
 
 	/**
 	 * The feature id for the '<em><b>Number Value</b></em>' attribute.
@@ -1558,7 +1362,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableAttribute()
 	 * @generated
 	 */
-	int TABLE_ATTRIBUTE = 26;
+	int TABLE_ATTRIBUTE = 24;
 
 	/**
 	 * The feature id for the '<em><b>Number Value</b></em>' attribute.
@@ -1604,7 +1408,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableAggregation()
 	 * @generated
 	 */
-	int TABLE_AGGREGATION = 27;
+	int TABLE_AGGREGATION = 25;
 
 	/**
 	 * The feature id for the '<em><b>Number Value</b></em>' attribute.
@@ -1650,7 +1454,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableInterval()
 	 * @generated
 	 */
-	int TABLE_INTERVAL = 28;
+	int TABLE_INTERVAL = 26;
 
 	/**
 	 * The number of structural features of the '<em>Table Interval</em>' class.
@@ -1669,7 +1473,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableNumberInterval()
 	 * @generated
 	 */
-	int TABLE_NUMBER_INTERVAL = 29;
+	int TABLE_NUMBER_INTERVAL = 27;
 
 	/**
 	 * The feature id for the '<em><b>Number Interval Value</b></em>' attribute.
@@ -1706,7 +1510,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableIntInterval()
 	 * @generated
 	 */
-	int TABLE_INT_INTERVAL = 30;
+	int TABLE_INT_INTERVAL = 28;
 
 	/**
 	 * The feature id for the '<em><b>Int Interval Value</b></em>' attribute.
@@ -1743,7 +1547,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableDateDayInterval()
 	 * @generated
 	 */
-	int TABLE_DATE_DAY_INTERVAL = 31;
+	int TABLE_DATE_DAY_INTERVAL = 29;
 
 	/**
 	 * The feature id for the '<em><b>Date Interval Value</b></em>' attribute.
@@ -1780,7 +1584,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableLookup()
 	 * @generated
 	 */
-	int TABLE_LOOKUP = 32;
+	int TABLE_LOOKUP = 30;
 
 	/**
 	 * The number of structural features of the '<em>Table Lookup</em>' class.
@@ -1799,7 +1603,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableNumberLookup()
 	 * @generated
 	 */
-	int TABLE_NUMBER_LOOKUP = 33;
+	int TABLE_NUMBER_LOOKUP = 31;
 
 	/**
 	 * The feature id for the '<em><b>Lookup Value</b></em>' attribute.
@@ -1836,7 +1640,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableIntLookup()
 	 * @generated
 	 */
-	int TABLE_INT_LOOKUP = 34;
+	int TABLE_INT_LOOKUP = 32;
 
 	/**
 	 * The feature id for the '<em><b>Lookup Value</b></em>' attribute.
@@ -1873,7 +1677,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableStringLookup()
 	 * @generated
 	 */
-	int TABLE_STRING_LOOKUP = 35;
+	int TABLE_STRING_LOOKUP = 33;
 
 	/**
 	 * The feature id for the '<em><b>Lookup Value</b></em>' attribute.
@@ -1910,7 +1714,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableDateDayLookup()
 	 * @generated
 	 */
-	int TABLE_DATE_DAY_LOOKUP = 36;
+	int TABLE_DATE_DAY_LOOKUP = 34;
 
 	/**
 	 * The feature id for the '<em><b>Lookup Value</b></em>' attribute.
@@ -1947,7 +1751,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableDatamart()
 	 * @generated
 	 */
-	int TABLE_DATAMART = 37;
+	int TABLE_DATAMART = 35;
 
 	/**
 	 * The feature id for the '<em><b>Datamart Ref</b></em>' reference.
@@ -1984,7 +1788,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableElement()
 	 * @generated
 	 */
-	int TABLE_ELEMENT = 38;
+	int TABLE_ELEMENT = 36;
 
 	/**
 	 * The number of structural features of the '<em>Table Element</em>' class.
@@ -2003,7 +1807,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableAxis()
 	 * @generated
 	 */
-	int TABLE_AXIS = 39;
+	int TABLE_AXIS = 37;
 
 	/**
 	 * The feature id for the '<em><b>Axis</b></em>' attribute.
@@ -2094,7 +1898,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableEvent()
 	 * @generated
 	 */
-	int TABLE_EVENT = 40;
+	int TABLE_EVENT = 38;
 
 	/**
 	 * The feature id for the '<em><b>Source</b></em>' containment reference.
@@ -2122,7 +1926,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableRangeElement()
 	 * @generated
 	 */
-	int TABLE_RANGE_ELEMENT = 41;
+	int TABLE_RANGE_ELEMENT = 39;
 
 	/**
 	 * The number of structural features of the '<em>Table Range Element</em>' class.
@@ -2141,7 +1945,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableTextColor()
 	 * @generated
 	 */
-	int TABLE_TEXT_COLOR = 42;
+	int TABLE_TEXT_COLOR = 40;
 
 	/**
 	 * The feature id for the '<em><b>Rgb</b></em>' attribute.
@@ -2169,7 +1973,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableCellColor()
 	 * @generated
 	 */
-	int TABLE_CELL_COLOR = 43;
+	int TABLE_CELL_COLOR = 41;
 
 	/**
 	 * The feature id for the '<em><b>Rgb</b></em>' attribute.
@@ -2197,7 +2001,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableIcon()
 	 * @generated
 	 */
-	int TABLE_ICON = 44;
+	int TABLE_ICON = 42;
 
 	/**
 	 * The feature id for the '<em><b>Icon</b></em>' attribute.
@@ -2225,7 +2029,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableTrend()
 	 * @generated
 	 */
-	int TABLE_TREND = 45;
+	int TABLE_TREND = 43;
 
 	/**
 	 * The feature id for the '<em><b>Icon</b></em>' attribute.
@@ -2253,7 +2057,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableTooltip()
 	 * @generated
 	 */
-	int TABLE_TOOLTIP = 46;
+	int TABLE_TOOLTIP = 44;
 
 	/**
 	 * The feature id for the '<em><b>Tooltip</b></em>' attribute.
@@ -2281,7 +2085,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getCalculation()
 	 * @generated
 	 */
-	int CALCULATION = 48;
+	int CALCULATION = 46;
 
 	/**
 	 * The feature id for the '<em><b>Number Value</b></em>' attribute.
@@ -2336,7 +2140,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getConjunction()
 	 * @generated
 	 */
-	int CONJUNCTION = 49;
+	int CONJUNCTION = 47;
 
 	/**
 	 * The feature id for the '<em><b>Number Value</b></em>' attribute.
@@ -2391,7 +2195,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getDisjunction()
 	 * @generated
 	 */
-	int DISJUNCTION = 50;
+	int DISJUNCTION = 48;
 
 	/**
 	 * The feature id for the '<em><b>Number Value</b></em>' attribute.
@@ -2446,7 +2250,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getConditionalExpression()
 	 * @generated
 	 */
-	int CONDITIONAL_EXPRESSION = 51;
+	int CONDITIONAL_EXPRESSION = 49;
 
 	/**
 	 * The feature id for the '<em><b>Number Value</b></em>' attribute.
@@ -2510,7 +2314,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTrendIconEnum()
 	 * @generated
 	 */
-	int TREND_ICON_ENUM = 52;
+	int TREND_ICON_ENUM = 50;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.xtext.table.OperatorEnum <em>Operator Enum</em>}' enum.
@@ -2520,7 +2324,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getOperatorEnum()
 	 * @generated
 	 */
-	int OPERATOR_ENUM = 53;
+	int OPERATOR_ENUM = 51;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.xtext.table.RowHeaderMode <em>Row Header Mode</em>}' enum.
@@ -2530,7 +2334,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getRowHeaderMode()
 	 * @generated
 	 */
-	int ROW_HEADER_MODE = 54;
+	int ROW_HEADER_MODE = 52;
 
 	/**
 	 * The meta object id for the '<em>Internal EObject</em>' data type.
@@ -2540,7 +2344,7 @@ public interface TableDSLPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getInternalEObject()
 	 * @generated
 	 */
-	int INTERNAL_EOBJECT = 55;
+	int INTERNAL_EOBJECT = 53;
 
 
 	/**
@@ -2681,28 +2485,6 @@ public interface TableDSLPackage extends EPackage {
 	EClass getTableOption();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.table.TableOption#isPolling <em>Polling</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Polling</em>'.
-	 * @see org.eclipse.osbp.xtext.table.TableOption#isPolling()
-	 * @see #getTableOption()
-	 * @generated
-	 */
-	EAttribute getTableOption_Polling();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.table.TableOption#getPollingTime <em>Polling Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Polling Time</em>'.
-	 * @see org.eclipse.osbp.xtext.table.TableOption#getPollingTime()
-	 * @see #getTableOption()
-	 * @generated
-	 */
-	EAttribute getTableOption_PollingTime();
-
-	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.table.TableOption#isFiltering <em>Filtering</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2854,92 +2636,6 @@ public interface TableDSLPackage extends EPackage {
 	EReference getTableGrid_Source();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.osbp.xtext.table.TableBean <em>Table Bean</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Table Bean</em>'.
-	 * @see org.eclipse.osbp.xtext.table.TableBean
-	 * @generated
-	 */
-	EClass getTableBean();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.table.TableBean#isSelectById <em>Select By Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Select By Id</em>'.
-	 * @see org.eclipse.osbp.xtext.table.TableBean#isSelectById()
-	 * @see #getTableBean()
-	 * @generated
-	 */
-	EAttribute getTableBean_SelectById();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.table.TableBean#isSelectalways <em>Selectalways</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Selectalways</em>'.
-	 * @see org.eclipse.osbp.xtext.table.TableBean#isSelectalways()
-	 * @see #getTableBean()
-	 * @generated
-	 */
-	EAttribute getTableBean_Selectalways();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.table.TableBean#getHeaderMode <em>Header Mode</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Header Mode</em>'.
-	 * @see org.eclipse.osbp.xtext.table.TableBean#getHeaderMode()
-	 * @see #getTableBean()
-	 * @generated
-	 */
-	EAttribute getTableBean_HeaderMode();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.osbp.xtext.table.TableBean#getSource <em>Source</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Source</em>'.
-	 * @see org.eclipse.osbp.xtext.table.TableBean#getSource()
-	 * @see #getTableBean()
-	 * @generated
-	 */
-	EReference getTableBean_Source();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.osbp.xtext.table.TableBeanDatasource <em>Table Bean Datasource</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Table Bean Datasource</em>'.
-	 * @see org.eclipse.osbp.xtext.table.TableBeanDatasource
-	 * @generated
-	 */
-	EClass getTableBeanDatasource();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.osbp.xtext.table.TableBeanDatasource#getDatamartRef <em>Datamart Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Datamart Ref</em>'.
-	 * @see org.eclipse.osbp.xtext.table.TableBeanDatasource#getDatamartRef()
-	 * @see #getTableBeanDatasource()
-	 * @generated
-	 */
-	EReference getTableBeanDatasource_DatamartRef();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.osbp.xtext.table.TableBeanDatasource#getElements <em>Elements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Elements</em>'.
-	 * @see org.eclipse.osbp.xtext.table.TableBeanDatasource#getElements()
-	 * @see #getTableBeanDatasource()
-	 * @generated
-	 */
-	EReference getTableBeanDatasource_Elements();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.osbp.xtext.table.TableDtoDatasource <em>Table Dto Datasource</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -4233,22 +3929,6 @@ public interface TableDSLPackage extends EPackage {
 		EClass TABLE_OPTION = eINSTANCE.getTableOption();
 
 		/**
-		 * The meta object literal for the '<em><b>Polling</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TABLE_OPTION__POLLING = eINSTANCE.getTableOption_Polling();
-
-		/**
-		 * The meta object literal for the '<em><b>Polling Time</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TABLE_OPTION__POLLING_TIME = eINSTANCE.getTableOption_PollingTime();
-
-		/**
 		 * The meta object literal for the '<em><b>Filtering</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -4367,74 +4047,6 @@ public interface TableDSLPackage extends EPackage {
 		EReference TABLE_GRID__SOURCE = eINSTANCE.getTableGrid_Source();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.osbp.xtext.table.impl.TableBeanImpl <em>Table Bean</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.osbp.xtext.table.impl.TableBeanImpl
-		 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableBean()
-		 * @generated
-		 */
-		EClass TABLE_BEAN = eINSTANCE.getTableBean();
-
-		/**
-		 * The meta object literal for the '<em><b>Select By Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TABLE_BEAN__SELECT_BY_ID = eINSTANCE.getTableBean_SelectById();
-
-		/**
-		 * The meta object literal for the '<em><b>Selectalways</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TABLE_BEAN__SELECTALWAYS = eINSTANCE.getTableBean_Selectalways();
-
-		/**
-		 * The meta object literal for the '<em><b>Header Mode</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TABLE_BEAN__HEADER_MODE = eINSTANCE.getTableBean_HeaderMode();
-
-		/**
-		 * The meta object literal for the '<em><b>Source</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TABLE_BEAN__SOURCE = eINSTANCE.getTableBean_Source();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.osbp.xtext.table.impl.TableBeanDatasourceImpl <em>Table Bean Datasource</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.osbp.xtext.table.impl.TableBeanDatasourceImpl
-		 * @see org.eclipse.osbp.xtext.table.impl.TableDSLPackageImpl#getTableBeanDatasource()
-		 * @generated
-		 */
-		EClass TABLE_BEAN_DATASOURCE = eINSTANCE.getTableBeanDatasource();
-
-		/**
-		 * The meta object literal for the '<em><b>Datamart Ref</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TABLE_BEAN_DATASOURCE__DATAMART_REF = eINSTANCE.getTableBeanDatasource_DatamartRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TABLE_BEAN_DATASOURCE__ELEMENTS = eINSTANCE.getTableBeanDatasource_Elements();
-
-		/**
 		 * The meta object literal for the '{@link org.eclipse.osbp.xtext.table.impl.TableDtoDatasourceImpl <em>Table Dto Datasource</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDatamart.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDatamart.java
index 1026d9d..eb4c072 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDatamart.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDatamart.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDateDayInterval.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDateDayInterval.java
index 4a0c0b7..02d2446 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDateDayInterval.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDateDayInterval.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDateDayLookup.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDateDayLookup.java
index 04fa88e..0b42d7a 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDateDayLookup.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDateDayLookup.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDerived.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDerived.java
index 3aa51dd..dde748c 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDerived.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDerived.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDtoDatasource.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDtoDatasource.java
index 6afeec5..f148d47 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDtoDatasource.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableDtoDatasource.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableElement.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableElement.java
index 939c2dc..9225b07 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableElement.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableElement.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableEvent.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableEvent.java
index 6720757..e6c0e0e 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableEvent.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableEvent.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableFormatter.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableFormatter.java
index 5603c13..edbdeaf 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableFormatter.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableFormatter.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableGrid.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableGrid.java
index 44f5998..104ab4f 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableGrid.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableGrid.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableGridProperty.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableGridProperty.java
index b59b8f4..2498046 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableGridProperty.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableGridProperty.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableHierarchy.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableHierarchy.java
index bd3c1b9..d88c8c2 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableHierarchy.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableHierarchy.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableIcon.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableIcon.java
index b374803..4d7cba5 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableIcon.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableIcon.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableImage.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableImage.java
index 693cf83..ebf7641 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableImage.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableImage.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableIntInterval.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableIntInterval.java
index 8b74e54..a327ca4 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableIntInterval.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableIntInterval.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableIntLookup.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableIntLookup.java
index 90a385e..86cc005 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableIntLookup.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableIntLookup.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableInterval.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableInterval.java
index 5a6ac00..ba7994b 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableInterval.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableInterval.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableLazyResolver.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableLazyResolver.java
index d029e76..3d31949 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableLazyResolver.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableLazyResolver.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableLookup.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableLookup.java
index 4e7bfa5..a1c98de 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableLookup.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableLookup.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableMeasure.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableMeasure.java
index 60997e5..cd3d110 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableMeasure.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableMeasure.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableModel.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableModel.java
index 2d83b1f..03aa814 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableModel.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableModel.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableNumberInterval.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableNumberInterval.java
index 4ee4f85..2baa4c1 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableNumberInterval.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableNumberInterval.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableNumberLookup.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableNumberLookup.java
index 77a0467..18c091a 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableNumberLookup.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableNumberLookup.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableOption.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableOption.java
index 12b79f0..198c47f 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableOption.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableOption.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
@@ -24,8 +26,6 @@ import org.eclipse.osbp.xtext.action.ActionToolbar;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.osbp.xtext.table.TableOption#isPolling <em>Polling</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.TableOption#getPollingTime <em>Polling Time</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.table.TableOption#isFiltering <em>Filtering</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.table.TableOption#getToolbar <em>Toolbar</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.table.TableOption#isEmbedded <em>Embedded</em>}</li>
@@ -37,58 +37,6 @@ import org.eclipse.osbp.xtext.action.ActionToolbar;
  */
 public interface TableOption extends TableLazyResolver {
 	/**
-	 * Returns the value of the '<em><b>Polling</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Polling</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Polling</em>' attribute.
-	 * @see #setPolling(boolean)
-	 * @see org.eclipse.osbp.xtext.table.TableDSLPackage#getTableOption_Polling()
-	 * @model unique="false"
-	 * @generated
-	 */
-	boolean isPolling();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.table.TableOption#isPolling <em>Polling</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Polling</em>' attribute.
-	 * @see #isPolling()
-	 * @generated
-	 */
-	void setPolling(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Polling Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Polling Time</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Polling Time</em>' attribute.
-	 * @see #setPollingTime(String)
-	 * @see org.eclipse.osbp.xtext.table.TableDSLPackage#getTableOption_PollingTime()
-	 * @model unique="false"
-	 * @generated
-	 */
-	String getPollingTime();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.table.TableOption#getPollingTime <em>Polling Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Polling Time</em>' attribute.
-	 * @see #getPollingTime()
-	 * @generated
-	 */
-	void setPollingTime(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Filtering</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableOrdinal.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableOrdinal.java
index 5cfcc5a..33f6064 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableOrdinal.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableOrdinal.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TablePackage.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TablePackage.java
index 0001d5e..7d0772b 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TablePackage.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TablePackage.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TablePreorder.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TablePreorder.java
index c4d805c..8a8861e 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TablePreorder.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TablePreorder.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableRangeElement.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableRangeElement.java
index 5a5073f..bd67c89 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableRangeElement.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableRangeElement.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableSelection.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableSelection.java
index 3e3e5a1..0430ae5 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableSelection.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableSelection.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableStringLookup.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableStringLookup.java
index 8890be4..ad127f1 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableStringLookup.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableStringLookup.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTable.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTable.java
index 32f36dd..f9b0f63 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTable.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTable.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTask.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTask.java
index eea5030..f47ad03 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTask.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTask.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTextColor.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTextColor.java
index b34408c..ed282d2 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTextColor.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTextColor.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTooltip.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTooltip.java
index c1c577e..a653952 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTooltip.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTooltip.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTooltipPattern.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTooltipPattern.java
index 9aa2df2..07ed5d6 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTooltipPattern.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTooltipPattern.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTrend.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTrend.java
index a4f2bdf..7e7b92a 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTrend.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableTrend.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableValue.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableValue.java
index a366f85..239eb77 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableValue.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableValue.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableValueElement.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableValueElement.java
index affe013..cf8176e 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableValueElement.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TableValueElement.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TrendIconEnum.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TrendIconEnum.java
index 5933816..40f70f1 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TrendIconEnum.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/TrendIconEnum.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/CalculationImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/CalculationImpl.java
index 417b5b0..6b6827c 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/CalculationImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/CalculationImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/ConditionalExpressionImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/ConditionalExpressionImpl.java
index de191f1..613cfab 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/ConditionalExpressionImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/ConditionalExpressionImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/ConjunctionImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/ConjunctionImpl.java
index c7b56d1..4fc594f 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/ConjunctionImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/ConjunctionImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/DisjunctionImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/DisjunctionImpl.java
index 98246b9..3fd2b65 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/DisjunctionImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/DisjunctionImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/ExpressionImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/ExpressionImpl.java
index 66f9951..a5e1021 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/ExpressionImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/ExpressionImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAggregationImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAggregationImpl.java
index 89bbbea..cbaa979 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAggregationImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAggregationImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAllColumnsImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAllColumnsImpl.java
index 3827c2f..f7c9562 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAllColumnsImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAllColumnsImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAttributeImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAttributeImpl.java
index cda139d..320f0d8 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAttributeImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAttributeImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAxisImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAxisImpl.java
index 6bc3bd8..d50e8e5 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAxisImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableAxisImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableBaseImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableBaseImpl.java
index ba8cbe2..f125501 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableBaseImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableBaseImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableBeanDatasourceImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableBeanDatasourceImpl.java
deleted file mode 100644
index 22f36cd..0000000
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableBeanDatasourceImpl.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
- *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
- *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
- * 
- *  Based on ideas from Xtext, Xtend, Xcore
- * 
- *  Contributors{  
- *  		Joerg Riegel - Initial implementation 
- *  
- */
-package org.eclipse.osbp.xtext.table.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.osbp.xtext.datamartdsl.DatamartDefinition;
-
-import org.eclipse.osbp.xtext.table.TableBeanDatasource;
-import org.eclipse.osbp.xtext.table.TableDSLPackage;
-import org.eclipse.osbp.xtext.table.TableElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Table Bean Datasource</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableBeanDatasourceImpl#getDatamartRef <em>Datamart Ref</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableBeanDatasourceImpl#getElements <em>Elements</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class TableBeanDatasourceImpl extends TableLazyResolverImpl implements TableBeanDatasource {
-	/**
-	 * The cached value of the '{@link #getDatamartRef() <em>Datamart Ref</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDatamartRef()
-	 * @generated
-	 * @ordered
-	 */
-	protected DatamartDefinition datamartRef;
-
-	/**
-	 * The cached value of the '{@link #getElements() <em>Elements</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getElements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<TableElement> elements;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TableBeanDatasourceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TableDSLPackage.Literals.TABLE_BEAN_DATASOURCE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DatamartDefinition getDatamartRef() {
-		if (datamartRef != null && datamartRef.eIsProxy()) {
-			InternalEObject oldDatamartRef = (InternalEObject)datamartRef;
-			datamartRef = (DatamartDefinition)eResolveProxy(oldDatamartRef);
-			if (datamartRef != oldDatamartRef) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TableDSLPackage.TABLE_BEAN_DATASOURCE__DATAMART_REF, oldDatamartRef, datamartRef));
-			}
-		}
-		return datamartRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DatamartDefinition basicGetDatamartRef() {
-		return datamartRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDatamartRef(DatamartDefinition newDatamartRef) {
-		DatamartDefinition oldDatamartRef = datamartRef;
-		datamartRef = newDatamartRef;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TableDSLPackage.TABLE_BEAN_DATASOURCE__DATAMART_REF, oldDatamartRef, datamartRef));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<TableElement> getElements() {
-		if (elements == null) {
-			elements = new EObjectContainmentEList<TableElement>(TableElement.class, this, TableDSLPackage.TABLE_BEAN_DATASOURCE__ELEMENTS);
-		}
-		return elements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case TableDSLPackage.TABLE_BEAN_DATASOURCE__ELEMENTS:
-				return ((InternalEList<?>)getElements()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TableDSLPackage.TABLE_BEAN_DATASOURCE__DATAMART_REF:
-				if (resolve) return getDatamartRef();
-				return basicGetDatamartRef();
-			case TableDSLPackage.TABLE_BEAN_DATASOURCE__ELEMENTS:
-				return getElements();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TableDSLPackage.TABLE_BEAN_DATASOURCE__DATAMART_REF:
-				setDatamartRef((DatamartDefinition)newValue);
-				return;
-			case TableDSLPackage.TABLE_BEAN_DATASOURCE__ELEMENTS:
-				getElements().clear();
-				getElements().addAll((Collection<? extends TableElement>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TableDSLPackage.TABLE_BEAN_DATASOURCE__DATAMART_REF:
-				setDatamartRef((DatamartDefinition)null);
-				return;
-			case TableDSLPackage.TABLE_BEAN_DATASOURCE__ELEMENTS:
-				getElements().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TableDSLPackage.TABLE_BEAN_DATASOURCE__DATAMART_REF:
-				return datamartRef != null;
-			case TableDSLPackage.TABLE_BEAN_DATASOURCE__ELEMENTS:
-				return elements != null && !elements.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //TableBeanDatasourceImpl
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableBeanImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableBeanImpl.java
deleted file mode 100644
index 744967a..0000000
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableBeanImpl.java
+++ /dev/null
@@ -1,641 +0,0 @@
-/**
- * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
- *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
- *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
- * 
- *  Based on ideas from Xtext, Xtend, Xcore
- * 
- *  Contributors{  
- *  		Joerg Riegel - Initial implementation 
- *  
- */
-package org.eclipse.osbp.xtext.table.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.osbp.xtext.action.ActionToolbar;
-
-import org.eclipse.osbp.xtext.table.RowHeaderMode;
-import org.eclipse.osbp.xtext.table.TableBean;
-import org.eclipse.osbp.xtext.table.TableDSLPackage;
-import org.eclipse.osbp.xtext.table.TableDatamart;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Table Bean</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableBeanImpl#isPolling <em>Polling</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableBeanImpl#getPollingTime <em>Polling Time</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableBeanImpl#isFiltering <em>Filtering</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableBeanImpl#getToolbar <em>Toolbar</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableBeanImpl#isEmbedded <em>Embedded</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableBeanImpl#isSelectById <em>Select By Id</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableBeanImpl#isSelectalways <em>Selectalways</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableBeanImpl#getHeaderMode <em>Header Mode</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableBeanImpl#getSource <em>Source</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class TableBeanImpl extends TableLazyResolverImpl implements TableBean {
-	/**
-	 * The default value of the '{@link #isPolling() <em>Polling</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPolling()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean POLLING_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isPolling() <em>Polling</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPolling()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean polling = POLLING_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPollingTime() <em>Polling Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPollingTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String POLLING_TIME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPollingTime() <em>Polling Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPollingTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected String pollingTime = POLLING_TIME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isFiltering() <em>Filtering</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFiltering()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean FILTERING_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isFiltering() <em>Filtering</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFiltering()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean filtering = FILTERING_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getToolbar() <em>Toolbar</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToolbar()
-	 * @generated
-	 * @ordered
-	 */
-	protected ActionToolbar toolbar;
-
-	/**
-	 * The default value of the '{@link #isEmbedded() <em>Embedded</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEmbedded()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EMBEDDED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isEmbedded() <em>Embedded</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEmbedded()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean embedded = EMBEDDED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isSelectById() <em>Select By Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSelectById()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SELECT_BY_ID_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isSelectById() <em>Select By Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSelectById()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean selectById = SELECT_BY_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isSelectalways() <em>Selectalways</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSelectalways()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SELECTALWAYS_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isSelectalways() <em>Selectalways</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSelectalways()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean selectalways = SELECTALWAYS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHeaderMode() <em>Header Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHeaderMode()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final RowHeaderMode HEADER_MODE_EDEFAULT = RowHeaderMode.HIDDEN;
-
-	/**
-	 * The cached value of the '{@link #getHeaderMode() <em>Header Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHeaderMode()
-	 * @generated
-	 * @ordered
-	 */
-	protected RowHeaderMode headerMode = HEADER_MODE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getSource() <em>Source</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSource()
-	 * @generated
-	 * @ordered
-	 */
-	protected TableDatamart source;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TableBeanImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TableDSLPackage.Literals.TABLE_BEAN;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isPolling() {
-		return polling;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPolling(boolean newPolling) {
-		boolean oldPolling = polling;
-		polling = newPolling;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TableDSLPackage.TABLE_BEAN__POLLING, oldPolling, polling));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPollingTime() {
-		return pollingTime;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPollingTime(String newPollingTime) {
-		String oldPollingTime = pollingTime;
-		pollingTime = newPollingTime;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TableDSLPackage.TABLE_BEAN__POLLING_TIME, oldPollingTime, pollingTime));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isFiltering() {
-		return filtering;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFiltering(boolean newFiltering) {
-		boolean oldFiltering = filtering;
-		filtering = newFiltering;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TableDSLPackage.TABLE_BEAN__FILTERING, oldFiltering, filtering));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActionToolbar getToolbar() {
-		if (toolbar != null && toolbar.eIsProxy()) {
-			InternalEObject oldToolbar = (InternalEObject)toolbar;
-			toolbar = (ActionToolbar)eResolveProxy(oldToolbar);
-			if (toolbar != oldToolbar) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TableDSLPackage.TABLE_BEAN__TOOLBAR, oldToolbar, toolbar));
-			}
-		}
-		return toolbar;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActionToolbar basicGetToolbar() {
-		return toolbar;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setToolbar(ActionToolbar newToolbar) {
-		ActionToolbar oldToolbar = toolbar;
-		toolbar = newToolbar;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TableDSLPackage.TABLE_BEAN__TOOLBAR, oldToolbar, toolbar));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isEmbedded() {
-		return embedded;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEmbedded(boolean newEmbedded) {
-		boolean oldEmbedded = embedded;
-		embedded = newEmbedded;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TableDSLPackage.TABLE_BEAN__EMBEDDED, oldEmbedded, embedded));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSelectById() {
-		return selectById;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSelectById(boolean newSelectById) {
-		boolean oldSelectById = selectById;
-		selectById = newSelectById;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TableDSLPackage.TABLE_BEAN__SELECT_BY_ID, oldSelectById, selectById));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSelectalways() {
-		return selectalways;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSelectalways(boolean newSelectalways) {
-		boolean oldSelectalways = selectalways;
-		selectalways = newSelectalways;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TableDSLPackage.TABLE_BEAN__SELECTALWAYS, oldSelectalways, selectalways));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RowHeaderMode getHeaderMode() {
-		return headerMode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHeaderMode(RowHeaderMode newHeaderMode) {
-		RowHeaderMode oldHeaderMode = headerMode;
-		headerMode = newHeaderMode == null ? HEADER_MODE_EDEFAULT : newHeaderMode;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TableDSLPackage.TABLE_BEAN__HEADER_MODE, oldHeaderMode, headerMode));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TableDatamart getSource() {
-		return source;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSource(TableDatamart newSource, NotificationChain msgs) {
-		TableDatamart oldSource = source;
-		source = newSource;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TableDSLPackage.TABLE_BEAN__SOURCE, oldSource, newSource);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSource(TableDatamart newSource) {
-		if (newSource != source) {
-			NotificationChain msgs = null;
-			if (source != null)
-				msgs = ((InternalEObject)source).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TableDSLPackage.TABLE_BEAN__SOURCE, null, msgs);
-			if (newSource != null)
-				msgs = ((InternalEObject)newSource).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TableDSLPackage.TABLE_BEAN__SOURCE, null, msgs);
-			msgs = basicSetSource(newSource, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TableDSLPackage.TABLE_BEAN__SOURCE, newSource, newSource));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case TableDSLPackage.TABLE_BEAN__SOURCE:
-				return basicSetSource(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TableDSLPackage.TABLE_BEAN__POLLING:
-				return isPolling();
-			case TableDSLPackage.TABLE_BEAN__POLLING_TIME:
-				return getPollingTime();
-			case TableDSLPackage.TABLE_BEAN__FILTERING:
-				return isFiltering();
-			case TableDSLPackage.TABLE_BEAN__TOOLBAR:
-				if (resolve) return getToolbar();
-				return basicGetToolbar();
-			case TableDSLPackage.TABLE_BEAN__EMBEDDED:
-				return isEmbedded();
-			case TableDSLPackage.TABLE_BEAN__SELECT_BY_ID:
-				return isSelectById();
-			case TableDSLPackage.TABLE_BEAN__SELECTALWAYS:
-				return isSelectalways();
-			case TableDSLPackage.TABLE_BEAN__HEADER_MODE:
-				return getHeaderMode();
-			case TableDSLPackage.TABLE_BEAN__SOURCE:
-				return getSource();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TableDSLPackage.TABLE_BEAN__POLLING:
-				setPolling((Boolean)newValue);
-				return;
-			case TableDSLPackage.TABLE_BEAN__POLLING_TIME:
-				setPollingTime((String)newValue);
-				return;
-			case TableDSLPackage.TABLE_BEAN__FILTERING:
-				setFiltering((Boolean)newValue);
-				return;
-			case TableDSLPackage.TABLE_BEAN__TOOLBAR:
-				setToolbar((ActionToolbar)newValue);
-				return;
-			case TableDSLPackage.TABLE_BEAN__EMBEDDED:
-				setEmbedded((Boolean)newValue);
-				return;
-			case TableDSLPackage.TABLE_BEAN__SELECT_BY_ID:
-				setSelectById((Boolean)newValue);
-				return;
-			case TableDSLPackage.TABLE_BEAN__SELECTALWAYS:
-				setSelectalways((Boolean)newValue);
-				return;
-			case TableDSLPackage.TABLE_BEAN__HEADER_MODE:
-				setHeaderMode((RowHeaderMode)newValue);
-				return;
-			case TableDSLPackage.TABLE_BEAN__SOURCE:
-				setSource((TableDatamart)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TableDSLPackage.TABLE_BEAN__POLLING:
-				setPolling(POLLING_EDEFAULT);
-				return;
-			case TableDSLPackage.TABLE_BEAN__POLLING_TIME:
-				setPollingTime(POLLING_TIME_EDEFAULT);
-				return;
-			case TableDSLPackage.TABLE_BEAN__FILTERING:
-				setFiltering(FILTERING_EDEFAULT);
-				return;
-			case TableDSLPackage.TABLE_BEAN__TOOLBAR:
-				setToolbar((ActionToolbar)null);
-				return;
-			case TableDSLPackage.TABLE_BEAN__EMBEDDED:
-				setEmbedded(EMBEDDED_EDEFAULT);
-				return;
-			case TableDSLPackage.TABLE_BEAN__SELECT_BY_ID:
-				setSelectById(SELECT_BY_ID_EDEFAULT);
-				return;
-			case TableDSLPackage.TABLE_BEAN__SELECTALWAYS:
-				setSelectalways(SELECTALWAYS_EDEFAULT);
-				return;
-			case TableDSLPackage.TABLE_BEAN__HEADER_MODE:
-				setHeaderMode(HEADER_MODE_EDEFAULT);
-				return;
-			case TableDSLPackage.TABLE_BEAN__SOURCE:
-				setSource((TableDatamart)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TableDSLPackage.TABLE_BEAN__POLLING:
-				return polling != POLLING_EDEFAULT;
-			case TableDSLPackage.TABLE_BEAN__POLLING_TIME:
-				return POLLING_TIME_EDEFAULT == null ? pollingTime != null : !POLLING_TIME_EDEFAULT.equals(pollingTime);
-			case TableDSLPackage.TABLE_BEAN__FILTERING:
-				return filtering != FILTERING_EDEFAULT;
-			case TableDSLPackage.TABLE_BEAN__TOOLBAR:
-				return toolbar != null;
-			case TableDSLPackage.TABLE_BEAN__EMBEDDED:
-				return embedded != EMBEDDED_EDEFAULT;
-			case TableDSLPackage.TABLE_BEAN__SELECT_BY_ID:
-				return selectById != SELECT_BY_ID_EDEFAULT;
-			case TableDSLPackage.TABLE_BEAN__SELECTALWAYS:
-				return selectalways != SELECTALWAYS_EDEFAULT;
-			case TableDSLPackage.TABLE_BEAN__HEADER_MODE:
-				return headerMode != HEADER_MODE_EDEFAULT;
-			case TableDSLPackage.TABLE_BEAN__SOURCE:
-				return source != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (polling: ");
-		result.append(polling);
-		result.append(", pollingTime: ");
-		result.append(pollingTime);
-		result.append(", filtering: ");
-		result.append(filtering);
-		result.append(", embedded: ");
-		result.append(embedded);
-		result.append(", selectById: ");
-		result.append(selectById);
-		result.append(", selectalways: ");
-		result.append(selectalways);
-		result.append(", headerMode: ");
-		result.append(headerMode);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TableBeanImpl
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableCellColorImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableCellColorImpl.java
index d955592..e4865fa 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableCellColorImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableCellColorImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableColumnImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableColumnImpl.java
index c9cc0e0..9b05449 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableColumnImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableColumnImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDSLFactoryImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDSLFactoryImpl.java
index c771f62..6dc1a9d 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDSLFactoryImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDSLFactoryImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
@@ -77,8 +79,6 @@ public class TableDSLFactoryImpl extends EFactoryImpl implements TableDSLFactory
 			case TableDSLPackage.TABLE_SELECTION: return createTableSelection();
 			case TableDSLPackage.TABLE_TABLE: return createTableTable();
 			case TableDSLPackage.TABLE_GRID: return createTableGrid();
-			case TableDSLPackage.TABLE_BEAN: return createTableBean();
-			case TableDSLPackage.TABLE_BEAN_DATASOURCE: return createTableBeanDatasource();
 			case TableDSLPackage.TABLE_DTO_DATASOURCE: return createTableDtoDatasource();
 			case TableDSLPackage.TABLE_GRID_PROPERTY: return createTableGridProperty();
 			case TableDSLPackage.TABLE_PREORDER: return createTablePreorder();
@@ -247,26 +247,6 @@ public class TableDSLFactoryImpl extends EFactoryImpl implements TableDSLFactory
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public TableBean createTableBean() {
-		TableBeanImpl tableBean = new TableBeanImpl();
-		return tableBean;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TableBeanDatasource createTableBeanDatasource() {
-		TableBeanDatasourceImpl tableBeanDatasource = new TableBeanDatasourceImpl();
-		return tableBeanDatasource;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public TableDtoDatasource createTableDtoDatasource() {
 		TableDtoDatasourceImpl tableDtoDatasource = new TableDtoDatasourceImpl();
 		return tableDtoDatasource;
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDSLPackageImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDSLPackageImpl.java
index 6380184..2155ec0 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDSLPackageImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDSLPackageImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
@@ -52,8 +54,6 @@ import org.eclipse.osbp.xtext.table.TableAllColumns;
 import org.eclipse.osbp.xtext.table.TableAttribute;
 import org.eclipse.osbp.xtext.table.TableAxis;
 import org.eclipse.osbp.xtext.table.TableBase;
-import org.eclipse.osbp.xtext.table.TableBean;
-import org.eclipse.osbp.xtext.table.TableBeanDatasource;
 import org.eclipse.osbp.xtext.table.TableCellColor;
 import org.eclipse.osbp.xtext.table.TableColumn;
 import org.eclipse.osbp.xtext.table.TableDSLFactory;
@@ -174,20 +174,6 @@ public class TableDSLPackageImpl extends EPackageImpl implements TableDSLPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass tableBeanEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tableBeanDatasourceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	private EClass tableDtoDatasourceEClass = null;
 
 	/**
@@ -546,8 +532,8 @@ public class TableDSLPackageImpl extends EPackageImpl implements TableDSLPackage
 
 		// Initialize simple dependencies
 		ActionDSLPackage.eINSTANCE.eClass();
-		DatamartDSLPackage.eINSTANCE.eClass();
 		CxGridSourcePackage.eINSTANCE.eClass();
+		DatamartDSLPackage.eINSTANCE.eClass();
 		CxGridStylePackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
@@ -687,26 +673,8 @@ public class TableDSLPackageImpl extends EPackageImpl implements TableDSLPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getTableOption_Polling() {
-		return (EAttribute)tableOptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTableOption_PollingTime() {
-		return (EAttribute)tableOptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EAttribute getTableOption_Filtering() {
-		return (EAttribute)tableOptionEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)tableOptionEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -715,7 +683,7 @@ public class TableDSLPackageImpl extends EPackageImpl implements TableDSLPackage
 	 * @generated
 	 */
 	public EReference getTableOption_Toolbar() {
-		return (EReference)tableOptionEClass.getEStructuralFeatures().get(3);
+		return (EReference)tableOptionEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -724,7 +692,7 @@ public class TableDSLPackageImpl extends EPackageImpl implements TableDSLPackage
 	 * @generated
 	 */
 	public EAttribute getTableOption_Embedded() {
-		return (EAttribute)tableOptionEClass.getEStructuralFeatures().get(4);
+		return (EAttribute)tableOptionEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -831,78 +799,6 @@ public class TableDSLPackageImpl extends EPackageImpl implements TableDSLPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getTableBean() {
-		return tableBeanEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTableBean_SelectById() {
-		return (EAttribute)tableBeanEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTableBean_Selectalways() {
-		return (EAttribute)tableBeanEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTableBean_HeaderMode() {
-		return (EAttribute)tableBeanEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTableBean_Source() {
-		return (EReference)tableBeanEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTableBeanDatasource() {
-		return tableBeanDatasourceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTableBeanDatasource_DatamartRef() {
-		return (EReference)tableBeanDatasourceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTableBeanDatasource_Elements() {
-		return (EReference)tableBeanDatasourceEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EClass getTableDtoDatasource() {
 		return tableDtoDatasourceEClass;
 	}
@@ -1925,8 +1821,6 @@ public class TableDSLPackageImpl extends EPackageImpl implements TableDSLPackage
 		createEReference(tableEClass, TABLE__TABLETYPE);
 
 		tableOptionEClass = createEClass(TABLE_OPTION);
-		createEAttribute(tableOptionEClass, TABLE_OPTION__POLLING);
-		createEAttribute(tableOptionEClass, TABLE_OPTION__POLLING_TIME);
 		createEAttribute(tableOptionEClass, TABLE_OPTION__FILTERING);
 		createEReference(tableOptionEClass, TABLE_OPTION__TOOLBAR);
 		createEAttribute(tableOptionEClass, TABLE_OPTION__EMBEDDED);
@@ -1945,16 +1839,6 @@ public class TableDSLPackageImpl extends EPackageImpl implements TableDSLPackage
 		createEAttribute(tableGridEClass, TABLE_GRID__HEADER_MODE);
 		createEReference(tableGridEClass, TABLE_GRID__SOURCE);
 
-		tableBeanEClass = createEClass(TABLE_BEAN);
-		createEAttribute(tableBeanEClass, TABLE_BEAN__SELECT_BY_ID);
-		createEAttribute(tableBeanEClass, TABLE_BEAN__SELECTALWAYS);
-		createEAttribute(tableBeanEClass, TABLE_BEAN__HEADER_MODE);
-		createEReference(tableBeanEClass, TABLE_BEAN__SOURCE);
-
-		tableBeanDatasourceEClass = createEClass(TABLE_BEAN_DATASOURCE);
-		createEReference(tableBeanDatasourceEClass, TABLE_BEAN_DATASOURCE__DATAMART_REF);
-		createEReference(tableBeanDatasourceEClass, TABLE_BEAN_DATASOURCE__ELEMENTS);
-
 		tableDtoDatasourceEClass = createEClass(TABLE_DTO_DATASOURCE);
 		createEReference(tableDtoDatasourceEClass, TABLE_DTO_DATASOURCE__DTO_SOURCE);
 
@@ -2138,9 +2022,9 @@ public class TableDSLPackageImpl extends EPackageImpl implements TableDSLPackage
 		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 		OSBPTypesPackage theOSBPTypesPackage = (OSBPTypesPackage)EPackage.Registry.INSTANCE.getEPackage(OSBPTypesPackage.eNS_URI);
 		ActionDSLPackage theActionDSLPackage = (ActionDSLPackage)EPackage.Registry.INSTANCE.getEPackage(ActionDSLPackage.eNS_URI);
-		DatamartDSLPackage theDatamartDSLPackage = (DatamartDSLPackage)EPackage.Registry.INSTANCE.getEPackage(DatamartDSLPackage.eNS_URI);
 		CxGridSourcePackage theCxGridSourcePackage = (CxGridSourcePackage)EPackage.Registry.INSTANCE.getEPackage(CxGridSourcePackage.eNS_URI);
 		OSBPDtoPackage theOSBPDtoPackage = (OSBPDtoPackage)EPackage.Registry.INSTANCE.getEPackage(OSBPDtoPackage.eNS_URI);
+		DatamartDSLPackage theDatamartDSLPackage = (DatamartDSLPackage)EPackage.Registry.INSTANCE.getEPackage(DatamartDSLPackage.eNS_URI);
 		CubeDSLPackage theCubeDSLPackage = (CubeDSLPackage)EPackage.Registry.INSTANCE.getEPackage(CubeDSLPackage.eNS_URI);
 
 		// Create type parameters
@@ -2155,8 +2039,6 @@ public class TableDSLPackageImpl extends EPackageImpl implements TableDSLPackage
 		tableSelectionEClass.getESuperTypes().add(this.getTableTable());
 		tableTableEClass.getESuperTypes().add(this.getTableOption());
 		tableGridEClass.getESuperTypes().add(this.getTableOption());
-		tableBeanEClass.getESuperTypes().add(this.getTableOption());
-		tableBeanDatasourceEClass.getESuperTypes().add(this.getTableLazyResolver());
 		tableDtoDatasourceEClass.getESuperTypes().add(theCxGridSourcePackage.getCxGridSource());
 		tableGridPropertyEClass.getESuperTypes().add(theCxGridSourcePackage.getCxGridProperty());
 		tablePreorderEClass.getESuperTypes().add(this.getTableLazyResolver());
@@ -2230,8 +2112,6 @@ public class TableDSLPackageImpl extends EPackageImpl implements TableDSLPackage
 		initEReference(getTable_Tabletype(), this.getTableOption(), null, "tabletype", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(tableOptionEClass, TableOption.class, "TableOption", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTableOption_Polling(), theEcorePackage.getEBoolean(), "polling", null, 0, 1, TableOption.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTableOption_PollingTime(), theEcorePackage.getEString(), "pollingTime", null, 0, 1, TableOption.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getTableOption_Filtering(), theEcorePackage.getEBoolean(), "filtering", null, 0, 1, TableOption.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getTableOption_Toolbar(), theActionDSLPackage.getActionToolbar(), null, "toolbar", null, 0, 1, TableOption.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getTableOption_Embedded(), theEcorePackage.getEBoolean(), "embedded", null, 0, 1, TableOption.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2250,16 +2130,6 @@ public class TableDSLPackageImpl extends EPackageImpl implements TableDSLPackage
 		initEAttribute(getTableGrid_HeaderMode(), this.getRowHeaderMode(), "headerMode", null, 0, 1, TableGrid.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getTableGrid_Source(), this.getTableDtoDatasource(), null, "source", null, 0, 1, TableGrid.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(tableBeanEClass, TableBean.class, "TableBean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTableBean_SelectById(), theEcorePackage.getEBoolean(), "selectById", null, 0, 1, TableBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTableBean_Selectalways(), theEcorePackage.getEBoolean(), "selectalways", null, 0, 1, TableBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTableBean_HeaderMode(), this.getRowHeaderMode(), "headerMode", null, 0, 1, TableBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTableBean_Source(), this.getTableDatamart(), null, "source", null, 0, 1, TableBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(tableBeanDatasourceEClass, TableBeanDatasource.class, "TableBeanDatasource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getTableBeanDatasource_DatamartRef(), theDatamartDSLPackage.getDatamartDefinition(), null, "datamartRef", null, 0, 1, TableBeanDatasource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTableBeanDatasource_Elements(), this.getTableElement(), null, "elements", null, 0, -1, TableBeanDatasource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
 		initEClass(tableDtoDatasourceEClass, TableDtoDatasource.class, "TableDtoDatasource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getTableDtoDatasource_DtoSource(), theOSBPDtoPackage.getLDto(), null, "dtoSource", null, 0, 1, TableDtoDatasource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDatamartImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDatamartImpl.java
index d043c8a..312f0e4 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDatamartImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDatamartImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDateDayIntervalImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDateDayIntervalImpl.java
index 210c1d6..5307c9c 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDateDayIntervalImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDateDayIntervalImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDateDayLookupImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDateDayLookupImpl.java
index f5c3e1a..9beaf1a 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDateDayLookupImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDateDayLookupImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDerivedImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDerivedImpl.java
index 99d3858..8d204f4 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDerivedImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDerivedImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDtoDatasourceImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDtoDatasourceImpl.java
index 388b2ba..57c7d7b 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDtoDatasourceImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableDtoDatasourceImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableEventImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableEventImpl.java
index 997cf81..f06219d 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableEventImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableEventImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableFormatterImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableFormatterImpl.java
index 5c9db8d..19d4c4d 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableFormatterImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableFormatterImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableGridImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableGridImpl.java
index 02257ea..c22f984 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableGridImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableGridImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
@@ -36,8 +38,6 @@ import org.eclipse.osbp.xtext.table.TableGrid;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableGridImpl#isPolling <em>Polling</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableGridImpl#getPollingTime <em>Polling Time</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableGridImpl#isFiltering <em>Filtering</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableGridImpl#getToolbar <em>Toolbar</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableGridImpl#isEmbedded <em>Embedded</em>}</li>
@@ -50,46 +50,6 @@ import org.eclipse.osbp.xtext.table.TableGrid;
  */
 public class TableGridImpl extends TableLazyResolverImpl implements TableGrid {
 	/**
-	 * The default value of the '{@link #isPolling() <em>Polling</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPolling()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean POLLING_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isPolling() <em>Polling</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPolling()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean polling = POLLING_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPollingTime() <em>Polling Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPollingTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String POLLING_TIME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPollingTime() <em>Polling Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPollingTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected String pollingTime = POLLING_TIME_EDEFAULT;
-
-	/**
 	 * The default value of the '{@link #isFiltering() <em>Filtering</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -213,48 +173,6 @@ public class TableGridImpl extends TableLazyResolverImpl implements TableGrid {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean isPolling() {
-		return polling;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPolling(boolean newPolling) {
-		boolean oldPolling = polling;
-		polling = newPolling;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TableDSLPackage.TABLE_GRID__POLLING, oldPolling, polling));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPollingTime() {
-		return pollingTime;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPollingTime(String newPollingTime) {
-		String oldPollingTime = pollingTime;
-		pollingTime = newPollingTime;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TableDSLPackage.TABLE_GRID__POLLING_TIME, oldPollingTime, pollingTime));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public boolean isFiltering() {
 		return filtering;
 	}
@@ -437,10 +355,6 @@ public class TableGridImpl extends TableLazyResolverImpl implements TableGrid {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case TableDSLPackage.TABLE_GRID__POLLING:
-				return isPolling();
-			case TableDSLPackage.TABLE_GRID__POLLING_TIME:
-				return getPollingTime();
 			case TableDSLPackage.TABLE_GRID__FILTERING:
 				return isFiltering();
 			case TableDSLPackage.TABLE_GRID__TOOLBAR:
@@ -466,12 +380,6 @@ public class TableGridImpl extends TableLazyResolverImpl implements TableGrid {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case TableDSLPackage.TABLE_GRID__POLLING:
-				setPolling((Boolean)newValue);
-				return;
-			case TableDSLPackage.TABLE_GRID__POLLING_TIME:
-				setPollingTime((String)newValue);
-				return;
 			case TableDSLPackage.TABLE_GRID__FILTERING:
 				setFiltering((Boolean)newValue);
 				return;
@@ -502,12 +410,6 @@ public class TableGridImpl extends TableLazyResolverImpl implements TableGrid {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case TableDSLPackage.TABLE_GRID__POLLING:
-				setPolling(POLLING_EDEFAULT);
-				return;
-			case TableDSLPackage.TABLE_GRID__POLLING_TIME:
-				setPollingTime(POLLING_TIME_EDEFAULT);
-				return;
 			case TableDSLPackage.TABLE_GRID__FILTERING:
 				setFiltering(FILTERING_EDEFAULT);
 				return;
@@ -538,10 +440,6 @@ public class TableGridImpl extends TableLazyResolverImpl implements TableGrid {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case TableDSLPackage.TABLE_GRID__POLLING:
-				return polling != POLLING_EDEFAULT;
-			case TableDSLPackage.TABLE_GRID__POLLING_TIME:
-				return POLLING_TIME_EDEFAULT == null ? pollingTime != null : !POLLING_TIME_EDEFAULT.equals(pollingTime);
 			case TableDSLPackage.TABLE_GRID__FILTERING:
 				return filtering != FILTERING_EDEFAULT;
 			case TableDSLPackage.TABLE_GRID__TOOLBAR:
@@ -568,11 +466,7 @@ public class TableGridImpl extends TableLazyResolverImpl implements TableGrid {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (polling: ");
-		result.append(polling);
-		result.append(", pollingTime: ");
-		result.append(pollingTime);
-		result.append(", filtering: ");
+		result.append(" (filtering: ");
 		result.append(filtering);
 		result.append(", embedded: ");
 		result.append(embedded);
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableGridPropertyImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableGridPropertyImpl.java
index 19ad490..d22d215 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableGridPropertyImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableGridPropertyImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableHierarchyImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableHierarchyImpl.java
index 821a1ed..6388228 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableHierarchyImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableHierarchyImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableIconImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableIconImpl.java
index 8cccf64..cb7abb9 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableIconImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableIconImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableImageImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableImageImpl.java
index d616b15..40c3fbf 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableImageImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableImageImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableImpl.java
index c1bb4fc..e9b43c2 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableIntIntervalImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableIntIntervalImpl.java
index 47c1e47..eb04749 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableIntIntervalImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableIntIntervalImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableIntLookupImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableIntLookupImpl.java
index 6f18bd8..62ecd77 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableIntLookupImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableIntLookupImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableLazyResolverImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableLazyResolverImpl.java
index 598a3c8..4f6a9be 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableLazyResolverImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableLazyResolverImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableMeasureImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableMeasureImpl.java
index 57e9830..9d03ced 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableMeasureImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableMeasureImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableModelImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableModelImpl.java
index 46e47f2..7dada7b 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableModelImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableModelImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableNumberIntervalImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableNumberIntervalImpl.java
index 6c4cf43..3ab4286 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableNumberIntervalImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableNumberIntervalImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableNumberLookupImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableNumberLookupImpl.java
index fd12c15..1611a98 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableNumberLookupImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableNumberLookupImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableOrdinalImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableOrdinalImpl.java
index d2b28ef..db6c05e 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableOrdinalImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableOrdinalImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TablePackageImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TablePackageImpl.java
index 1b05755..7e737b5 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TablePackageImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TablePackageImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TablePreorderImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TablePreorderImpl.java
index 45ea0df..378fe51 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TablePreorderImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TablePreorderImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableSelectionImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableSelectionImpl.java
index 56b5b63..d6cb021 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableSelectionImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableSelectionImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableStringLookupImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableStringLookupImpl.java
index 5549054..fc97487 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableStringLookupImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableStringLookupImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTableImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTableImpl.java
index 2c2eb13..f25ff2e 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTableImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTableImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
@@ -36,8 +38,6 @@ import org.eclipse.osbp.xtext.table.TableTable;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableTableImpl#isPolling <em>Polling</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableTableImpl#getPollingTime <em>Polling Time</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableTableImpl#isFiltering <em>Filtering</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableTableImpl#getToolbar <em>Toolbar</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.table.impl.TableTableImpl#isEmbedded <em>Embedded</em>}</li>
@@ -51,46 +51,6 @@ import org.eclipse.osbp.xtext.table.TableTable;
  */
 public class TableTableImpl extends TableLazyResolverImpl implements TableTable {
 	/**
-	 * The default value of the '{@link #isPolling() <em>Polling</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPolling()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean POLLING_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isPolling() <em>Polling</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPolling()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean polling = POLLING_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPollingTime() <em>Polling Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPollingTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String POLLING_TIME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPollingTime() <em>Polling Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPollingTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected String pollingTime = POLLING_TIME_EDEFAULT;
-
-	/**
 	 * The default value of the '{@link #isFiltering() <em>Filtering</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -234,48 +194,6 @@ public class TableTableImpl extends TableLazyResolverImpl implements TableTable
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean isPolling() {
-		return polling;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPolling(boolean newPolling) {
-		boolean oldPolling = polling;
-		polling = newPolling;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TableDSLPackage.TABLE_TABLE__POLLING, oldPolling, polling));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPollingTime() {
-		return pollingTime;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPollingTime(String newPollingTime) {
-		String oldPollingTime = pollingTime;
-		pollingTime = newPollingTime;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TableDSLPackage.TABLE_TABLE__POLLING_TIME, oldPollingTime, pollingTime));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public boolean isFiltering() {
 		return filtering;
 	}
@@ -479,10 +397,6 @@ public class TableTableImpl extends TableLazyResolverImpl implements TableTable
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case TableDSLPackage.TABLE_TABLE__POLLING:
-				return isPolling();
-			case TableDSLPackage.TABLE_TABLE__POLLING_TIME:
-				return getPollingTime();
 			case TableDSLPackage.TABLE_TABLE__FILTERING:
 				return isFiltering();
 			case TableDSLPackage.TABLE_TABLE__TOOLBAR:
@@ -510,12 +424,6 @@ public class TableTableImpl extends TableLazyResolverImpl implements TableTable
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case TableDSLPackage.TABLE_TABLE__POLLING:
-				setPolling((Boolean)newValue);
-				return;
-			case TableDSLPackage.TABLE_TABLE__POLLING_TIME:
-				setPollingTime((String)newValue);
-				return;
 			case TableDSLPackage.TABLE_TABLE__FILTERING:
 				setFiltering((Boolean)newValue);
 				return;
@@ -549,12 +457,6 @@ public class TableTableImpl extends TableLazyResolverImpl implements TableTable
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case TableDSLPackage.TABLE_TABLE__POLLING:
-				setPolling(POLLING_EDEFAULT);
-				return;
-			case TableDSLPackage.TABLE_TABLE__POLLING_TIME:
-				setPollingTime(POLLING_TIME_EDEFAULT);
-				return;
 			case TableDSLPackage.TABLE_TABLE__FILTERING:
 				setFiltering(FILTERING_EDEFAULT);
 				return;
@@ -588,10 +490,6 @@ public class TableTableImpl extends TableLazyResolverImpl implements TableTable
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case TableDSLPackage.TABLE_TABLE__POLLING:
-				return polling != POLLING_EDEFAULT;
-			case TableDSLPackage.TABLE_TABLE__POLLING_TIME:
-				return POLLING_TIME_EDEFAULT == null ? pollingTime != null : !POLLING_TIME_EDEFAULT.equals(pollingTime);
 			case TableDSLPackage.TABLE_TABLE__FILTERING:
 				return filtering != FILTERING_EDEFAULT;
 			case TableDSLPackage.TABLE_TABLE__TOOLBAR:
@@ -620,11 +518,7 @@ public class TableTableImpl extends TableLazyResolverImpl implements TableTable
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (polling: ");
-		result.append(polling);
-		result.append(", pollingTime: ");
-		result.append(pollingTime);
-		result.append(", filtering: ");
+		result.append(" (filtering: ");
 		result.append(filtering);
 		result.append(", embedded: ");
 		result.append(embedded);
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTaskImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTaskImpl.java
index 089c019..0750ffe 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTaskImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTaskImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTextColorImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTextColorImpl.java
index 8b61b1b..d7e9af2 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTextColorImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTextColorImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTooltipImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTooltipImpl.java
index 9e87767..ebe739d 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTooltipImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTooltipImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTooltipPatternImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTooltipPatternImpl.java
index 0236602..ddc2eef 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTooltipPatternImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTooltipPatternImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTrendImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTrendImpl.java
index 54b2551..b3018e2 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTrendImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableTrendImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableValueImpl.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableValueImpl.java
index 9a5f68c..8a74acd 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableValueImpl.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/impl/TableValueImpl.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/util/TableDSLAdapterFactory.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/util/TableDSLAdapterFactory.java
index 48721f6..4b0bd7b 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/util/TableDSLAdapterFactory.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/util/TableDSLAdapterFactory.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
@@ -121,14 +123,6 @@ public class TableDSLAdapterFactory extends AdapterFactoryImpl {
 				return createTableGridAdapter();
 			}
 			@Override
-			public Adapter caseTableBean(TableBean object) {
-				return createTableBeanAdapter();
-			}
-			@Override
-			public Adapter caseTableBeanDatasource(TableBeanDatasource object) {
-				return createTableBeanDatasourceAdapter();
-			}
-			@Override
 			public Adapter caseTableDtoDatasource(TableDtoDatasource object) {
 				return createTableDtoDatasourceAdapter();
 			}
@@ -455,34 +449,6 @@ public class TableDSLAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.xtext.table.TableBean <em>Table Bean</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.osbp.xtext.table.TableBean
-	 * @generated
-	 */
-	public Adapter createTableBeanAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.xtext.table.TableBeanDatasource <em>Table Bean Datasource</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.osbp.xtext.table.TableBeanDatasource
-	 * @generated
-	 */
-	public Adapter createTableBeanDatasourceAdapter() {
-		return null;
-	}
-
-	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.xtext.table.TableDtoDatasource <em>Table Dto Datasource</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
diff --git a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/util/TableDSLSwitch.java b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/util/TableDSLSwitch.java
index 73413cd..bacc5b6 100644
--- a/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/util/TableDSLSwitch.java
+++ b/org.eclipse.osbp.xtext.table/emf-gen/org/eclipse/osbp/xtext/table/util/TableDSLSwitch.java
@@ -1,13 +1,15 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *  All rights reserved. This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
+ *  are made available under the terms of the Eclipse Public License 2.0  
  *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
+ *  https://www.eclipse.org/legal/epl-2.0/ 
+ * 
+ *  SPDX-License-Identifier: EPL-2.0 
  * 
  *  Based on ideas from Xtext, Xtend, Xcore
  * 
- *  Contributors{  
+ *  Contributors:  
  *  		Joerg Riegel - Initial implementation 
  *  
  */
@@ -150,21 +152,6 @@ public class TableDSLSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case TableDSLPackage.TABLE_BEAN: {
-				TableBean tableBean = (TableBean)theEObject;
-				T result = caseTableBean(tableBean);
-				if (result == null) result = caseTableOption(tableBean);
-				if (result == null) result = caseTableLazyResolver(tableBean);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TableDSLPackage.TABLE_BEAN_DATASOURCE: {
-				TableBeanDatasource tableBeanDatasource = (TableBeanDatasource)theEObject;
-				T result = caseTableBeanDatasource(tableBeanDatasource);
-				if (result == null) result = caseTableLazyResolver(tableBeanDatasource);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
 			case TableDSLPackage.TABLE_DTO_DATASOURCE: {
 				TableDtoDatasource tableDtoDatasource = (TableDtoDatasource)theEObject;
 				T result = caseTableDtoDatasource(tableDtoDatasource);
@@ -635,36 +622,6 @@ public class TableDSLSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Table Bean</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Table Bean</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseTableBean(TableBean object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Table Bean Datasource</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Table Bean Datasource</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseTableBeanDatasource(TableBeanDatasource object) {
-		return null;
-	}
-
-	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Table Dto Datasource</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/org.eclipse.osbp.xtext.table/epl-2.0.html b/org.eclipse.osbp.xtext.table/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/org.eclipse.osbp.xtext.table/epl-2.0.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Eclipse Public License - Version 2.0</title>
+    <style type="text/css">
+      body {
+        margin: 1.5em 3em;
+      }
+      h1{
+        font-size:1.5em;
+      }
+      h2{
+        font-size:1em;
+        margin-bottom:0.5em;
+        margin-top:1em;
+      }
+      p {
+        margin-top:  0.5em;
+        margin-bottom: 0.5em;
+      }
+      ul, ol{
+        list-style-type:none;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Eclipse Public License - v 2.0</h1>
+    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+      PUBLIC LICENSE (&ldquo;AGREEMENT&rdquo;). ANY USE, REPRODUCTION OR DISTRIBUTION
+      OF THE PROGRAM CONSTITUTES RECIPIENT&#039;S ACCEPTANCE OF THIS AGREEMENT.
+    </p>
+    <h2 id="definitions">1. DEFINITIONS</h2>
+    <p>&ldquo;Contribution&rdquo; means:</p>
+    <ul>
+      <li>a) in the case of the initial Contributor, the initial content
+        Distributed under this Agreement, and
+      </li>
+      <li>
+        b) in the case of each subsequent Contributor:
+        <ul>
+          <li>i) changes to the Program, and</li>
+          <li>ii) additions to the Program;</li>
+        </ul>
+        where such changes and/or additions to the Program originate from
+        and are Distributed by that particular Contributor. A Contribution
+        &ldquo;originates&rdquo; from a Contributor if it was added to the Program by such
+        Contributor itself or anyone acting on such Contributor&#039;s behalf.
+        Contributions do not include changes or additions to the Program that
+        are not Modified Works.
+      </li>
+    </ul>
+    <p>&ldquo;Contributor&rdquo; means any person or entity that Distributes the Program.</p>
+    <p>&ldquo;Licensed Patents&rdquo; mean patent claims licensable by a Contributor which
+      are necessarily infringed by the use or sale of its Contribution alone
+      or when combined with the Program.
+    </p>
+    <p>&ldquo;Program&rdquo; means the Contributions Distributed in accordance with this
+      Agreement.
+    </p>
+    <p>&ldquo;Recipient&rdquo; means anyone who receives the Program under this Agreement
+      or any Secondary License (as applicable), including Contributors.
+    </p>
+    <p>&ldquo;Derivative Works&rdquo; shall mean any work, whether in Source Code or other
+      form, that is based on (or derived from) the Program and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship.
+    </p>
+    <p>&ldquo;Modified Works&rdquo; shall mean any work in Source Code or other form that
+      results from an addition to, deletion from, or modification of the
+      contents of the Program, including, for purposes of clarity any new file
+      in Source Code form that contains any contents of the Program. Modified
+      Works shall not include works that contain only declarations, interfaces,
+      types, classes, structures, or files of the Program solely in each case
+      in order to link to, bind by name, or subclass the Program or Modified
+      Works thereof.
+    </p>
+    <p>&ldquo;Distribute&rdquo; means the acts of a) distributing or b) making available
+      in any manner that enables the transfer of a copy.
+    </p>
+    <p>&ldquo;Source Code&rdquo; means the form of a Program preferred for making
+      modifications, including but not limited to software source code,
+      documentation source, and configuration files.
+    </p>
+    <p>&ldquo;Secondary License&rdquo; means either the GNU General Public License,
+      Version 2.0, or any later versions of that license, including any
+      exceptions or additional permissions as identified by the initial
+      Contributor.
+    </p>
+    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+    <ul>
+      <li>a) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free copyright
+        license to reproduce, prepare Derivative Works of, publicly display,
+        publicly perform, Distribute and sublicense the Contribution of such
+        Contributor, if any, and such Derivative Works.
+      </li>
+      <li>b) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free patent
+        license under Licensed Patents to make, use, sell, offer to sell,
+        import and otherwise transfer the Contribution of such Contributor,
+        if any, in Source Code or other form. This patent license shall
+        apply to the combination of the Contribution and the Program if,
+        at the time the Contribution is added by the Contributor, such
+        addition of the Contribution causes such combination to be covered
+        by the Licensed Patents. The patent license shall not apply to any
+        other combinations which include the Contribution. No hardware per
+        se is licensed hereunder.
+      </li>
+      <li>c) Recipient understands that although each Contributor grants the
+        licenses to its Contributions set forth herein, no assurances are
+        provided by any Contributor that the Program does not infringe the
+        patent or other intellectual property rights of any other entity.
+        Each Contributor disclaims any liability to Recipient for claims
+        brought by any other entity based on infringement of intellectual
+        property rights or otherwise. As a condition to exercising the rights
+        and licenses granted hereunder, each Recipient hereby assumes sole
+        responsibility to secure any other intellectual property rights needed,
+        if any. For example, if a third party patent license is required to
+        allow Recipient to Distribute the Program, it is Recipient&#039;s
+        responsibility to acquire that license before distributing the Program.
+      </li>
+      <li>d) Each Contributor represents that to its knowledge it has sufficient
+        copyright rights in its Contribution, if any, to grant the copyright
+        license set forth in this Agreement.
+      </li>
+      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+        makes additional grants to any Recipient (other than those set forth
+        in this Agreement) as a result of such Recipient&#039;s receipt of the
+        Program under the terms of a Secondary License (if permitted under
+        the terms of Section 3).
+      </li>
+    </ul>
+    <h2 id="requirements">3. REQUIREMENTS</h2>
+    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+    <ul>
+      <li>a) the Program must also be made available as Source Code, in
+        accordance with section 3.2, and the Contributor must accompany
+        the Program with a statement that the Source Code for the Program
+        is available under this Agreement, and informs Recipients how to
+        obtain it in a reasonable manner on or through a medium customarily
+        used for software exchange; and
+      </li>
+      <li>
+        b) the Contributor may Distribute the Program under a license
+        different than this Agreement, provided that such license:
+        <ul>
+          <li>i) effectively disclaims on behalf of all other Contributors all
+            warranties and conditions, express and implied, including warranties
+            or conditions of title and non-infringement, and implied warranties
+            or conditions of merchantability and fitness for a particular purpose;
+          </li>
+          <li>ii) effectively excludes on behalf of all other Contributors all
+            liability for damages, including direct, indirect, special, incidental
+            and consequential damages, such as lost profits;
+          </li>
+          <li>iii) does not attempt to limit or alter the recipients&#039; rights in the
+            Source Code under section 3.2; and
+          </li>
+          <li>iv) requires any subsequent distribution of the Program by any party
+            to be under a license that satisfies the requirements of this section 3.
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <p>3.2 When the Program is Distributed as Source Code:</p>
+    <ul>
+      <li>a) it must be made available under this Agreement, or if the Program (i)
+        is combined with other material in a separate file or files made available
+        under a Secondary License, and (ii) the initial Contributor attached to
+        the Source Code the notice described in Exhibit A of this Agreement,
+        then the Program may be made available under the terms of such
+        Secondary Licenses, and
+      </li>
+      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+    </ul>
+    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+      attribution notices, disclaimers of warranty, or limitations of liability
+      (&lsquo;notices&rsquo;) contained within the Program from any copy of the Program which
+      they Distribute, provided that Contributors may add their own appropriate
+      notices.
+    </p>
+    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+    <p>Commercial distributors of software may accept certain responsibilities
+      with respect to end users, business partners and the like. While this
+      license is intended to facilitate the commercial use of the Program, the
+      Contributor who includes the Program in a commercial product offering should
+      do so in a manner which does not create potential liability for other
+      Contributors. Therefore, if a Contributor includes the Program in a
+      commercial product offering, such Contributor (&ldquo;Commercial Contributor&rdquo;)
+      hereby agrees to defend and indemnify every other Contributor
+      (&ldquo;Indemnified Contributor&rdquo;) against any losses, damages and costs
+      (collectively &ldquo;Losses&rdquo;) arising from claims, lawsuits and other legal actions
+      brought by a third party against the Indemnified Contributor to the extent
+      caused by the acts or omissions of such Commercial Contributor in connection
+      with its distribution of the Program in a commercial product offering.
+      The obligations in this section do not apply to any claims or Losses relating
+      to any actual or alleged intellectual property infringement. In order to
+      qualify, an Indemnified Contributor must: a) promptly notify the
+      Commercial Contributor in writing of such claim, and b) allow the Commercial
+      Contributor to control, and cooperate with the Commercial Contributor in,
+      the defense and any related settlement negotiations. The Indemnified
+      Contributor may participate in any such claim at its own expense.
+    </p>
+    <p>For example, a Contributor might include the Program
+      in a commercial product offering, Product X. That Contributor is then a
+      Commercial Contributor. If that Commercial Contributor then makes performance
+      claims, or offers warranties related to Product X, those performance claims
+      and warranties are such Commercial Contributor&#039;s responsibility alone.
+      Under this section, the Commercial Contributor would have to defend claims
+      against the other Contributors related to those performance claims and
+      warranties, and if a court requires any other Contributor to pay any damages
+      as a result, the Commercial Contributor must pay those damages.
+    </p>
+    <h2 id="warranty">5. NO WARRANTY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &ldquo;AS IS&rdquo; BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+      solely responsible for determining the appropriateness of using and
+      distributing the Program and assumes all risks associated with its
+      exercise of rights under this Agreement, including but not limited to the
+      risks and costs of program errors, compliance with applicable laws, damage
+      to or loss of data, programs or equipment, and unavailability or
+      interruption of operations.
+    </p>
+    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+    </p>
+    <h2 id="general">7. GENERAL</h2>
+    <p>If any provision of this Agreement is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability of the
+      remainder of the terms of this Agreement, and without further action by the
+      parties hereto, such provision shall be reformed to the minimum extent
+      necessary to make such provision valid and enforceable.
+    </p>
+    <p>If Recipient institutes patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+      (excluding combinations of the Program with other software or hardware)
+      infringes such Recipient&#039;s patent(s), then such Recipient&#039;s rights granted
+      under Section 2(b) shall terminate as of the date such litigation is filed.
+    </p>
+    <p>All Recipient&#039;s rights under this Agreement shall terminate if it fails to
+      comply with any of the material terms or conditions of this Agreement and
+      does not cure such failure in a reasonable period of time after becoming
+      aware of such noncompliance. If all Recipient&#039;s rights under this Agreement
+      terminate, Recipient agrees to cease use and distribution of the Program
+      as soon as reasonably practicable. However, Recipient&#039;s obligations under
+      this Agreement and any licenses granted by Recipient relating to the
+      Program shall continue and survive.
+    </p>
+    <p>Everyone is permitted to copy and distribute copies of this Agreement,
+      but in order to avoid inconsistency the Agreement is copyrighted and may
+      only be modified in the following manner. The Agreement Steward reserves
+      the right to publish new versions (including revisions) of this Agreement
+      from time to time. No one other than the Agreement Steward has the right
+      to modify this Agreement. The Eclipse Foundation is the initial Agreement
+      Steward. The Eclipse Foundation may assign the responsibility to serve as
+      the Agreement Steward to a suitable separate entity. Each new version of
+      the Agreement will be given a distinguishing version number. The Program
+      (including Contributions) may always be Distributed subject to the version
+      of the Agreement under which it was received. In addition, after a new
+      version of the Agreement is published, Contributor may elect to Distribute
+      the Program (including its Contributions) under the new version.
+    </p>
+    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+      receives no rights or licenses to the intellectual property of any
+      Contributor under this Agreement, whether expressly, by implication,
+      estoppel or otherwise. All rights in the Program not expressly granted
+      under this Agreement are reserved. Nothing in this Agreement is intended
+      to be enforceable by any entity that is not a Contributor or Recipient.
+      No third-party beneficiary rights are created under this Agreement.
+    </p>
+    <h2 id="exhibit-a">Exhibit A &ndash; Form of Secondary Licenses Notice</h2>
+    <p>&ldquo;This Source Code may also be made available under the following 
+    	Secondary Licenses when the conditions for such availability set forth 
+    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    	version(s), and exceptions or additional permissions here}.&rdquo;
+    </p>
+    <blockquote>
+      <p>Simply including a copy of this Agreement, including this Exhibit A
+        is not sufficient to license the Source Code under Secondary Licenses.
+      </p>
+      <p>If it is not possible or desirable to put the notice in a particular file,
+        then You may include the notice in a location (such as a LICENSE file in a
+        relevant directory) where a recipient would be likely to look for
+        such a notice.
+      </p>
+      <p>You may add additional accurate notices of copyright ownership.</p>
+    </blockquote>
+  </body>
+</html>
+\ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.table/epl-v10.html b/org.eclipse.osbp.xtext.table/epl-v10.html
deleted file mode 100644
index b398acc..0000000
--- a/org.eclipse.osbp.xtext.table/epl-v10.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style>
-
-</head>
-
-<body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-
-
-</body></html>
-\ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.table/license.html b/org.eclipse.osbp.xtext.table/license.html
index 6e579a5..008b801 100644
--- a/org.eclipse.osbp.xtext.table/license.html
+++ b/org.eclipse.osbp.xtext.table/license.html
@@ -1,164 +1,189 @@
-<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>Eclipse Foundation Software User Agreement</title>
 </head>
 
 <body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse
- Foundation is provided to you under the terms and conditions of the 
-Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also
- available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse Foundation 
-source code
-   repository ("Repository") in software modules ("Modules") and made 
-available as downloadable archives ("Downloads").</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to 
-facilitate delivering, extending, and upgrading the Content.  Typical 
-modules may include plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features").</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&#8482; ARchive) in a directory named "plugins".</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or 
-Fragments and associated material.  Each Feature may be packaged as a 
-sub-directory in a directory named "features".  Within a Feature, files 
-named "feature.xml" may contain a list of the names and version numbers 
-of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features ("Included 
-Features"). Within a Feature, files named "feature.xml" may contain a 
-list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be 
-contained in files named "about.html" ("Abouts"). The terms and 
-conditions governing Features and
-Included Features should be contained in files named "license.html" 
-("Feature Licenses").  Abouts and Feature Licenses may be located in any
- directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is 
-installed using the Provisioning Technology (as defined below), you must
- agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the 
-Feature Update License should either provide you with the terms and 
-conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be 
-found in the "license" property of files named "feature.properties" 
-found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the 
-terms and conditions (or references to such terms and conditions) that 
-govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER 
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
-  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND 
-CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, 
-or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions 
-govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, 
-examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of 
-allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This 
-capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about 
-packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install
- Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to
- be presented to, and accepted by, the users of the Provisioning 
-Technology
-   in accordance with the Specification. By using Provisioning 
-Technology in such a manner and making it available in accordance with 
-the
-   Specification, you further acknowledge your agreement to, and the 
-acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur ("Provisioning Process") in 
-which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, 
-extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology 
-may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user 
-the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable 
-Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable 
-Software Agreement must inform the user of the terms and conditions that
- govern
-       the Installable Software and must solicit acceptance by the end 
-user in the manner prescribed in such Installable Software Agreement. 
-Upon such
-       indication of agreement by the user, the provisioning Technology 
-will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are
- currently may have restrictions on the import, possession, and use, 
-and/or re-export to
-   another country, of encryption software. BEFORE using any encryption 
-software, please check the country's laws, regulations and policies 
-concerning the import,
-   possession, or use, and re-export of encryption software, to see if 
-this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-
-
-</body></html>
-\ No newline at end of file
+	<h2>Eclipse Foundation Software User Agreement</h2>
+	<p>November 22, 2017</p>
+
+	<h3>Usage Of Content</h3>
+
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+		USE THE CONTENT.</p>
+
+	<h3>Applicable Licenses</h3>
+
+	<p>
+		Unless otherwise indicated, all Content made available by the Eclipse
+		Foundation is provided to you under the terms and conditions of the
+		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
+		EPL is provided with this Content and is also available at <a
+			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>Content includes, but is not limited to, source code, object
+		code, documentation and other files maintained in the Eclipse
+		Foundation source code repository (&quot;Repository&quot;) in software
+		modules (&quot;Modules&quot;) and made available as downloadable
+		archives (&quot;Downloads&quot;).</p>
+
+	<ul>
+		<li>Content may be structured and packaged into modules to
+			facilitate delivering, extending, and upgrading the Content. Typical
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
+			fragments (&quot;Fragments&quot;), and features
+			(&quot;Features&quot;).</li>
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
+			or JAR (Java&trade; ARchive) in a directory named
+			&quot;plugins&quot;.</li>
+		<li>A Feature is a bundle of one or more Plug-ins and/or
+			Fragments and associated material. Each Feature may be packaged as a
+			sub-directory in a directory named &quot;features&quot;. Within a
+			Feature, files named &quot;feature.xml&quot; may contain a list of
+			the names and version numbers of the Plug-ins and/or Fragments
+			associated with that Feature.</li>
+		<li>Features may also include other Features (&quot;Included
+			Features&quot;). Within a Feature, files named
+			&quot;feature.xml&quot; may contain a list of the names and version
+			numbers of Included Features.</li>
+	</ul>
+
+	<p>The terms and conditions governing Plug-ins and Fragments should
+		be contained in files named &quot;about.html&quot;
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
+		Included Features should be contained in files named
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
+		Feature Licenses may be located in any directory of a Download or
+		Module including, but not limited to the following locations:</p>
+
+	<ul>
+		<li>The top-level (root) directory</li>
+		<li>Plug-in and Fragment directories</li>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Sub-directories of the directory named &quot;src&quot; of
+			certain Plug-ins</li>
+		<li>Feature directories</li>
+	</ul>
+
+	<p>Note: if a Feature made available by the Eclipse Foundation is
+		installed using the Provisioning Technology (as defined below), you
+		must agree to a license (&quot;Feature Update License&quot;) during
+		the installation process. If the Feature contains Included Features,
+		the Feature Update License should either provide you with the terms
+		and conditions governing the Included Features or inform you where you
+		can locate them. Feature Update Licenses may be found in the
+		&quot;license&quot; property of files named
+		&quot;feature.properties&quot; found within a Feature. Such Abouts,
+		Feature Licenses, and Feature Update Licenses contain the terms and
+		conditions (or references to such terms and conditions) that govern
+		your use of the associated Content in that directory.</p>
+
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
+		ARE NOT LIMITED TO):</p>
+
+	<ul>
+		<li>Eclipse Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
+		</li>
+		<li>Eclipse Distribution License Version 1.0 (available at <a
+			href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
+		</li>
+		<li>Common Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
+		</li>
+		<li>Apache Software License 1.1 (available at <a
+			href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
+		</li>
+		<li>Apache Software License 2.0 (available at <a
+			href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
+		</li>
+		<li>Mozilla Public License Version 1.1 (available at <a
+			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
+		</li>
+	</ul>
+
+	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
+		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
+		or Feature Update License is provided, please contact the Eclipse
+		Foundation to determine what terms and conditions govern that
+		particular Content.</p>
+
+
+	<h3>Use of Provisioning Technology</h3>
+
+	<p>
+		The Eclipse Foundation makes available provisioning software, examples
+		of which include, but are not limited to, p2 and the Eclipse Update
+		Manager (&quot;Provisioning Technology&quot;) for the purpose of
+		allowing users to install software, documentation, information and/or
+		other materials (collectively &quot;Installable Software&quot;). This
+		capability is provided with the intent of allowing such users to
+		install, extend and update Eclipse-based products. Information about
+		packaging Installable Software is available at <a
+			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		(&quot;Specification&quot;).
+	</p>
+
+	<p>You may use Provisioning Technology to allow other parties to
+		install Installable Software. You shall be responsible for enabling
+		the applicable license agreements relating to the Installable Software
+		to be presented to, and accepted by, the users of the Provisioning
+		Technology in accordance with the Specification. By using Provisioning
+		Technology in such a manner and making it available in accordance with
+		the Specification, you further acknowledge your agreement to, and the
+		acquisition of all necessary rights to permit the following:</p>
+
+	<ol>
+		<li>A series of actions may occur (&quot;Provisioning
+			Process&quot;) in which a user may execute the Provisioning
+			Technology on a machine (&quot;Target Machine&quot;) with the intent
+			of installing, extending or updating the functionality of an
+			Eclipse-based product.</li>
+		<li>During the Provisioning Process, the Provisioning Technology
+			may cause third party Installable Software or a portion thereof to be
+			accessed and copied to the Target Machine.</li>
+		<li>Pursuant to the Specification, you will provide to the user
+			the terms and conditions that govern the use of the Installable
+			Software (&quot;Installable Software Agreement&quot;) and such
+			Installable Software Agreement shall be accessed from the Target
+			Machine in accordance with the Specification. Such Installable
+			Software Agreement must inform the user of the terms and conditions
+			that govern the Installable Software and must solicit acceptance by
+			the end user in the manner prescribed in such Installable Software
+			Agreement. Upon such indication of agreement by the user, the
+			provisioning Technology will complete installation of the Installable
+			Software.</li>
+	</ol>
+
+	<h3>Cryptography</h3>
+
+	<p>Content may contain encryption software. The country in which
+		you are currently may have restrictions on the import, possession, and
+		use, and/or re-export to another country, of encryption software.
+		BEFORE using any encryption software, please check the country's laws,
+		regulations and policies concerning the import, possession, or use,
+		and re-export of encryption software, to see if this is permitted.</p>
+
+	<p>
+		<small>Java and all Java-based trademarks are trademarks of
+			Oracle Corporation in the United States, other countries, or both.</small>
+	</p>
+</body>
+</html>
diff --git a/org.eclipse.osbp.xtext.table/model/TableDSL.xcore b/org.eclipse.osbp.xtext.table/model/TableDSL.xcore
index bf57e0e..29d4684 100644
--- a/org.eclipse.osbp.xtext.table/model/TableDSL.xcore
+++ b/org.eclipse.osbp.xtext.table/model/TableDSL.xcore
@@ -8,13 +8,15 @@
 @GenModel(literalsInterface="true")
 @GenModel(copyrightText="Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  All rights reserved. This program and the accompanying materials 
- are made available under the terms of the Eclipse Public License v1.0 
+ are made available under the terms of the Eclipse Public License 2.0  
  which accompanies this distribution, and is available at 
- http{//www.eclipse.org/legal/epl-v10.html 
+ https://www.eclipse.org/legal/epl-2.0/ 
+ 
+ SPDX-License-Identifier: EPL-2.0 
 
  Based on ideas from Xtext, Xtend, Xcore
 
- Contributors{  
+ Contributors:  
  		Joerg Riegel - Initial implementation 
  ")
 @Ecore(nsURI="http://osbp.eclipse.org/xtext/table/TableDSL")
@@ -70,8 +72,6 @@ class Table extends TableBase{
 }
 
 interface TableOption extends TableLazyResolver{
-	boolean polling
-	String pollingTime
 	boolean filtering
 	refers ActionToolbar toolbar
 	boolean embedded
@@ -94,18 +94,6 @@ class TableGrid extends TableOption{
 	contains TableDtoDatasource source
 }
 
-class TableBean extends TableOption{
-	boolean selectById
-	boolean selectalways 
-	RowHeaderMode headerMode
-	contains TableDatamart source
-}
-
-class TableBeanDatasource extends TableLazyResolver{
-	refers DatamartDefinition datamartRef
-	contains TableElement[] elements
-}
-
 class TableDtoDatasource extends CxGridSource {
 	refers LDto dtoSource
 }
diff --git a/org.eclipse.osbp.xtext.table/plugin.properties b/org.eclipse.osbp.xtext.table/plugin.properties
index 25743fe..db2e361 100644
--- a/org.eclipse.osbp.xtext.table/plugin.properties
+++ b/org.eclipse.osbp.xtext.table/plugin.properties
@@ -1,8 +1,10 @@
 # Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
 #  All rights reserved. This program and the accompanying materials 
-#  are made available under the terms of the Eclipse Public License v1.0 
+#  are made available under the terms of the Eclipse Public License 2.0  
 #  which accompanies this distribution, and is available at 
-#  http://www.eclipse.org/legal/epl-v10.html 
+#  https://www.eclipse.org/legal/epl-2.0/ 
+# 
+#  SPDX-License-Identifier: EPL-2.0 
 # 
 #  Based on ideas from Xtext, Xtend, Xcore
 #   
diff --git a/org.eclipse.osbp.xtext.table/pom.xml b/org.eclipse.osbp.xtext.table/pom.xml
index ded98a3..78b468b 100644
--- a/org.eclipse.osbp.xtext.table/pom.xml
+++ b/org.eclipse.osbp.xtext.table/pom.xml
@@ -2,9 +2,11 @@
 <!--#======================================================================= -->
 <!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
 <!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
+<!--# are made available under the terms of the Eclipse Public License 2.0  -->
 <!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
+<!--# https://www.eclipse.org/legal/epl-2.0/    -->
+<!--#                                           -->
+<!--# SPDX-License-Identifier: EPL-2.0          -->
 <!--# -->
 <!--# Contributors: -->
 <!--#     Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
diff --git a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/AbstractTableDSLRuntimeModule.java b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/AbstractTableDSLRuntimeModule.java
index e17e64a..d4c1504 100644
--- a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/AbstractTableDSLRuntimeModule.java
+++ b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/AbstractTableDSLRuntimeModule.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table;
 
diff --git a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/TableDSL.xtextbin b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/TableDSL.xtextbin
index 6db6648..dd4a977 100644
--- a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/TableDSL.xtextbin
+++ b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/TableDSL.xtextbin
diff --git a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/TableDSLStandaloneSetupGenerated.java b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/TableDSLStandaloneSetupGenerated.java
index 3827d12..bc72bbe 100644
--- a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/TableDSLStandaloneSetupGenerated.java
+++ b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/TableDSLStandaloneSetupGenerated.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table;
 
diff --git a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/TableDSLAntlrTokenFileProvider.java b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/TableDSLAntlrTokenFileProvider.java
index f098803..4210712 100644
--- a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/TableDSLAntlrTokenFileProvider.java
+++ b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/TableDSLAntlrTokenFileProvider.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.parser.antlr;
 
diff --git a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/TableDSLParser.java b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/TableDSLParser.java
index 2d9f8e2..95eb799 100644
--- a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/TableDSLParser.java
+++ b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/TableDSLParser.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.parser.antlr;
 
diff --git a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSL.g b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSL.g
index 9422a59..b926035 100644
--- a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSL.g
+++ b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSL.g
@@ -344,15 +344,6 @@ ruleTableOption returns [EObject current=null]
 			$current = $this_TableGrid_2.current;
 			afterParserOrEnumRuleCall();
 		}
-		    |
-		{
-			newCompositeNode(grammarAccess.getTableOptionAccess().getTableBeanParserRuleCall_3());
-		}
-		this_TableBean_3=ruleTableBean
-		{
-			$current = $this_TableBean_3.current;
-			afterParserOrEnumRuleCall();
-		}
 	)
 ;
 
@@ -474,53 +465,9 @@ ruleTableSelection returns [EObject current=null]
 						getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2);
 					}
 								({true}?=>((
-									(
-										lv_polling_8_0='polling'
-										{
-											newLeafNode(lv_polling_8_0, grammarAccess.getTableSelectionAccess().getPollingPollingKeyword_3_2_0_0());
-										}
-										{
-											if ($current==null) {
-												$current = createModelElement(grammarAccess.getTableSelectionRule());
-											}
-											setWithLastConsumed($current, "polling", true, "polling");
-										}
-									)
-								)
-								(
-									(
-										{
-											newCompositeNode(grammarAccess.getTableSelectionAccess().getPollingTimeNumberParserRuleCall_3_2_1_0());
-										}
-										lv_pollingTime_9_0=ruleNumber
-										{
-											if ($current==null) {
-												$current = createModelElementForParent(grammarAccess.getTableSelectionRule());
-											}
-											set(
-												$current,
-												"pollingTime",
-												lv_pollingTime_9_0,
-												"org.eclipse.xtext.xbase.Xbase.Number");
-											afterParserOrEnumRuleCall();
-										}
-									)
-								)
-								))
-					{ 
-						getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3());
-					}
-				)
-			)|
-			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3)}?=>(
-					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3);
-					}
-								({true}?=>((
-									lv_filtering_10_0='filtering'
+									lv_filtering_8_0='filtering'
 									{
-										newLeafNode(lv_filtering_10_0, grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_3_0());
+										newLeafNode(lv_filtering_8_0, grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_2_0());
 									}
 									{
 										if ($current==null) {
@@ -536,14 +483,14 @@ ruleTableSelection returns [EObject current=null]
 				)
 			)|
 			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4)}?=>(
+				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3)}?=>(
 					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4);
+						getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3);
 					}
 								({true}?=>((
-									lv_embedded_11_0='embedded'
+									lv_embedded_9_0='embedded'
 									{
-										newLeafNode(lv_embedded_11_0, grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_4_0());
+										newLeafNode(lv_embedded_9_0, grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_3_0());
 									}
 									{
 										if ($current==null) {
@@ -559,13 +506,13 @@ ruleTableSelection returns [EObject current=null]
 				)
 			)|
 			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5)}?=>(
+				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4)}?=>(
 					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5);
+						getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4);
 					}
-								({true}?=>(otherlv_12='toolbar'
+								({true}?=>(otherlv_10='toolbar'
 								{
-									newLeafNode(otherlv_12, grammarAccess.getTableSelectionAccess().getToolbarKeyword_3_5_0());
+									newLeafNode(otherlv_10, grammarAccess.getTableSelectionAccess().getToolbarKeyword_3_4_0());
 								}
 								(
 									(
@@ -574,9 +521,9 @@ ruleTableSelection returns [EObject current=null]
 												$current = createModelElement(grammarAccess.getTableSelectionRule());
 											}
 										}
-										otherlv_13=RULE_ID
+										otherlv_11=RULE_ID
 										{
-											newLeafNode(otherlv_13, grammarAccess.getTableSelectionAccess().getToolbarActionToolbarCrossReference_3_5_1_0());
+											newLeafNode(otherlv_11, grammarAccess.getTableSelectionAccess().getToolbarActionToolbarCrossReference_3_4_1_0());
 										}
 									)
 								)
@@ -594,16 +541,16 @@ ruleTableSelection returns [EObject current=null]
 				}
 		)
 		(
-			otherlv_14='using'
+			otherlv_12='using'
 			{
-				newLeafNode(otherlv_14, grammarAccess.getTableSelectionAccess().getUsingKeyword_4_0());
+				newLeafNode(otherlv_12, grammarAccess.getTableSelectionAccess().getUsingKeyword_4_0());
 			}
 			(
 				(
 					{
 						newCompositeNode(grammarAccess.getTableSelectionAccess().getSourceTableDatamartParserRuleCall_4_1_0());
 					}
-					lv_source_15_0=ruleTableDatamart
+					lv_source_13_0=ruleTableDatamart
 					{
 						if ($current==null) {
 							$current = createModelElementForParent(grammarAccess.getTableSelectionRule());
@@ -611,7 +558,7 @@ ruleTableSelection returns [EObject current=null]
 						set(
 							$current,
 							"source",
-							lv_source_15_0,
+							lv_source_13_0,
 							"org.eclipse.osbp.xtext.table.TableDSL.TableDatamart");
 						afterParserOrEnumRuleCall();
 					}
@@ -644,9 +591,9 @@ ruleTableTable returns [EObject current=null]
 					$current);
 			}
 		)
-		otherlv_1='table'
+		otherlv_1='readOnly'
 		{
-			newLeafNode(otherlv_1, grammarAccess.getTableTableAccess().getTableKeyword_1());
+			newLeafNode(otherlv_1, grammarAccess.getTableTableAccess().getReadOnlyKeyword_1());
 		}
 		(
 			(
@@ -741,53 +688,9 @@ ruleTableTable returns [EObject current=null]
 						getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3);
 					}
 								({true}?=>((
-									(
-										lv_polling_7_0='polling'
-										{
-											newLeafNode(lv_polling_7_0, grammarAccess.getTableTableAccess().getPollingPollingKeyword_2_3_0_0());
-										}
-										{
-											if ($current==null) {
-												$current = createModelElement(grammarAccess.getTableTableRule());
-											}
-											setWithLastConsumed($current, "polling", true, "polling");
-										}
-									)
-								)
-								(
-									(
-										{
-											newCompositeNode(grammarAccess.getTableTableAccess().getPollingTimeNumberParserRuleCall_2_3_1_0());
-										}
-										lv_pollingTime_8_0=ruleNumber
-										{
-											if ($current==null) {
-												$current = createModelElementForParent(grammarAccess.getTableTableRule());
-											}
-											set(
-												$current,
-												"pollingTime",
-												lv_pollingTime_8_0,
-												"org.eclipse.xtext.xbase.Xbase.Number");
-											afterParserOrEnumRuleCall();
-										}
-									)
-								)
-								))
-					{ 
-						getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableTableAccess().getUnorderedGroup_2());
-					}
-				)
-			)|
-			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4)}?=>(
-					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4);
-					}
-								({true}?=>((
-									lv_filtering_9_0='filtering'
+									lv_filtering_7_0='filtering'
 									{
-										newLeafNode(lv_filtering_9_0, grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_4_0());
+										newLeafNode(lv_filtering_7_0, grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_3_0());
 									}
 									{
 										if ($current==null) {
@@ -803,14 +706,14 @@ ruleTableTable returns [EObject current=null]
 				)
 			)|
 			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5)}?=>(
+				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4)}?=>(
 					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5);
+						getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4);
 					}
 								({true}?=>((
-									lv_embedded_10_0='embedded'
+									lv_embedded_8_0='embedded'
 									{
-										newLeafNode(lv_embedded_10_0, grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_5_0());
+										newLeafNode(lv_embedded_8_0, grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_4_0());
 									}
 									{
 										if ($current==null) {
@@ -826,13 +729,13 @@ ruleTableTable returns [EObject current=null]
 				)
 			)|
 			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6)}?=>(
+				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5)}?=>(
 					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6);
+						getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5);
 					}
-								({true}?=>(otherlv_11='toolbar'
+								({true}?=>(otherlv_9='toolbar'
 								{
-									newLeafNode(otherlv_11, grammarAccess.getTableTableAccess().getToolbarKeyword_2_6_0());
+									newLeafNode(otherlv_9, grammarAccess.getTableTableAccess().getToolbarKeyword_2_5_0());
 								}
 								(
 									(
@@ -841,9 +744,9 @@ ruleTableTable returns [EObject current=null]
 												$current = createModelElement(grammarAccess.getTableTableRule());
 											}
 										}
-										otherlv_12=RULE_ID
+										otherlv_10=RULE_ID
 										{
-											newLeafNode(otherlv_12, grammarAccess.getTableTableAccess().getToolbarActionToolbarCrossReference_2_6_1_0());
+											newLeafNode(otherlv_10, grammarAccess.getTableTableAccess().getToolbarActionToolbarCrossReference_2_5_1_0());
 										}
 									)
 								)
@@ -861,16 +764,16 @@ ruleTableTable returns [EObject current=null]
 				}
 		)
 		(
-			otherlv_13='using'
+			otherlv_11='using'
 			{
-				newLeafNode(otherlv_13, grammarAccess.getTableTableAccess().getUsingKeyword_3_0());
+				newLeafNode(otherlv_11, grammarAccess.getTableTableAccess().getUsingKeyword_3_0());
 			}
 			(
 				(
 					{
 						newCompositeNode(grammarAccess.getTableTableAccess().getSourceTableDatamartParserRuleCall_3_1_0());
 					}
-					lv_source_14_0=ruleTableDatamart
+					lv_source_12_0=ruleTableDatamart
 					{
 						if ($current==null) {
 							$current = createModelElementForParent(grammarAccess.getTableTableRule());
@@ -878,274 +781,7 @@ ruleTableTable returns [EObject current=null]
 						set(
 							$current,
 							"source",
-							lv_source_14_0,
-							"org.eclipse.osbp.xtext.table.TableDSL.TableDatamart");
-						afterParserOrEnumRuleCall();
-					}
-				)
-			)
-		)?
-	)
-;
-
-// Entry rule entryRuleTableBean
-entryRuleTableBean returns [EObject current=null]:
-	{ newCompositeNode(grammarAccess.getTableBeanRule()); }
-	iv_ruleTableBean=ruleTableBean
-	{ $current=$iv_ruleTableBean.current; }
-	EOF;
-
-// Rule TableBean
-ruleTableBean returns [EObject current=null]
-@init {
-	enterRule();
-}
-@after {
-	leaveRule();
-}:
-	(
-		(
-			{
-				$current = forceCreateModelElement(
-					grammarAccess.getTableBeanAccess().getTableBeanAction_0(),
-					$current);
-			}
-		)
-		otherlv_1='bean'
-		{
-			newLeafNode(otherlv_1, grammarAccess.getTableBeanAccess().getBeanKeyword_1());
-		}
-		(
-			(
-				{ 
-				  getUnorderedGroupHelper().enter(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-				}
-				(
-					(
-			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0)}?=>(
-					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0);
-					}
-								({true}?=>((
-									lv_selectalways_3_0='alwaysSelected'
-									{
-										newLeafNode(lv_selectalways_3_0, grammarAccess.getTableBeanAccess().getSelectalwaysAlwaysSelectedKeyword_2_0_0());
-									}
-									{
-										if ($current==null) {
-											$current = createModelElement(grammarAccess.getTableBeanRule());
-										}
-										setWithLastConsumed($current, "selectalways", true, "alwaysSelected");
-									}
-								)
-								))
-					{ 
-						getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-					}
-				)
-			)|
-			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1)}?=>(
-					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1);
-					}
-								({true}?=>((
-									lv_selectById_4_0='selectById'
-									{
-										newLeafNode(lv_selectById_4_0, grammarAccess.getTableBeanAccess().getSelectByIdSelectByIdKeyword_2_1_0());
-									}
-									{
-										if ($current==null) {
-											$current = createModelElement(grammarAccess.getTableBeanRule());
-										}
-										setWithLastConsumed($current, "selectById", true, "selectById");
-									}
-								)
-								))
-					{ 
-						getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-					}
-				)
-			)|
-			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2)}?=>(
-					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2);
-					}
-								({true}?=>(otherlv_5='rowHeader'
-								{
-									newLeafNode(otherlv_5, grammarAccess.getTableBeanAccess().getRowHeaderKeyword_2_2_0());
-								}
-								(
-									(
-										{
-											newCompositeNode(grammarAccess.getTableBeanAccess().getHeaderModeRowHeaderModeEnumRuleCall_2_2_1_0());
-										}
-										lv_headerMode_6_0=ruleRowHeaderMode
-										{
-											if ($current==null) {
-												$current = createModelElementForParent(grammarAccess.getTableBeanRule());
-											}
-											set(
-												$current,
-												"headerMode",
-												lv_headerMode_6_0,
-												"org.eclipse.osbp.xtext.table.TableDSL.RowHeaderMode");
-											afterParserOrEnumRuleCall();
-										}
-									)
-								)
-								))
-					{ 
-						getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-					}
-				)
-			)|
-			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3)}?=>(
-					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3);
-					}
-								({true}?=>((
-									(
-										lv_polling_7_0='polling'
-										{
-											newLeafNode(lv_polling_7_0, grammarAccess.getTableBeanAccess().getPollingPollingKeyword_2_3_0_0());
-										}
-										{
-											if ($current==null) {
-												$current = createModelElement(grammarAccess.getTableBeanRule());
-											}
-											setWithLastConsumed($current, "polling", true, "polling");
-										}
-									)
-								)
-								(
-									(
-										{
-											newCompositeNode(grammarAccess.getTableBeanAccess().getPollingTimeNumberParserRuleCall_2_3_1_0());
-										}
-										lv_pollingTime_8_0=ruleNumber
-										{
-											if ($current==null) {
-												$current = createModelElementForParent(grammarAccess.getTableBeanRule());
-											}
-											set(
-												$current,
-												"pollingTime",
-												lv_pollingTime_8_0,
-												"org.eclipse.xtext.xbase.Xbase.Number");
-											afterParserOrEnumRuleCall();
-										}
-									)
-								)
-								))
-					{ 
-						getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-					}
-				)
-			)|
-			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4)}?=>(
-					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4);
-					}
-								({true}?=>((
-									lv_filtering_9_0='filtering'
-									{
-										newLeafNode(lv_filtering_9_0, grammarAccess.getTableBeanAccess().getFilteringFilteringKeyword_2_4_0());
-									}
-									{
-										if ($current==null) {
-											$current = createModelElement(grammarAccess.getTableBeanRule());
-										}
-										setWithLastConsumed($current, "filtering", true, "filtering");
-									}
-								)
-								))
-					{ 
-						getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-					}
-				)
-			)|
-			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5)}?=>(
-					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5);
-					}
-								({true}?=>((
-									lv_embedded_10_0='embedded'
-									{
-										newLeafNode(lv_embedded_10_0, grammarAccess.getTableBeanAccess().getEmbeddedEmbeddedKeyword_2_5_0());
-									}
-									{
-										if ($current==null) {
-											$current = createModelElement(grammarAccess.getTableBeanRule());
-										}
-										setWithLastConsumed($current, "embedded", true, "embedded");
-									}
-								)
-								))
-					{ 
-						getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-					}
-				)
-			)|
-			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6)}?=>(
-					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6);
-					}
-								({true}?=>(otherlv_11='toolbar'
-								{
-									newLeafNode(otherlv_11, grammarAccess.getTableBeanAccess().getToolbarKeyword_2_6_0());
-								}
-								(
-									(
-										{
-											if ($current==null) {
-												$current = createModelElement(grammarAccess.getTableBeanRule());
-											}
-										}
-										otherlv_12=RULE_ID
-										{
-											newLeafNode(otherlv_12, grammarAccess.getTableBeanAccess().getToolbarActionToolbarCrossReference_2_6_1_0());
-										}
-									)
-								)
-								))
-					{ 
-						getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-					}
-				)
-			)
-					)*
-				)
-			)
-				{ 
-				  getUnorderedGroupHelper().leave(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-				}
-		)
-		(
-			otherlv_13='using'
-			{
-				newLeafNode(otherlv_13, grammarAccess.getTableBeanAccess().getUsingKeyword_3_0());
-			}
-			(
-				(
-					{
-						newCompositeNode(grammarAccess.getTableBeanAccess().getSourceTableDatamartParserRuleCall_3_1_0());
-					}
-					lv_source_14_0=ruleTableDatamart
-					{
-						if ($current==null) {
-							$current = createModelElementForParent(grammarAccess.getTableBeanRule());
-						}
-						set(
-							$current,
-							"source",
-							lv_source_14_0,
+							lv_source_12_0,
 							"org.eclipse.osbp.xtext.table.TableDSL.TableDatamart");
 						afterParserOrEnumRuleCall();
 					}
@@ -3442,238 +3078,33 @@ ruleTableGrid returns [EObject current=null]
 					$current);
 			}
 		)
-		otherlv_1='grid'
+		otherlv_1='editable'
+		{
+			newLeafNode(otherlv_1, grammarAccess.getTableGridAccess().getEditableKeyword_1());
+		}
+		otherlv_2='using'
 		{
-			newLeafNode(otherlv_1, grammarAccess.getTableGridAccess().getGridKeyword_1());
+			newLeafNode(otherlv_2, grammarAccess.getTableGridAccess().getUsingKeyword_2());
 		}
 		(
 			(
-				{ 
-				  getUnorderedGroupHelper().enter(grammarAccess.getTableGridAccess().getUnorderedGroup_2());
+				{
+					newCompositeNode(grammarAccess.getTableGridAccess().getSourceTableDtoDatasourceParserRuleCall_3_0());
 				}
-				(
-					(
-			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0)}?=>(
-					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0);
-					}
-								({true}?=>((
-									lv_selectalways_3_0='selectalways'
-									{
-										newLeafNode(lv_selectalways_3_0, grammarAccess.getTableGridAccess().getSelectalwaysSelectalwaysKeyword_2_0_0());
-									}
-									{
-										if ($current==null) {
-											$current = createModelElement(grammarAccess.getTableGridRule());
-										}
-										setWithLastConsumed($current, "selectalways", true, "selectalways");
-									}
-								)
-								))
-					{ 
-						getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_2());
-					}
-				)
-			)|
-			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 1)}?=>(
-					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 1);
-					}
-								({true}?=>(otherlv_4='rowheader'
-								{
-									newLeafNode(otherlv_4, grammarAccess.getTableGridAccess().getRowheaderKeyword_2_1_0());
-								}
-								(
-									(
-										{
-											newCompositeNode(grammarAccess.getTableGridAccess().getHeaderModeRowHeaderModeEnumRuleCall_2_1_1_0());
-										}
-										lv_headerMode_5_0=ruleRowHeaderMode
-										{
-											if ($current==null) {
-												$current = createModelElementForParent(grammarAccess.getTableGridRule());
-											}
-											set(
-												$current,
-												"headerMode",
-												lv_headerMode_5_0,
-												"org.eclipse.osbp.xtext.table.TableDSL.RowHeaderMode");
-											afterParserOrEnumRuleCall();
-										}
-									)
-								)
-								))
-					{ 
-						getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_2());
+				lv_source_3_0=ruleTableDtoDatasource
+				{
+					if ($current==null) {
+						$current = createModelElementForParent(grammarAccess.getTableGridRule());
 					}
-				)
-			)
-					)*
-				)
-			)
-				{ 
-				  getUnorderedGroupHelper().leave(grammarAccess.getTableGridAccess().getUnorderedGroup_2());
-				}
-		)
-		(
-			(
-				{ 
-				  getUnorderedGroupHelper().enter(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
+					set(
+						$current,
+						"source",
+						lv_source_3_0,
+						"org.eclipse.osbp.xtext.table.TableDSL.TableDtoDatasource");
+					afterParserOrEnumRuleCall();
 				}
-				(
-					(
-			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0)}?=>(
-					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0);
-					}
-								({true}?=>((
-									(
-										lv_polling_7_0='polling'
-										{
-											newLeafNode(lv_polling_7_0, grammarAccess.getTableGridAccess().getPollingPollingKeyword_3_0_0_0());
-										}
-										{
-											if ($current==null) {
-												$current = createModelElement(grammarAccess.getTableGridRule());
-											}
-											setWithLastConsumed($current, "polling", true, "polling");
-										}
-									)
-								)
-								(
-									(
-										{
-											newCompositeNode(grammarAccess.getTableGridAccess().getPollingTimeNumberParserRuleCall_3_0_1_0());
-										}
-										lv_pollingTime_8_0=ruleNumber
-										{
-											if ($current==null) {
-												$current = createModelElementForParent(grammarAccess.getTableGridRule());
-											}
-											set(
-												$current,
-												"pollingTime",
-												lv_pollingTime_8_0,
-												"org.eclipse.xtext.xbase.Xbase.Number");
-											afterParserOrEnumRuleCall();
-										}
-									)
-								)
-								))
-					{ 
-						getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-					}
-				)
-			)|
-			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1)}?=>(
-					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1);
-					}
-								({true}?=>((
-									lv_filtering_9_0='filtering'
-									{
-										newLeafNode(lv_filtering_9_0, grammarAccess.getTableGridAccess().getFilteringFilteringKeyword_3_1_0());
-									}
-									{
-										if ($current==null) {
-											$current = createModelElement(grammarAccess.getTableGridRule());
-										}
-										setWithLastConsumed($current, "filtering", true, "filtering");
-									}
-								)
-								))
-					{ 
-						getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-					}
-				)
-			)|
-			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2)}?=>(
-					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2);
-					}
-								({true}?=>((
-									lv_embedded_10_0='embedded'
-									{
-										newLeafNode(lv_embedded_10_0, grammarAccess.getTableGridAccess().getEmbeddedEmbeddedKeyword_3_2_0());
-									}
-									{
-										if ($current==null) {
-											$current = createModelElement(grammarAccess.getTableGridRule());
-										}
-										setWithLastConsumed($current, "embedded", true, "embedded");
-									}
-								)
-								))
-					{ 
-						getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-					}
-				)
-			)|
-			(
-				{getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3)}?=>(
-					{
-						getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3);
-					}
-								({true}?=>(otherlv_11='toolbar'
-								{
-									newLeafNode(otherlv_11, grammarAccess.getTableGridAccess().getToolbarKeyword_3_3_0());
-								}
-								(
-									(
-										{
-											if ($current==null) {
-												$current = createModelElement(grammarAccess.getTableGridRule());
-											}
-										}
-										otherlv_12=RULE_ID
-										{
-											newLeafNode(otherlv_12, grammarAccess.getTableGridAccess().getToolbarActionToolbarCrossReference_3_3_1_0());
-										}
-									)
-								)
-								))
-					{ 
-						getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-					}
-				)
 			)
-					)*
-				)
-			)
-				{ 
-				  getUnorderedGroupHelper().leave(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-				}
 		)
-		(
-			otherlv_13='using'
-			{
-				newLeafNode(otherlv_13, grammarAccess.getTableGridAccess().getUsingKeyword_4_0());
-			}
-			(
-				(
-					{
-						newCompositeNode(grammarAccess.getTableGridAccess().getSourceTableDtoDatasourceParserRuleCall_4_1_0());
-					}
-					lv_source_14_0=ruleTableDtoDatasource
-					{
-						if ($current==null) {
-							$current = createModelElementForParent(grammarAccess.getTableGridRule());
-						}
-						set(
-							$current,
-							"source",
-							lv_source_14_0,
-							"org.eclipse.osbp.xtext.table.TableDSL.TableDtoDatasource");
-						afterParserOrEnumRuleCall();
-					}
-				)
-			)
-		)?
 	)
 ;
 
@@ -4030,11 +3461,20 @@ rulePropertyStyle returns [EObject current=null]
 		}
 		    |
 		{
-			newCompositeNode(grammarAccess.getPropertyStyleAccess().getGridPropIndicatorStyleParserRuleCall_8());
+			newCompositeNode(grammarAccess.getPropertyStyleAccess().getPropertyBlobImageStyleParserRuleCall_8());
 		}
-		this_GridPropIndicatorStyle_8=ruleGridPropIndicatorStyle
+		this_PropertyBlobImageStyle_8=rulePropertyBlobImageStyle
 		{
-			$current = $this_GridPropIndicatorStyle_8.current;
+			$current = $this_PropertyBlobImageStyle_8.current;
+			afterParserOrEnumRuleCall();
+		}
+		    |
+		{
+			newCompositeNode(grammarAccess.getPropertyStyleAccess().getGridPropIndicatorStyleParserRuleCall_9());
+		}
+		this_GridPropIndicatorStyle_9=ruleGridPropIndicatorStyle
+		{
+			$current = $this_GridPropIndicatorStyle_9.current;
 			afterParserOrEnumRuleCall();
 		}
 	)
@@ -4415,6 +3855,36 @@ rulePropertyTextStyle returns [EObject current=null]
 	)
 ;
 
+// Entry rule entryRulePropertyBlobImageStyle
+entryRulePropertyBlobImageStyle returns [EObject current=null]:
+	{ newCompositeNode(grammarAccess.getPropertyBlobImageStyleRule()); }
+	iv_rulePropertyBlobImageStyle=rulePropertyBlobImageStyle
+	{ $current=$iv_rulePropertyBlobImageStyle.current; }
+	EOF;
+
+// Rule PropertyBlobImageStyle
+rulePropertyBlobImageStyle returns [EObject current=null]
+@init {
+	enterRule();
+}
+@after {
+	leaveRule();
+}:
+	(
+		(
+			{
+				$current = forceCreateModelElement(
+					grammarAccess.getPropertyBlobImageStyleAccess().getCxGridPropBlobImageStyleAction_0(),
+					$current);
+			}
+		)
+		otherlv_1='blobImageStyle'
+		{
+			newLeafNode(otherlv_1, grammarAccess.getPropertyBlobImageStyleAccess().getBlobImageStyleKeyword_1());
+		}
+	)
+;
+
 // Entry rule entryRulePropertyImageStyle
 entryRulePropertyImageStyle returns [EObject current=null]:
 	{ newCompositeNode(grammarAccess.getPropertyImageStyleRule()); }
diff --git a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSL.tokens b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSL.tokens
index f77478d..e36b1ad 100644
--- a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSL.tokens
+++ b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSL.tokens
@@ -1,172 +1,169 @@
-'!'=134
-'!='=121
-'!=='=123
-'#'=107
-'%'=133
-'%='=114
-'&&'=119
-'&'=165
-'('=103
-')'=105
-'*'=99
-'**'=131
-'*='=112
-'+'=94
-'++'=135
-'+='=110
-','=104
-'-'=95
-'--'=136
-'-='=111
-'->'=125
-'.'=78
-'..'=127
-'..<'=126
-'/'=132
-'/='=113
-':'=143
-'::'=137
-';'=101
-'<'=115
-'<>'=129
-'='=106
-'=='=120
-'==='=122
-'=>'=128
-'>'=116
-'>='=117
-'?'=164
-'?.'=138
-'?:'=130
-'@'=102
-'['=108
-']'=109
-'aggregation'=55
-'allColumns'=48
+'!'=131
+'!='=118
+'!=='=120
+'#'=104
+'%'=130
+'%='=111
+'&&'=116
+'&'=162
+'('=100
+')'=102
+'*'=96
+'**'=128
+'*='=109
+'+'=91
+'++'=132
+'+='=107
+','=101
+'-'=92
+'--'=133
+'-='=108
+'->'=122
+'.'=74
+'..'=124
+'..<'=123
+'/'=129
+'/='=110
+':'=140
+'::'=134
+';'=98
+'<'=112
+'<>'=126
+'='=103
+'=='=117
+'==='=119
+'=>'=125
+'>'=113
+'>='=114
+'?'=161
+'?.'=135
+'?:'=127
+'@'=99
+'['=105
+']'=106
+'aggregation'=54
+'allColumns'=47
 'alwaysSelected'=24
 'as'=20
-'ascending'=34
-'axis'=63
-'bad-rising'=173
-'bean'=32
-'boolStyle'=82
-'buttonStyle'=79
-'case'=145
-'catch'=163
-'cellcolor'=68
-'chapters'=184
-'collapse'=36
-'column'=50
-'columns'=180
-'datamart'=62
-'dateStyle'=83
-'daysInPast'=58
-'default'=144
-'derived'=52
+'ascending'=33
+'axis'=62
+'bad-rising'=170
+'blobImageStyle'=88
+'boolStyle'=78
+'buttonStyle'=75
+'case'=142
+'catch'=160
+'cellcolor'=67
+'chapters'=181
+'collapse'=35
+'column'=49
+'columns'=177
+'datamart'=61
+'dateStyle'=79
+'daysInPast'=57
+'default'=141
+'derived'=51
 'describedBy'=19
-'details'=65
-'do'=148
-'dto'=77
-'dynamic'=44
-'editable'=74
-'else'=141
-'embedded'=28
-'equal'=166
-'eventTopic'=80
-'explicit'=178
-'extends'=151
-'extension'=98
-'false'=154
-'filtering'=27
-'finally'=161
-'for'=146
-'format'=84
-'formatter'=42
-'good-sloping'=175
-'greater equal'=167
-'greater than'=168
-'greenFrom'=89
-'grid'=71
-'hidden'=177
-'hidelabel'=40
-'htmlStyle'=81
-'icon'=37
-'if'=140
-'image'=38
-'imageStyle'=92
-'import'=96
-'indexed'=179
-'indicatorStyle'=88
-'instanceof'=124
-'integer'=59
-'intervals'=39
-'level'=53
-'lookups'=41
-'lower equal'=169
-'lower than'=170
-'max'=87
-'measure'=51
+'details'=64
+'do'=145
+'dto'=73
+'dynamic'=43
+'editable'=70
+'else'=138
+'embedded'=27
+'equal'=163
+'eventTopic'=76
+'explicit'=175
+'extends'=148
+'extension'=95
+'false'=151
+'filtering'=26
+'finally'=158
+'for'=143
+'format'=80
+'formatter'=41
+'good-sloping'=172
+'greater equal'=164
+'greater than'=165
+'greenFrom'=85
+'hidden'=174
+'hidelabel'=39
+'htmlStyle'=77
+'icon'=36
+'if'=137
+'image'=37
+'imageStyle'=89
+'import'=93
+'indexed'=176
+'indicatorStyle'=84
+'instanceof'=121
+'integer'=58
+'intervals'=38
+'level'=52
+'lookups'=40
+'lower equal'=166
+'lower than'=167
+'max'=83
+'measure'=50
 'multiple'=22
-'new'=153
-'not equal'=171
-'notifyOnSelect'=66
-'ns'=100
-'null'=156
-'number'=60
-'numberStyle'=85
-'ordinal'=49
+'new'=150
+'not equal'=168
+'notifyOnSelect'=65
+'ns'=97
+'null'=153
+'number'=59
+'numberStyle'=81
+'ordinal'=48
 'package'=15
-'pages'=182
-'path'=43
-'polling'=26
-'preorder'=33
-'progressbarStyle'=86
-'prop'=75
-'property'=54
-'redUntil'=90
-'resize'=45
-'return'=159
-'rising'=172
+'pages'=179
+'path'=42
+'preorder'=32
+'progressbarStyle'=82
+'prop'=71
+'property'=53
+'readOnly'=30
+'redUntil'=86
+'resize'=44
+'return'=156
+'rising'=169
 'rowHeader'=25
-'rowheader'=73
-'rowheight'=64
-'rows'=181
-'sections'=183
+'rowheight'=63
+'rows'=178
+'sections'=180
 'selectById'=31
-'selectalways'=72
 'selection'=21
 'single'=23
-'sloping'=174
-'stagnating'=176
-'static'=97
-'string'=61
-'style'=76
-'super'=152
-'switch'=142
-'synchronized'=162
+'sloping'=171
+'stagnating'=173
+'static'=94
+'string'=60
+'style'=72
+'super'=149
+'switch'=139
+'synchronized'=159
 'table'=18
-'taskId'=47
-'textStyle'=91
-'textcolor'=67
-'then'=93
-'throw'=158
-'toolbar'=29
-'tooltip'=70
-'tooltipPattern'=46
-'trend'=69
-'true'=155
-'try'=160
-'typeof'=157
-'upToInteger'=57
-'upToNumber'=56
-'using'=30
-'val'=150
-'value'=35
-'var'=149
-'while'=147
+'taskId'=46
+'textStyle'=87
+'textcolor'=66
+'then'=90
+'throw'=155
+'toolbar'=28
+'tooltip'=69
+'tooltipPattern'=45
+'trend'=68
+'true'=152
+'try'=157
+'typeof'=154
+'upToInteger'=56
+'upToNumber'=55
+'using'=29
+'val'=147
+'value'=34
+'var'=146
+'while'=144
 '{'=16
-'|'=139
-'||'=118
+'|'=136
+'||'=115
 '}'=17
 RULE_ANY_OTHER=14
 RULE_DECIMAL=9
@@ -264,9 +261,6 @@ T__179=179
 T__17=17
 T__180=180
 T__181=181
-T__182=182
-T__183=183
-T__184=184
 T__18=18
 T__19=19
 T__20=20
diff --git a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSLLexer.java b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSLLexer.java
index ce98b8c..e33353a 100644
--- a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSLLexer.java
+++ b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSLLexer.java
@@ -1,3 +1,17 @@
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
+ */
 package org.eclipse.osbp.xtext.table.parser.antlr.internal;
 
 // Hack: Use our own Lexer superclass by means of import. 
@@ -109,11 +123,8 @@ public class InternalTableDSLLexer extends Lexer {
     public static final int T__102=102;
     public static final int T__94=94;
     public static final int T__101=101;
-    public static final int T__184=184;
-    public static final int T__183=183;
     public static final int T__90=90;
     public static final int T__180=180;
-    public static final int T__182=182;
     public static final int T__181=181;
     public static final int T__19=19;
     public static final int T__15=15;
@@ -442,10 +453,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:22:7: ( 'polling' )
-            // InternalTableDSL.g:22:9: 'polling'
+            // InternalTableDSL.g:22:7: ( 'filtering' )
+            // InternalTableDSL.g:22:9: 'filtering'
             {
-            match("polling"); 
+            match("filtering"); 
 
 
             }
@@ -463,10 +474,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:23:7: ( 'filtering' )
-            // InternalTableDSL.g:23:9: 'filtering'
+            // InternalTableDSL.g:23:7: ( 'embedded' )
+            // InternalTableDSL.g:23:9: 'embedded'
             {
-            match("filtering"); 
+            match("embedded"); 
 
 
             }
@@ -484,10 +495,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:24:7: ( 'embedded' )
-            // InternalTableDSL.g:24:9: 'embedded'
+            // InternalTableDSL.g:24:7: ( 'toolbar' )
+            // InternalTableDSL.g:24:9: 'toolbar'
             {
-            match("embedded"); 
+            match("toolbar"); 
 
 
             }
@@ -505,10 +516,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:25:7: ( 'toolbar' )
-            // InternalTableDSL.g:25:9: 'toolbar'
+            // InternalTableDSL.g:25:7: ( 'using' )
+            // InternalTableDSL.g:25:9: 'using'
             {
-            match("toolbar"); 
+            match("using"); 
 
 
             }
@@ -526,10 +537,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:26:7: ( 'using' )
-            // InternalTableDSL.g:26:9: 'using'
+            // InternalTableDSL.g:26:7: ( 'readOnly' )
+            // InternalTableDSL.g:26:9: 'readOnly'
             {
-            match("using"); 
+            match("readOnly"); 
 
 
             }
@@ -568,10 +579,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:28:7: ( 'bean' )
-            // InternalTableDSL.g:28:9: 'bean'
+            // InternalTableDSL.g:28:7: ( 'preorder' )
+            // InternalTableDSL.g:28:9: 'preorder'
             {
-            match("bean"); 
+            match("preorder"); 
 
 
             }
@@ -589,10 +600,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:29:7: ( 'preorder' )
-            // InternalTableDSL.g:29:9: 'preorder'
+            // InternalTableDSL.g:29:7: ( 'ascending' )
+            // InternalTableDSL.g:29:9: 'ascending'
             {
-            match("preorder"); 
+            match("ascending"); 
 
 
             }
@@ -610,10 +621,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:30:7: ( 'ascending' )
-            // InternalTableDSL.g:30:9: 'ascending'
+            // InternalTableDSL.g:30:7: ( 'value' )
+            // InternalTableDSL.g:30:9: 'value'
             {
-            match("ascending"); 
+            match("value"); 
 
 
             }
@@ -631,10 +642,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:31:7: ( 'value' )
-            // InternalTableDSL.g:31:9: 'value'
+            // InternalTableDSL.g:31:7: ( 'collapse' )
+            // InternalTableDSL.g:31:9: 'collapse'
             {
-            match("value"); 
+            match("collapse"); 
 
 
             }
@@ -652,10 +663,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:32:7: ( 'collapse' )
-            // InternalTableDSL.g:32:9: 'collapse'
+            // InternalTableDSL.g:32:7: ( 'icon' )
+            // InternalTableDSL.g:32:9: 'icon'
             {
-            match("collapse"); 
+            match("icon"); 
 
 
             }
@@ -673,10 +684,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:33:7: ( 'icon' )
-            // InternalTableDSL.g:33:9: 'icon'
+            // InternalTableDSL.g:33:7: ( 'image' )
+            // InternalTableDSL.g:33:9: 'image'
             {
-            match("icon"); 
+            match("image"); 
 
 
             }
@@ -694,10 +705,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:34:7: ( 'image' )
-            // InternalTableDSL.g:34:9: 'image'
+            // InternalTableDSL.g:34:7: ( 'intervals' )
+            // InternalTableDSL.g:34:9: 'intervals'
             {
-            match("image"); 
+            match("intervals"); 
 
 
             }
@@ -715,10 +726,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:35:7: ( 'intervals' )
-            // InternalTableDSL.g:35:9: 'intervals'
+            // InternalTableDSL.g:35:7: ( 'hidelabel' )
+            // InternalTableDSL.g:35:9: 'hidelabel'
             {
-            match("intervals"); 
+            match("hidelabel"); 
 
 
             }
@@ -736,10 +747,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:36:7: ( 'hidelabel' )
-            // InternalTableDSL.g:36:9: 'hidelabel'
+            // InternalTableDSL.g:36:7: ( 'lookups' )
+            // InternalTableDSL.g:36:9: 'lookups'
             {
-            match("hidelabel"); 
+            match("lookups"); 
 
 
             }
@@ -757,10 +768,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:37:7: ( 'lookups' )
-            // InternalTableDSL.g:37:9: 'lookups'
+            // InternalTableDSL.g:37:7: ( 'formatter' )
+            // InternalTableDSL.g:37:9: 'formatter'
             {
-            match("lookups"); 
+            match("formatter"); 
 
 
             }
@@ -778,10 +789,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:38:7: ( 'formatter' )
-            // InternalTableDSL.g:38:9: 'formatter'
+            // InternalTableDSL.g:38:7: ( 'path' )
+            // InternalTableDSL.g:38:9: 'path'
             {
-            match("formatter"); 
+            match("path"); 
 
 
             }
@@ -799,10 +810,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:39:7: ( 'path' )
-            // InternalTableDSL.g:39:9: 'path'
+            // InternalTableDSL.g:39:7: ( 'dynamic' )
+            // InternalTableDSL.g:39:9: 'dynamic'
             {
-            match("path"); 
+            match("dynamic"); 
 
 
             }
@@ -820,10 +831,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:40:7: ( 'dynamic' )
-            // InternalTableDSL.g:40:9: 'dynamic'
+            // InternalTableDSL.g:40:7: ( 'resize' )
+            // InternalTableDSL.g:40:9: 'resize'
             {
-            match("dynamic"); 
+            match("resize"); 
 
 
             }
@@ -841,10 +852,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:41:7: ( 'resize' )
-            // InternalTableDSL.g:41:9: 'resize'
+            // InternalTableDSL.g:41:7: ( 'tooltipPattern' )
+            // InternalTableDSL.g:41:9: 'tooltipPattern'
             {
-            match("resize"); 
+            match("tooltipPattern"); 
 
 
             }
@@ -862,10 +873,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:42:7: ( 'tooltipPattern' )
-            // InternalTableDSL.g:42:9: 'tooltipPattern'
+            // InternalTableDSL.g:42:7: ( 'taskId' )
+            // InternalTableDSL.g:42:9: 'taskId'
             {
-            match("tooltipPattern"); 
+            match("taskId"); 
 
 
             }
@@ -883,10 +894,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:43:7: ( 'taskId' )
-            // InternalTableDSL.g:43:9: 'taskId'
+            // InternalTableDSL.g:43:7: ( 'allColumns' )
+            // InternalTableDSL.g:43:9: 'allColumns'
             {
-            match("taskId"); 
+            match("allColumns"); 
 
 
             }
@@ -904,10 +915,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:44:7: ( 'allColumns' )
-            // InternalTableDSL.g:44:9: 'allColumns'
+            // InternalTableDSL.g:44:7: ( 'ordinal' )
+            // InternalTableDSL.g:44:9: 'ordinal'
             {
-            match("allColumns"); 
+            match("ordinal"); 
 
 
             }
@@ -925,10 +936,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:45:7: ( 'ordinal' )
-            // InternalTableDSL.g:45:9: 'ordinal'
+            // InternalTableDSL.g:45:7: ( 'column' )
+            // InternalTableDSL.g:45:9: 'column'
             {
-            match("ordinal"); 
+            match("column"); 
 
 
             }
@@ -946,10 +957,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:46:7: ( 'column' )
-            // InternalTableDSL.g:46:9: 'column'
+            // InternalTableDSL.g:46:7: ( 'measure' )
+            // InternalTableDSL.g:46:9: 'measure'
             {
-            match("column"); 
+            match("measure"); 
 
 
             }
@@ -967,10 +978,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:47:7: ( 'measure' )
-            // InternalTableDSL.g:47:9: 'measure'
+            // InternalTableDSL.g:47:7: ( 'derived' )
+            // InternalTableDSL.g:47:9: 'derived'
             {
-            match("measure"); 
+            match("derived"); 
 
 
             }
@@ -988,10 +999,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:48:7: ( 'derived' )
-            // InternalTableDSL.g:48:9: 'derived'
+            // InternalTableDSL.g:48:7: ( 'level' )
+            // InternalTableDSL.g:48:9: 'level'
             {
-            match("derived"); 
+            match("level"); 
 
 
             }
@@ -1009,10 +1020,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:49:7: ( 'level' )
-            // InternalTableDSL.g:49:9: 'level'
+            // InternalTableDSL.g:49:7: ( 'property' )
+            // InternalTableDSL.g:49:9: 'property'
             {
-            match("level"); 
+            match("property"); 
 
 
             }
@@ -1030,10 +1041,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:50:7: ( 'property' )
-            // InternalTableDSL.g:50:9: 'property'
+            // InternalTableDSL.g:50:7: ( 'aggregation' )
+            // InternalTableDSL.g:50:9: 'aggregation'
             {
-            match("property"); 
+            match("aggregation"); 
 
 
             }
@@ -1051,10 +1062,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:51:7: ( 'aggregation' )
-            // InternalTableDSL.g:51:9: 'aggregation'
+            // InternalTableDSL.g:51:7: ( 'upToNumber' )
+            // InternalTableDSL.g:51:9: 'upToNumber'
             {
-            match("aggregation"); 
+            match("upToNumber"); 
 
 
             }
@@ -1072,10 +1083,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:52:7: ( 'upToNumber' )
-            // InternalTableDSL.g:52:9: 'upToNumber'
+            // InternalTableDSL.g:52:7: ( 'upToInteger' )
+            // InternalTableDSL.g:52:9: 'upToInteger'
             {
-            match("upToNumber"); 
+            match("upToInteger"); 
 
 
             }
@@ -1093,10 +1104,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:53:7: ( 'upToInteger' )
-            // InternalTableDSL.g:53:9: 'upToInteger'
+            // InternalTableDSL.g:53:7: ( 'daysInPast' )
+            // InternalTableDSL.g:53:9: 'daysInPast'
             {
-            match("upToInteger"); 
+            match("daysInPast"); 
 
 
             }
@@ -1114,10 +1125,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:54:7: ( 'daysInPast' )
-            // InternalTableDSL.g:54:9: 'daysInPast'
+            // InternalTableDSL.g:54:7: ( 'integer' )
+            // InternalTableDSL.g:54:9: 'integer'
             {
-            match("daysInPast"); 
+            match("integer"); 
 
 
             }
@@ -1135,10 +1146,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:55:7: ( 'integer' )
-            // InternalTableDSL.g:55:9: 'integer'
+            // InternalTableDSL.g:55:7: ( 'number' )
+            // InternalTableDSL.g:55:9: 'number'
             {
-            match("integer"); 
+            match("number"); 
 
 
             }
@@ -1156,10 +1167,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:56:7: ( 'number' )
-            // InternalTableDSL.g:56:9: 'number'
+            // InternalTableDSL.g:56:7: ( 'string' )
+            // InternalTableDSL.g:56:9: 'string'
             {
-            match("number"); 
+            match("string"); 
 
 
             }
@@ -1177,10 +1188,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:57:7: ( 'string' )
-            // InternalTableDSL.g:57:9: 'string'
+            // InternalTableDSL.g:57:7: ( 'datamart' )
+            // InternalTableDSL.g:57:9: 'datamart'
             {
-            match("string"); 
+            match("datamart"); 
 
 
             }
@@ -1198,10 +1209,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:58:7: ( 'datamart' )
-            // InternalTableDSL.g:58:9: 'datamart'
+            // InternalTableDSL.g:58:7: ( 'axis' )
+            // InternalTableDSL.g:58:9: 'axis'
             {
-            match("datamart"); 
+            match("axis"); 
 
 
             }
@@ -1219,10 +1230,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:59:7: ( 'axis' )
-            // InternalTableDSL.g:59:9: 'axis'
+            // InternalTableDSL.g:59:7: ( 'rowheight' )
+            // InternalTableDSL.g:59:9: 'rowheight'
             {
-            match("axis"); 
+            match("rowheight"); 
 
 
             }
@@ -1240,10 +1251,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:60:7: ( 'rowheight' )
-            // InternalTableDSL.g:60:9: 'rowheight'
+            // InternalTableDSL.g:60:7: ( 'details' )
+            // InternalTableDSL.g:60:9: 'details'
             {
-            match("rowheight"); 
+            match("details"); 
 
 
             }
@@ -1261,10 +1272,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:61:7: ( 'details' )
-            // InternalTableDSL.g:61:9: 'details'
+            // InternalTableDSL.g:61:7: ( 'notifyOnSelect' )
+            // InternalTableDSL.g:61:9: 'notifyOnSelect'
             {
-            match("details"); 
+            match("notifyOnSelect"); 
 
 
             }
@@ -1282,10 +1293,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:62:7: ( 'notifyOnSelect' )
-            // InternalTableDSL.g:62:9: 'notifyOnSelect'
+            // InternalTableDSL.g:62:7: ( 'textcolor' )
+            // InternalTableDSL.g:62:9: 'textcolor'
             {
-            match("notifyOnSelect"); 
+            match("textcolor"); 
 
 
             }
@@ -1303,10 +1314,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:63:7: ( 'textcolor' )
-            // InternalTableDSL.g:63:9: 'textcolor'
+            // InternalTableDSL.g:63:7: ( 'cellcolor' )
+            // InternalTableDSL.g:63:9: 'cellcolor'
             {
-            match("textcolor"); 
+            match("cellcolor"); 
 
 
             }
@@ -1324,10 +1335,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:64:7: ( 'cellcolor' )
-            // InternalTableDSL.g:64:9: 'cellcolor'
+            // InternalTableDSL.g:64:7: ( 'trend' )
+            // InternalTableDSL.g:64:9: 'trend'
             {
-            match("cellcolor"); 
+            match("trend"); 
 
 
             }
@@ -1345,10 +1356,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:65:7: ( 'trend' )
-            // InternalTableDSL.g:65:9: 'trend'
+            // InternalTableDSL.g:65:7: ( 'tooltip' )
+            // InternalTableDSL.g:65:9: 'tooltip'
             {
-            match("trend"); 
+            match("tooltip"); 
 
 
             }
@@ -1366,10 +1377,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:66:7: ( 'tooltip' )
-            // InternalTableDSL.g:66:9: 'tooltip'
+            // InternalTableDSL.g:66:7: ( 'editable' )
+            // InternalTableDSL.g:66:9: 'editable'
             {
-            match("tooltip"); 
+            match("editable"); 
 
 
             }
@@ -1387,10 +1398,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:67:7: ( 'grid' )
-            // InternalTableDSL.g:67:9: 'grid'
+            // InternalTableDSL.g:67:7: ( 'prop' )
+            // InternalTableDSL.g:67:9: 'prop'
             {
-            match("grid"); 
+            match("prop"); 
 
 
             }
@@ -1408,10 +1419,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:68:7: ( 'selectalways' )
-            // InternalTableDSL.g:68:9: 'selectalways'
+            // InternalTableDSL.g:68:7: ( 'style' )
+            // InternalTableDSL.g:68:9: 'style'
             {
-            match("selectalways"); 
+            match("style"); 
 
 
             }
@@ -1429,10 +1440,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:69:7: ( 'rowheader' )
-            // InternalTableDSL.g:69:9: 'rowheader'
+            // InternalTableDSL.g:69:7: ( 'dto' )
+            // InternalTableDSL.g:69:9: 'dto'
             {
-            match("rowheader"); 
+            match("dto"); 
 
 
             }
@@ -1450,11 +1461,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:70:7: ( 'editable' )
-            // InternalTableDSL.g:70:9: 'editable'
+            // InternalTableDSL.g:70:7: ( '.' )
+            // InternalTableDSL.g:70:9: '.'
             {
-            match("editable"); 
-
+            match('.'); 
 
             }
 
@@ -1471,10 +1481,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:71:7: ( 'prop' )
-            // InternalTableDSL.g:71:9: 'prop'
+            // InternalTableDSL.g:71:7: ( 'buttonStyle' )
+            // InternalTableDSL.g:71:9: 'buttonStyle'
             {
-            match("prop"); 
+            match("buttonStyle"); 
 
 
             }
@@ -1492,10 +1502,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:72:7: ( 'style' )
-            // InternalTableDSL.g:72:9: 'style'
+            // InternalTableDSL.g:72:7: ( 'eventTopic' )
+            // InternalTableDSL.g:72:9: 'eventTopic'
             {
-            match("style"); 
+            match("eventTopic"); 
 
 
             }
@@ -1513,10 +1523,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:73:7: ( 'dto' )
-            // InternalTableDSL.g:73:9: 'dto'
+            // InternalTableDSL.g:73:7: ( 'htmlStyle' )
+            // InternalTableDSL.g:73:9: 'htmlStyle'
             {
-            match("dto"); 
+            match("htmlStyle"); 
 
 
             }
@@ -1534,10 +1544,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:74:7: ( '.' )
-            // InternalTableDSL.g:74:9: '.'
+            // InternalTableDSL.g:74:7: ( 'boolStyle' )
+            // InternalTableDSL.g:74:9: 'boolStyle'
             {
-            match('.'); 
+            match("boolStyle"); 
+
 
             }
 
@@ -1554,10 +1565,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:75:7: ( 'buttonStyle' )
-            // InternalTableDSL.g:75:9: 'buttonStyle'
+            // InternalTableDSL.g:75:7: ( 'dateStyle' )
+            // InternalTableDSL.g:75:9: 'dateStyle'
             {
-            match("buttonStyle"); 
+            match("dateStyle"); 
 
 
             }
@@ -1575,10 +1586,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:76:7: ( 'eventTopic' )
-            // InternalTableDSL.g:76:9: 'eventTopic'
+            // InternalTableDSL.g:76:7: ( 'format' )
+            // InternalTableDSL.g:76:9: 'format'
             {
-            match("eventTopic"); 
+            match("format"); 
 
 
             }
@@ -1596,10 +1607,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:77:7: ( 'htmlStyle' )
-            // InternalTableDSL.g:77:9: 'htmlStyle'
+            // InternalTableDSL.g:77:7: ( 'numberStyle' )
+            // InternalTableDSL.g:77:9: 'numberStyle'
             {
-            match("htmlStyle"); 
+            match("numberStyle"); 
 
 
             }
@@ -1617,10 +1628,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__82;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:78:7: ( 'boolStyle' )
-            // InternalTableDSL.g:78:9: 'boolStyle'
+            // InternalTableDSL.g:78:7: ( 'progressbarStyle' )
+            // InternalTableDSL.g:78:9: 'progressbarStyle'
             {
-            match("boolStyle"); 
+            match("progressbarStyle"); 
 
 
             }
@@ -1638,10 +1649,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__83;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:79:7: ( 'dateStyle' )
-            // InternalTableDSL.g:79:9: 'dateStyle'
+            // InternalTableDSL.g:79:7: ( 'max' )
+            // InternalTableDSL.g:79:9: 'max'
             {
-            match("dateStyle"); 
+            match("max"); 
 
 
             }
@@ -1659,10 +1670,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__84;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:80:7: ( 'format' )
-            // InternalTableDSL.g:80:9: 'format'
+            // InternalTableDSL.g:80:7: ( 'indicatorStyle' )
+            // InternalTableDSL.g:80:9: 'indicatorStyle'
             {
-            match("format"); 
+            match("indicatorStyle"); 
 
 
             }
@@ -1680,10 +1691,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__85;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:81:7: ( 'numberStyle' )
-            // InternalTableDSL.g:81:9: 'numberStyle'
+            // InternalTableDSL.g:81:7: ( 'greenFrom' )
+            // InternalTableDSL.g:81:9: 'greenFrom'
             {
-            match("numberStyle"); 
+            match("greenFrom"); 
 
 
             }
@@ -1701,10 +1712,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__86;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:82:7: ( 'progressbarStyle' )
-            // InternalTableDSL.g:82:9: 'progressbarStyle'
+            // InternalTableDSL.g:82:7: ( 'redUntil' )
+            // InternalTableDSL.g:82:9: 'redUntil'
             {
-            match("progressbarStyle"); 
+            match("redUntil"); 
 
 
             }
@@ -1722,10 +1733,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__87;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:83:7: ( 'max' )
-            // InternalTableDSL.g:83:9: 'max'
+            // InternalTableDSL.g:83:7: ( 'textStyle' )
+            // InternalTableDSL.g:83:9: 'textStyle'
             {
-            match("max"); 
+            match("textStyle"); 
 
 
             }
@@ -1743,10 +1754,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__88;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:84:7: ( 'indicatorStyle' )
-            // InternalTableDSL.g:84:9: 'indicatorStyle'
+            // InternalTableDSL.g:84:7: ( 'blobImageStyle' )
+            // InternalTableDSL.g:84:9: 'blobImageStyle'
             {
-            match("indicatorStyle"); 
+            match("blobImageStyle"); 
 
 
             }
@@ -1764,10 +1775,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__89;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:85:7: ( 'greenFrom' )
-            // InternalTableDSL.g:85:9: 'greenFrom'
+            // InternalTableDSL.g:85:7: ( 'imageStyle' )
+            // InternalTableDSL.g:85:9: 'imageStyle'
             {
-            match("greenFrom"); 
+            match("imageStyle"); 
 
 
             }
@@ -1785,10 +1796,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__90;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:86:7: ( 'redUntil' )
-            // InternalTableDSL.g:86:9: 'redUntil'
+            // InternalTableDSL.g:86:7: ( 'then' )
+            // InternalTableDSL.g:86:9: 'then'
             {
-            match("redUntil"); 
+            match("then"); 
 
 
             }
@@ -1806,11 +1817,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__91;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:87:7: ( 'textStyle' )
-            // InternalTableDSL.g:87:9: 'textStyle'
+            // InternalTableDSL.g:87:7: ( '+' )
+            // InternalTableDSL.g:87:9: '+'
             {
-            match("textStyle"); 
-
+            match('+'); 
 
             }
 
@@ -1827,11 +1837,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__92;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:88:7: ( 'imageStyle' )
-            // InternalTableDSL.g:88:9: 'imageStyle'
+            // InternalTableDSL.g:88:7: ( '-' )
+            // InternalTableDSL.g:88:9: '-'
             {
-            match("imageStyle"); 
-
+            match('-'); 
 
             }
 
@@ -1848,10 +1857,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__93;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:89:7: ( 'then' )
-            // InternalTableDSL.g:89:9: 'then'
+            // InternalTableDSL.g:89:7: ( 'import' )
+            // InternalTableDSL.g:89:9: 'import'
             {
-            match("then"); 
+            match("import"); 
 
 
             }
@@ -1869,10 +1878,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__94;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:90:7: ( '+' )
-            // InternalTableDSL.g:90:9: '+'
+            // InternalTableDSL.g:90:7: ( 'static' )
+            // InternalTableDSL.g:90:9: 'static'
             {
-            match('+'); 
+            match("static"); 
+
 
             }
 
@@ -1889,10 +1899,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__95;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:91:7: ( '-' )
-            // InternalTableDSL.g:91:9: '-'
+            // InternalTableDSL.g:91:7: ( 'extension' )
+            // InternalTableDSL.g:91:9: 'extension'
             {
-            match('-'); 
+            match("extension"); 
+
 
             }
 
@@ -1909,11 +1920,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__96;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:92:7: ( 'import' )
-            // InternalTableDSL.g:92:9: 'import'
+            // InternalTableDSL.g:92:7: ( '*' )
+            // InternalTableDSL.g:92:9: '*'
             {
-            match("import"); 
-
+            match('*'); 
 
             }
 
@@ -1930,10 +1940,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__97;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:93:7: ( 'static' )
-            // InternalTableDSL.g:93:9: 'static'
+            // InternalTableDSL.g:93:7: ( 'ns' )
+            // InternalTableDSL.g:93:9: 'ns'
             {
-            match("static"); 
+            match("ns"); 
 
 
             }
@@ -1951,11 +1961,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__98;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:94:7: ( 'extension' )
-            // InternalTableDSL.g:94:9: 'extension'
+            // InternalTableDSL.g:94:7: ( ';' )
+            // InternalTableDSL.g:94:9: ';'
             {
-            match("extension"); 
-
+            match(';'); 
 
             }
 
@@ -1972,10 +1981,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__99;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:95:7: ( '*' )
-            // InternalTableDSL.g:95:9: '*'
+            // InternalTableDSL.g:95:7: ( '@' )
+            // InternalTableDSL.g:95:9: '@'
             {
-            match('*'); 
+            match('@'); 
 
             }
 
@@ -1992,11 +2001,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__100;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:96:8: ( 'ns' )
-            // InternalTableDSL.g:96:10: 'ns'
+            // InternalTableDSL.g:96:8: ( '(' )
+            // InternalTableDSL.g:96:10: '('
             {
-            match("ns"); 
-
+            match('('); 
 
             }
 
@@ -2013,10 +2021,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__101;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:97:8: ( ';' )
-            // InternalTableDSL.g:97:10: ';'
+            // InternalTableDSL.g:97:8: ( ',' )
+            // InternalTableDSL.g:97:10: ','
             {
-            match(';'); 
+            match(','); 
 
             }
 
@@ -2033,10 +2041,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__102;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:98:8: ( '@' )
-            // InternalTableDSL.g:98:10: '@'
+            // InternalTableDSL.g:98:8: ( ')' )
+            // InternalTableDSL.g:98:10: ')'
             {
-            match('@'); 
+            match(')'); 
 
             }
 
@@ -2053,10 +2061,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__103;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:99:8: ( '(' )
-            // InternalTableDSL.g:99:10: '('
+            // InternalTableDSL.g:99:8: ( '=' )
+            // InternalTableDSL.g:99:10: '='
             {
-            match('('); 
+            match('='); 
 
             }
 
@@ -2073,10 +2081,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__104;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:100:8: ( ',' )
-            // InternalTableDSL.g:100:10: ','
+            // InternalTableDSL.g:100:8: ( '#' )
+            // InternalTableDSL.g:100:10: '#'
             {
-            match(','); 
+            match('#'); 
 
             }
 
@@ -2093,10 +2101,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__105;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:101:8: ( ')' )
-            // InternalTableDSL.g:101:10: ')'
+            // InternalTableDSL.g:101:8: ( '[' )
+            // InternalTableDSL.g:101:10: '['
             {
-            match(')'); 
+            match('['); 
 
             }
 
@@ -2113,10 +2121,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__106;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:102:8: ( '=' )
-            // InternalTableDSL.g:102:10: '='
+            // InternalTableDSL.g:102:8: ( ']' )
+            // InternalTableDSL.g:102:10: ']'
             {
-            match('='); 
+            match(']'); 
 
             }
 
@@ -2133,10 +2141,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__107;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:103:8: ( '#' )
-            // InternalTableDSL.g:103:10: '#'
+            // InternalTableDSL.g:103:8: ( '+=' )
+            // InternalTableDSL.g:103:10: '+='
             {
-            match('#'); 
+            match("+="); 
+
 
             }
 
@@ -2153,10 +2162,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__108;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:104:8: ( '[' )
-            // InternalTableDSL.g:104:10: '['
+            // InternalTableDSL.g:104:8: ( '-=' )
+            // InternalTableDSL.g:104:10: '-='
             {
-            match('['); 
+            match("-="); 
+
 
             }
 
@@ -2173,10 +2183,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__109;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:105:8: ( ']' )
-            // InternalTableDSL.g:105:10: ']'
+            // InternalTableDSL.g:105:8: ( '*=' )
+            // InternalTableDSL.g:105:10: '*='
             {
-            match(']'); 
+            match("*="); 
+
 
             }
 
@@ -2193,10 +2204,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__110;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:106:8: ( '+=' )
-            // InternalTableDSL.g:106:10: '+='
+            // InternalTableDSL.g:106:8: ( '/=' )
+            // InternalTableDSL.g:106:10: '/='
             {
-            match("+="); 
+            match("/="); 
 
 
             }
@@ -2214,10 +2225,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__111;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:107:8: ( '-=' )
-            // InternalTableDSL.g:107:10: '-='
+            // InternalTableDSL.g:107:8: ( '%=' )
+            // InternalTableDSL.g:107:10: '%='
             {
-            match("-="); 
+            match("%="); 
 
 
             }
@@ -2235,11 +2246,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__112;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:108:8: ( '*=' )
-            // InternalTableDSL.g:108:10: '*='
+            // InternalTableDSL.g:108:8: ( '<' )
+            // InternalTableDSL.g:108:10: '<'
             {
-            match("*="); 
-
+            match('<'); 
 
             }
 
@@ -2256,11 +2266,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__113;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:109:8: ( '/=' )
-            // InternalTableDSL.g:109:10: '/='
+            // InternalTableDSL.g:109:8: ( '>' )
+            // InternalTableDSL.g:109:10: '>'
             {
-            match("/="); 
-
+            match('>'); 
 
             }
 
@@ -2277,10 +2286,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__114;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:110:8: ( '%=' )
-            // InternalTableDSL.g:110:10: '%='
+            // InternalTableDSL.g:110:8: ( '>=' )
+            // InternalTableDSL.g:110:10: '>='
             {
-            match("%="); 
+            match(">="); 
 
 
             }
@@ -2298,10 +2307,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__115;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:111:8: ( '<' )
-            // InternalTableDSL.g:111:10: '<'
+            // InternalTableDSL.g:111:8: ( '||' )
+            // InternalTableDSL.g:111:10: '||'
             {
-            match('<'); 
+            match("||"); 
+
 
             }
 
@@ -2318,10 +2328,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__116;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:112:8: ( '>' )
-            // InternalTableDSL.g:112:10: '>'
+            // InternalTableDSL.g:112:8: ( '&&' )
+            // InternalTableDSL.g:112:10: '&&'
             {
-            match('>'); 
+            match("&&"); 
+
 
             }
 
@@ -2338,10 +2349,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__117;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:113:8: ( '>=' )
-            // InternalTableDSL.g:113:10: '>='
+            // InternalTableDSL.g:113:8: ( '==' )
+            // InternalTableDSL.g:113:10: '=='
             {
-            match(">="); 
+            match("=="); 
 
 
             }
@@ -2359,10 +2370,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__118;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:114:8: ( '||' )
-            // InternalTableDSL.g:114:10: '||'
+            // InternalTableDSL.g:114:8: ( '!=' )
+            // InternalTableDSL.g:114:10: '!='
             {
-            match("||"); 
+            match("!="); 
 
 
             }
@@ -2380,10 +2391,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__119;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:115:8: ( '&&' )
-            // InternalTableDSL.g:115:10: '&&'
+            // InternalTableDSL.g:115:8: ( '===' )
+            // InternalTableDSL.g:115:10: '==='
             {
-            match("&&"); 
+            match("==="); 
 
 
             }
@@ -2401,10 +2412,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__120;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:116:8: ( '==' )
-            // InternalTableDSL.g:116:10: '=='
+            // InternalTableDSL.g:116:8: ( '!==' )
+            // InternalTableDSL.g:116:10: '!=='
             {
-            match("=="); 
+            match("!=="); 
 
 
             }
@@ -2422,10 +2433,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__121;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:117:8: ( '!=' )
-            // InternalTableDSL.g:117:10: '!='
+            // InternalTableDSL.g:117:8: ( 'instanceof' )
+            // InternalTableDSL.g:117:10: 'instanceof'
             {
-            match("!="); 
+            match("instanceof"); 
 
 
             }
@@ -2443,10 +2454,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__122;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:118:8: ( '===' )
-            // InternalTableDSL.g:118:10: '==='
+            // InternalTableDSL.g:118:8: ( '->' )
+            // InternalTableDSL.g:118:10: '->'
             {
-            match("==="); 
+            match("->"); 
 
 
             }
@@ -2464,10 +2475,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__123;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:119:8: ( '!==' )
-            // InternalTableDSL.g:119:10: '!=='
+            // InternalTableDSL.g:119:8: ( '..<' )
+            // InternalTableDSL.g:119:10: '..<'
             {
-            match("!=="); 
+            match("..<"); 
 
 
             }
@@ -2485,10 +2496,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__124;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:120:8: ( 'instanceof' )
-            // InternalTableDSL.g:120:10: 'instanceof'
+            // InternalTableDSL.g:120:8: ( '..' )
+            // InternalTableDSL.g:120:10: '..'
             {
-            match("instanceof"); 
+            match(".."); 
 
 
             }
@@ -2506,10 +2517,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__125;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:121:8: ( '->' )
-            // InternalTableDSL.g:121:10: '->'
+            // InternalTableDSL.g:121:8: ( '=>' )
+            // InternalTableDSL.g:121:10: '=>'
             {
-            match("->"); 
+            match("=>"); 
 
 
             }
@@ -2527,10 +2538,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__126;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:122:8: ( '..<' )
-            // InternalTableDSL.g:122:10: '..<'
+            // InternalTableDSL.g:122:8: ( '<>' )
+            // InternalTableDSL.g:122:10: '<>'
             {
-            match("..<"); 
+            match("<>"); 
 
 
             }
@@ -2548,10 +2559,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__127;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:123:8: ( '..' )
-            // InternalTableDSL.g:123:10: '..'
+            // InternalTableDSL.g:123:8: ( '?:' )
+            // InternalTableDSL.g:123:10: '?:'
             {
-            match(".."); 
+            match("?:"); 
 
 
             }
@@ -2569,10 +2580,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__128;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:124:8: ( '=>' )
-            // InternalTableDSL.g:124:10: '=>'
+            // InternalTableDSL.g:124:8: ( '**' )
+            // InternalTableDSL.g:124:10: '**'
             {
-            match("=>"); 
+            match("**"); 
 
 
             }
@@ -2590,11 +2601,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__129;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:125:8: ( '<>' )
-            // InternalTableDSL.g:125:10: '<>'
+            // InternalTableDSL.g:125:8: ( '/' )
+            // InternalTableDSL.g:125:10: '/'
             {
-            match("<>"); 
-
+            match('/'); 
 
             }
 
@@ -2611,11 +2621,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__130;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:126:8: ( '?:' )
-            // InternalTableDSL.g:126:10: '?:'
+            // InternalTableDSL.g:126:8: ( '%' )
+            // InternalTableDSL.g:126:10: '%'
             {
-            match("?:"); 
-
+            match('%'); 
 
             }
 
@@ -2632,11 +2641,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__131;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:127:8: ( '**' )
-            // InternalTableDSL.g:127:10: '**'
+            // InternalTableDSL.g:127:8: ( '!' )
+            // InternalTableDSL.g:127:10: '!'
             {
-            match("**"); 
-
+            match('!'); 
 
             }
 
@@ -2653,10 +2661,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__132;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:128:8: ( '/' )
-            // InternalTableDSL.g:128:10: '/'
+            // InternalTableDSL.g:128:8: ( '++' )
+            // InternalTableDSL.g:128:10: '++'
             {
-            match('/'); 
+            match("++"); 
+
 
             }
 
@@ -2673,10 +2682,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__133;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:129:8: ( '%' )
-            // InternalTableDSL.g:129:10: '%'
+            // InternalTableDSL.g:129:8: ( '--' )
+            // InternalTableDSL.g:129:10: '--'
             {
-            match('%'); 
+            match("--"); 
+
 
             }
 
@@ -2693,10 +2703,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__134;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:130:8: ( '!' )
-            // InternalTableDSL.g:130:10: '!'
+            // InternalTableDSL.g:130:8: ( '::' )
+            // InternalTableDSL.g:130:10: '::'
             {
-            match('!'); 
+            match("::"); 
+
 
             }
 
@@ -2713,10 +2724,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__135;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:131:8: ( '++' )
-            // InternalTableDSL.g:131:10: '++'
+            // InternalTableDSL.g:131:8: ( '?.' )
+            // InternalTableDSL.g:131:10: '?.'
             {
-            match("++"); 
+            match("?."); 
 
 
             }
@@ -2734,11 +2745,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__136;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:132:8: ( '--' )
-            // InternalTableDSL.g:132:10: '--'
+            // InternalTableDSL.g:132:8: ( '|' )
+            // InternalTableDSL.g:132:10: '|'
             {
-            match("--"); 
-
+            match('|'); 
 
             }
 
@@ -2755,10 +2765,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__137;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:133:8: ( '::' )
-            // InternalTableDSL.g:133:10: '::'
+            // InternalTableDSL.g:133:8: ( 'if' )
+            // InternalTableDSL.g:133:10: 'if'
             {
-            match("::"); 
+            match("if"); 
 
 
             }
@@ -2776,10 +2786,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__138;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:134:8: ( '?.' )
-            // InternalTableDSL.g:134:10: '?.'
+            // InternalTableDSL.g:134:8: ( 'else' )
+            // InternalTableDSL.g:134:10: 'else'
             {
-            match("?."); 
+            match("else"); 
 
 
             }
@@ -2797,10 +2807,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__139;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:135:8: ( '|' )
-            // InternalTableDSL.g:135:10: '|'
+            // InternalTableDSL.g:135:8: ( 'switch' )
+            // InternalTableDSL.g:135:10: 'switch'
             {
-            match('|'); 
+            match("switch"); 
+
 
             }
 
@@ -2817,11 +2828,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__140;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:136:8: ( 'if' )
-            // InternalTableDSL.g:136:10: 'if'
+            // InternalTableDSL.g:136:8: ( ':' )
+            // InternalTableDSL.g:136:10: ':'
             {
-            match("if"); 
-
+            match(':'); 
 
             }
 
@@ -2838,10 +2848,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__141;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:137:8: ( 'else' )
-            // InternalTableDSL.g:137:10: 'else'
+            // InternalTableDSL.g:137:8: ( 'default' )
+            // InternalTableDSL.g:137:10: 'default'
             {
-            match("else"); 
+            match("default"); 
 
 
             }
@@ -2859,10 +2869,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__142;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:138:8: ( 'switch' )
-            // InternalTableDSL.g:138:10: 'switch'
+            // InternalTableDSL.g:138:8: ( 'case' )
+            // InternalTableDSL.g:138:10: 'case'
             {
-            match("switch"); 
+            match("case"); 
 
 
             }
@@ -2880,10 +2890,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__143;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:139:8: ( ':' )
-            // InternalTableDSL.g:139:10: ':'
+            // InternalTableDSL.g:139:8: ( 'for' )
+            // InternalTableDSL.g:139:10: 'for'
             {
-            match(':'); 
+            match("for"); 
+
 
             }
 
@@ -2900,10 +2911,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__144;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:140:8: ( 'default' )
-            // InternalTableDSL.g:140:10: 'default'
+            // InternalTableDSL.g:140:8: ( 'while' )
+            // InternalTableDSL.g:140:10: 'while'
             {
-            match("default"); 
+            match("while"); 
 
 
             }
@@ -2921,10 +2932,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__145;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:141:8: ( 'case' )
-            // InternalTableDSL.g:141:10: 'case'
+            // InternalTableDSL.g:141:8: ( 'do' )
+            // InternalTableDSL.g:141:10: 'do'
             {
-            match("case"); 
+            match("do"); 
 
 
             }
@@ -2942,10 +2953,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__146;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:142:8: ( 'for' )
-            // InternalTableDSL.g:142:10: 'for'
+            // InternalTableDSL.g:142:8: ( 'var' )
+            // InternalTableDSL.g:142:10: 'var'
             {
-            match("for"); 
+            match("var"); 
 
 
             }
@@ -2963,10 +2974,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__147;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:143:8: ( 'while' )
-            // InternalTableDSL.g:143:10: 'while'
+            // InternalTableDSL.g:143:8: ( 'val' )
+            // InternalTableDSL.g:143:10: 'val'
             {
-            match("while"); 
+            match("val"); 
 
 
             }
@@ -2984,10 +2995,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__148;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:144:8: ( 'do' )
-            // InternalTableDSL.g:144:10: 'do'
+            // InternalTableDSL.g:144:8: ( 'extends' )
+            // InternalTableDSL.g:144:10: 'extends'
             {
-            match("do"); 
+            match("extends"); 
 
 
             }
@@ -3005,10 +3016,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__149;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:145:8: ( 'var' )
-            // InternalTableDSL.g:145:10: 'var'
+            // InternalTableDSL.g:145:8: ( 'super' )
+            // InternalTableDSL.g:145:10: 'super'
             {
-            match("var"); 
+            match("super"); 
 
 
             }
@@ -3026,10 +3037,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__150;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:146:8: ( 'val' )
-            // InternalTableDSL.g:146:10: 'val'
+            // InternalTableDSL.g:146:8: ( 'new' )
+            // InternalTableDSL.g:146:10: 'new'
             {
-            match("val"); 
+            match("new"); 
 
 
             }
@@ -3047,10 +3058,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__151;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:147:8: ( 'extends' )
-            // InternalTableDSL.g:147:10: 'extends'
+            // InternalTableDSL.g:147:8: ( 'false' )
+            // InternalTableDSL.g:147:10: 'false'
             {
-            match("extends"); 
+            match("false"); 
 
 
             }
@@ -3068,10 +3079,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__152;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:148:8: ( 'super' )
-            // InternalTableDSL.g:148:10: 'super'
+            // InternalTableDSL.g:148:8: ( 'true' )
+            // InternalTableDSL.g:148:10: 'true'
             {
-            match("super"); 
+            match("true"); 
 
 
             }
@@ -3089,10 +3100,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__153;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:149:8: ( 'new' )
-            // InternalTableDSL.g:149:10: 'new'
+            // InternalTableDSL.g:149:8: ( 'null' )
+            // InternalTableDSL.g:149:10: 'null'
             {
-            match("new"); 
+            match("null"); 
 
 
             }
@@ -3110,10 +3121,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__154;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:150:8: ( 'false' )
-            // InternalTableDSL.g:150:10: 'false'
+            // InternalTableDSL.g:150:8: ( 'typeof' )
+            // InternalTableDSL.g:150:10: 'typeof'
             {
-            match("false"); 
+            match("typeof"); 
 
 
             }
@@ -3131,10 +3142,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__155;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:151:8: ( 'true' )
-            // InternalTableDSL.g:151:10: 'true'
+            // InternalTableDSL.g:151:8: ( 'throw' )
+            // InternalTableDSL.g:151:10: 'throw'
             {
-            match("true"); 
+            match("throw"); 
 
 
             }
@@ -3152,10 +3163,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__156;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:152:8: ( 'null' )
-            // InternalTableDSL.g:152:10: 'null'
+            // InternalTableDSL.g:152:8: ( 'return' )
+            // InternalTableDSL.g:152:10: 'return'
             {
-            match("null"); 
+            match("return"); 
 
 
             }
@@ -3173,10 +3184,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__157;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:153:8: ( 'typeof' )
-            // InternalTableDSL.g:153:10: 'typeof'
+            // InternalTableDSL.g:153:8: ( 'try' )
+            // InternalTableDSL.g:153:10: 'try'
             {
-            match("typeof"); 
+            match("try"); 
 
 
             }
@@ -3194,10 +3205,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__158;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:154:8: ( 'throw' )
-            // InternalTableDSL.g:154:10: 'throw'
+            // InternalTableDSL.g:154:8: ( 'finally' )
+            // InternalTableDSL.g:154:10: 'finally'
             {
-            match("throw"); 
+            match("finally"); 
 
 
             }
@@ -3215,10 +3226,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__159;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:155:8: ( 'return' )
-            // InternalTableDSL.g:155:10: 'return'
+            // InternalTableDSL.g:155:8: ( 'synchronized' )
+            // InternalTableDSL.g:155:10: 'synchronized'
             {
-            match("return"); 
+            match("synchronized"); 
 
 
             }
@@ -3236,10 +3247,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__160;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:156:8: ( 'try' )
-            // InternalTableDSL.g:156:10: 'try'
+            // InternalTableDSL.g:156:8: ( 'catch' )
+            // InternalTableDSL.g:156:10: 'catch'
             {
-            match("try"); 
+            match("catch"); 
 
 
             }
@@ -3257,11 +3268,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__161;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:157:8: ( 'finally' )
-            // InternalTableDSL.g:157:10: 'finally'
+            // InternalTableDSL.g:157:8: ( '?' )
+            // InternalTableDSL.g:157:10: '?'
             {
-            match("finally"); 
-
+            match('?'); 
 
             }
 
@@ -3278,11 +3288,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__162;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:158:8: ( 'synchronized' )
-            // InternalTableDSL.g:158:10: 'synchronized'
+            // InternalTableDSL.g:158:8: ( '&' )
+            // InternalTableDSL.g:158:10: '&'
             {
-            match("synchronized"); 
-
+            match('&'); 
 
             }
 
@@ -3299,10 +3308,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__163;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:159:8: ( 'catch' )
-            // InternalTableDSL.g:159:10: 'catch'
+            // InternalTableDSL.g:159:8: ( 'equal' )
+            // InternalTableDSL.g:159:10: 'equal'
             {
-            match("catch"); 
+            match("equal"); 
 
 
             }
@@ -3320,10 +3329,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__164;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:160:8: ( '?' )
-            // InternalTableDSL.g:160:10: '?'
+            // InternalTableDSL.g:160:8: ( 'greater equal' )
+            // InternalTableDSL.g:160:10: 'greater equal'
             {
-            match('?'); 
+            match("greater equal"); 
+
 
             }
 
@@ -3340,10 +3350,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__165;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:161:8: ( '&' )
-            // InternalTableDSL.g:161:10: '&'
+            // InternalTableDSL.g:161:8: ( 'greater than' )
+            // InternalTableDSL.g:161:10: 'greater than'
             {
-            match('&'); 
+            match("greater than"); 
+
 
             }
 
@@ -3360,10 +3371,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__166;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:162:8: ( 'equal' )
-            // InternalTableDSL.g:162:10: 'equal'
+            // InternalTableDSL.g:162:8: ( 'lower equal' )
+            // InternalTableDSL.g:162:10: 'lower equal'
             {
-            match("equal"); 
+            match("lower equal"); 
 
 
             }
@@ -3381,10 +3392,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__167;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:163:8: ( 'greater equal' )
-            // InternalTableDSL.g:163:10: 'greater equal'
+            // InternalTableDSL.g:163:8: ( 'lower than' )
+            // InternalTableDSL.g:163:10: 'lower than'
             {
-            match("greater equal"); 
+            match("lower than"); 
 
 
             }
@@ -3402,10 +3413,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__168;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:164:8: ( 'greater than' )
-            // InternalTableDSL.g:164:10: 'greater than'
+            // InternalTableDSL.g:164:8: ( 'not equal' )
+            // InternalTableDSL.g:164:10: 'not equal'
             {
-            match("greater than"); 
+            match("not equal"); 
 
 
             }
@@ -3423,10 +3434,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__169;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:165:8: ( 'lower equal' )
-            // InternalTableDSL.g:165:10: 'lower equal'
+            // InternalTableDSL.g:165:8: ( 'rising' )
+            // InternalTableDSL.g:165:10: 'rising'
             {
-            match("lower equal"); 
+            match("rising"); 
 
 
             }
@@ -3444,10 +3455,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__170;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:166:8: ( 'lower than' )
-            // InternalTableDSL.g:166:10: 'lower than'
+            // InternalTableDSL.g:166:8: ( 'bad-rising' )
+            // InternalTableDSL.g:166:10: 'bad-rising'
             {
-            match("lower than"); 
+            match("bad-rising"); 
 
 
             }
@@ -3465,10 +3476,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__171;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:167:8: ( 'not equal' )
-            // InternalTableDSL.g:167:10: 'not equal'
+            // InternalTableDSL.g:167:8: ( 'sloping' )
+            // InternalTableDSL.g:167:10: 'sloping'
             {
-            match("not equal"); 
+            match("sloping"); 
 
 
             }
@@ -3486,10 +3497,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__172;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:168:8: ( 'rising' )
-            // InternalTableDSL.g:168:10: 'rising'
+            // InternalTableDSL.g:168:8: ( 'good-sloping' )
+            // InternalTableDSL.g:168:10: 'good-sloping'
             {
-            match("rising"); 
+            match("good-sloping"); 
 
 
             }
@@ -3507,10 +3518,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__173;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:169:8: ( 'bad-rising' )
-            // InternalTableDSL.g:169:10: 'bad-rising'
+            // InternalTableDSL.g:169:8: ( 'stagnating' )
+            // InternalTableDSL.g:169:10: 'stagnating'
             {
-            match("bad-rising"); 
+            match("stagnating"); 
 
 
             }
@@ -3528,10 +3539,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__174;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:170:8: ( 'sloping' )
-            // InternalTableDSL.g:170:10: 'sloping'
+            // InternalTableDSL.g:170:8: ( 'hidden' )
+            // InternalTableDSL.g:170:10: 'hidden'
             {
-            match("sloping"); 
+            match("hidden"); 
 
 
             }
@@ -3549,10 +3560,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__175;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:171:8: ( 'good-sloping' )
-            // InternalTableDSL.g:171:10: 'good-sloping'
+            // InternalTableDSL.g:171:8: ( 'explicit' )
+            // InternalTableDSL.g:171:10: 'explicit'
             {
-            match("good-sloping"); 
+            match("explicit"); 
 
 
             }
@@ -3570,10 +3581,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__176;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:172:8: ( 'stagnating' )
-            // InternalTableDSL.g:172:10: 'stagnating'
+            // InternalTableDSL.g:172:8: ( 'indexed' )
+            // InternalTableDSL.g:172:10: 'indexed'
             {
-            match("stagnating"); 
+            match("indexed"); 
 
 
             }
@@ -3591,10 +3602,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__177;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:173:8: ( 'hidden' )
-            // InternalTableDSL.g:173:10: 'hidden'
+            // InternalTableDSL.g:173:8: ( 'columns' )
+            // InternalTableDSL.g:173:10: 'columns'
             {
-            match("hidden"); 
+            match("columns"); 
 
 
             }
@@ -3612,10 +3623,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__178;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:174:8: ( 'explicit' )
-            // InternalTableDSL.g:174:10: 'explicit'
+            // InternalTableDSL.g:174:8: ( 'rows' )
+            // InternalTableDSL.g:174:10: 'rows'
             {
-            match("explicit"); 
+            match("rows"); 
 
 
             }
@@ -3633,10 +3644,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__179;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:175:8: ( 'indexed' )
-            // InternalTableDSL.g:175:10: 'indexed'
+            // InternalTableDSL.g:175:8: ( 'pages' )
+            // InternalTableDSL.g:175:10: 'pages'
             {
-            match("indexed"); 
+            match("pages"); 
 
 
             }
@@ -3654,10 +3665,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__180;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:176:8: ( 'columns' )
-            // InternalTableDSL.g:176:10: 'columns'
+            // InternalTableDSL.g:176:8: ( 'sections' )
+            // InternalTableDSL.g:176:10: 'sections'
             {
-            match("columns"); 
+            match("sections"); 
 
 
             }
@@ -3675,71 +3686,8 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = T__181;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:177:8: ( 'rows' )
-            // InternalTableDSL.g:177:10: 'rows'
-            {
-            match("rows"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__181"
-
-    // $ANTLR start "T__182"
-    public final void mT__182() throws RecognitionException {
-        try {
-            int _type = T__182;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:178:8: ( 'pages' )
-            // InternalTableDSL.g:178:10: 'pages'
-            {
-            match("pages"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__182"
-
-    // $ANTLR start "T__183"
-    public final void mT__183() throws RecognitionException {
-        try {
-            int _type = T__183;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:179:8: ( 'sections' )
-            // InternalTableDSL.g:179:10: 'sections'
-            {
-            match("sections"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__183"
-
-    // $ANTLR start "T__184"
-    public final void mT__184() throws RecognitionException {
-        try {
-            int _type = T__184;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:180:8: ( 'chapters' )
-            // InternalTableDSL.g:180:10: 'chapters'
+            // InternalTableDSL.g:177:8: ( 'chapters' )
+            // InternalTableDSL.g:177:10: 'chapters'
             {
             match("chapters"); 
 
@@ -3752,19 +3700,19 @@ public class InternalTableDSLLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "T__184"
+    // $ANTLR end "T__181"
 
     // $ANTLR start "RULE_THEME_RESOURCE"
     public final void mRULE_THEME_RESOURCE() throws RecognitionException {
         try {
             int _type = RULE_THEME_RESOURCE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:11940:21: ( 'theme:/' ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '.' | '/' | '0' .. '9' )* )
-            // InternalTableDSL.g:11940:23: 'theme:/' ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '.' | '/' | '0' .. '9' )*
+            // InternalTableDSL.g:11410:21: ( 'theme:/' ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '.' | '/' | '0' .. '9' )* )
+            // InternalTableDSL.g:11410:23: 'theme:/' ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '.' | '/' | '0' .. '9' )*
             {
             match("theme:/"); 
 
-            // InternalTableDSL.g:11940:33: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '.' | '/' | '0' .. '9' )*
+            // InternalTableDSL.g:11410:33: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '.' | '/' | '0' .. '9' )*
             loop1:
             do {
                 int alt1=2;
@@ -3813,12 +3761,12 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_EVENT_TOPIC;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:11942:18: ( '\\'' RULE_ID ( '/' RULE_ID )* ( '/*' )? '\\'' )
-            // InternalTableDSL.g:11942:20: '\\'' RULE_ID ( '/' RULE_ID )* ( '/*' )? '\\''
+            // InternalTableDSL.g:11412:18: ( '\\'' RULE_ID ( '/' RULE_ID )* ( '/*' )? '\\'' )
+            // InternalTableDSL.g:11412:20: '\\'' RULE_ID ( '/' RULE_ID )* ( '/*' )? '\\''
             {
             match('\''); 
             mRULE_ID(); 
-            // InternalTableDSL.g:11942:33: ( '/' RULE_ID )*
+            // InternalTableDSL.g:11412:33: ( '/' RULE_ID )*
             loop2:
             do {
                 int alt2=2;
@@ -3837,7 +3785,7 @@ public class InternalTableDSLLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // InternalTableDSL.g:11942:34: '/' RULE_ID
+            	    // InternalTableDSL.g:11412:34: '/' RULE_ID
             	    {
             	    match('/'); 
             	    mRULE_ID(); 
@@ -3850,7 +3798,7 @@ public class InternalTableDSLLexer extends Lexer {
                 }
             } while (true);
 
-            // InternalTableDSL.g:11942:48: ( '/*' )?
+            // InternalTableDSL.g:11412:48: ( '/*' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -3859,7 +3807,7 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // InternalTableDSL.g:11942:48: '/*'
+                    // InternalTableDSL.g:11412:48: '/*'
                     {
                     match("/*"); 
 
@@ -3886,10 +3834,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:11944:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
-            // InternalTableDSL.g:11944:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalTableDSL.g:11414:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
+            // InternalTableDSL.g:11414:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             {
-            // InternalTableDSL.g:11944:12: ( '0x' | '0X' )
+            // InternalTableDSL.g:11414:12: ( '0x' | '0X' )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -3917,7 +3865,7 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt4) {
                 case 1 :
-                    // InternalTableDSL.g:11944:13: '0x'
+                    // InternalTableDSL.g:11414:13: '0x'
                     {
                     match("0x"); 
 
@@ -3925,7 +3873,7 @@ public class InternalTableDSLLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:11944:18: '0X'
+                    // InternalTableDSL.g:11414:18: '0X'
                     {
                     match("0X"); 
 
@@ -3935,7 +3883,7 @@ public class InternalTableDSLLexer extends Lexer {
 
             }
 
-            // InternalTableDSL.g:11944:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
+            // InternalTableDSL.g:11414:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
             int cnt5=0;
             loop5:
             do {
@@ -3973,7 +3921,7 @@ public class InternalTableDSLLexer extends Lexer {
                 cnt5++;
             } while (true);
 
-            // InternalTableDSL.g:11944:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalTableDSL.g:11414:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -3982,10 +3930,10 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt7) {
                 case 1 :
-                    // InternalTableDSL.g:11944:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalTableDSL.g:11414:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     {
                     match('#'); 
-                    // InternalTableDSL.g:11944:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalTableDSL.g:11414:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -4003,7 +3951,7 @@ public class InternalTableDSLLexer extends Lexer {
                     }
                     switch (alt6) {
                         case 1 :
-                            // InternalTableDSL.g:11944:64: ( 'b' | 'B' ) ( 'i' | 'I' )
+                            // InternalTableDSL.g:11414:64: ( 'b' | 'B' ) ( 'i' | 'I' )
                             {
                             if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                                 input.consume();
@@ -4027,7 +3975,7 @@ public class InternalTableDSLLexer extends Lexer {
                             }
                             break;
                         case 2 :
-                            // InternalTableDSL.g:11944:84: ( 'l' | 'L' )
+                            // InternalTableDSL.g:11414:84: ( 'l' | 'L' )
                             {
                             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                                 input.consume();
@@ -4066,11 +4014,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:11946:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
-            // InternalTableDSL.g:11946:12: '0' .. '9' ( '0' .. '9' | '_' )*
+            // InternalTableDSL.g:11416:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
+            // InternalTableDSL.g:11416:12: '0' .. '9' ( '0' .. '9' | '_' )*
             {
             matchRange('0','9'); 
-            // InternalTableDSL.g:11946:21: ( '0' .. '9' | '_' )*
+            // InternalTableDSL.g:11416:21: ( '0' .. '9' | '_' )*
             loop8:
             do {
                 int alt8=2;
@@ -4119,11 +4067,11 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_DECIMAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:11948:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
-            // InternalTableDSL.g:11948:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalTableDSL.g:11418:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
+            // InternalTableDSL.g:11418:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             {
             mRULE_INT(); 
-            // InternalTableDSL.g:11948:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
+            // InternalTableDSL.g:11418:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -4132,7 +4080,7 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt10) {
                 case 1 :
-                    // InternalTableDSL.g:11948:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
+                    // InternalTableDSL.g:11418:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
                     {
                     if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                         input.consume();
@@ -4143,7 +4091,7 @@ public class InternalTableDSLLexer extends Lexer {
                         recover(mse);
                         throw mse;}
 
-                    // InternalTableDSL.g:11948:36: ( '+' | '-' )?
+                    // InternalTableDSL.g:11418:36: ( '+' | '-' )?
                     int alt9=2;
                     int LA9_0 = input.LA(1);
 
@@ -4176,7 +4124,7 @@ public class InternalTableDSLLexer extends Lexer {
 
             }
 
-            // InternalTableDSL.g:11948:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalTableDSL.g:11418:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             int alt11=3;
             int LA11_0 = input.LA(1);
 
@@ -4188,7 +4136,7 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt11) {
                 case 1 :
-                    // InternalTableDSL.g:11948:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
+                    // InternalTableDSL.g:11418:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
                     {
                     if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                         input.consume();
@@ -4212,7 +4160,7 @@ public class InternalTableDSLLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:11948:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
+                    // InternalTableDSL.g:11418:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
                     {
                     if ( input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='L'||input.LA(1)=='d'||input.LA(1)=='f'||input.LA(1)=='l' ) {
                         input.consume();
@@ -4245,10 +4193,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:11950:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
-            // InternalTableDSL.g:11950:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalTableDSL.g:11420:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
+            // InternalTableDSL.g:11420:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             {
-            // InternalTableDSL.g:11950:11: ( '^' )?
+            // InternalTableDSL.g:11420:11: ( '^' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -4257,7 +4205,7 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // InternalTableDSL.g:11950:11: '^'
+                    // InternalTableDSL.g:11420:11: '^'
                     {
                     match('^'); 
 
@@ -4275,7 +4223,7 @@ public class InternalTableDSLLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // InternalTableDSL.g:11950:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalTableDSL.g:11420:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             loop13:
             do {
                 int alt13=2;
@@ -4324,10 +4272,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:11952:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
-            // InternalTableDSL.g:11952:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalTableDSL.g:11422:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
+            // InternalTableDSL.g:11422:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             {
-            // InternalTableDSL.g:11952:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalTableDSL.g:11422:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -4345,10 +4293,10 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt18) {
                 case 1 :
-                    // InternalTableDSL.g:11952:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
+                    // InternalTableDSL.g:11422:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
                     {
                     match('\"'); 
-                    // InternalTableDSL.g:11952:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalTableDSL.g:11422:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop14:
                     do {
                         int alt14=3;
@@ -4364,7 +4312,7 @@ public class InternalTableDSLLexer extends Lexer {
 
                         switch (alt14) {
                     	case 1 :
-                    	    // InternalTableDSL.g:11952:21: '\\\\' .
+                    	    // InternalTableDSL.g:11422:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -4372,7 +4320,7 @@ public class InternalTableDSLLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // InternalTableDSL.g:11952:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalTableDSL.g:11422:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -4392,7 +4340,7 @@ public class InternalTableDSLLexer extends Lexer {
                         }
                     } while (true);
 
-                    // InternalTableDSL.g:11952:44: ( '\"' )?
+                    // InternalTableDSL.g:11422:44: ( '\"' )?
                     int alt15=2;
                     int LA15_0 = input.LA(1);
 
@@ -4401,7 +4349,7 @@ public class InternalTableDSLLexer extends Lexer {
                     }
                     switch (alt15) {
                         case 1 :
-                            // InternalTableDSL.g:11952:44: '\"'
+                            // InternalTableDSL.g:11422:44: '\"'
                             {
                             match('\"'); 
 
@@ -4414,10 +4362,10 @@ public class InternalTableDSLLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:11952:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
+                    // InternalTableDSL.g:11422:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
                     {
                     match('\''); 
-                    // InternalTableDSL.g:11952:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalTableDSL.g:11422:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop16:
                     do {
                         int alt16=3;
@@ -4433,7 +4381,7 @@ public class InternalTableDSLLexer extends Lexer {
 
                         switch (alt16) {
                     	case 1 :
-                    	    // InternalTableDSL.g:11952:55: '\\\\' .
+                    	    // InternalTableDSL.g:11422:55: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -4441,7 +4389,7 @@ public class InternalTableDSLLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // InternalTableDSL.g:11952:62: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalTableDSL.g:11422:62: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -4461,7 +4409,7 @@ public class InternalTableDSLLexer extends Lexer {
                         }
                     } while (true);
 
-                    // InternalTableDSL.g:11952:79: ( '\\'' )?
+                    // InternalTableDSL.g:11422:79: ( '\\'' )?
                     int alt17=2;
                     int LA17_0 = input.LA(1);
 
@@ -4470,7 +4418,7 @@ public class InternalTableDSLLexer extends Lexer {
                     }
                     switch (alt17) {
                         case 1 :
-                            // InternalTableDSL.g:11952:79: '\\''
+                            // InternalTableDSL.g:11422:79: '\\''
                             {
                             match('\''); 
 
@@ -4501,12 +4449,12 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:11954:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalTableDSL.g:11954:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalTableDSL.g:11424:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalTableDSL.g:11424:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalTableDSL.g:11954:24: ( options {greedy=false; } : . )*
+            // InternalTableDSL.g:11424:24: ( options {greedy=false; } : . )*
             loop19:
             do {
                 int alt19=2;
@@ -4531,7 +4479,7 @@ public class InternalTableDSLLexer extends Lexer {
 
                 switch (alt19) {
             	case 1 :
-            	    // InternalTableDSL.g:11954:52: .
+            	    // InternalTableDSL.g:11424:52: .
             	    {
             	    matchAny(); 
 
@@ -4561,12 +4509,12 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:11956:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalTableDSL.g:11956:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalTableDSL.g:11426:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalTableDSL.g:11426:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // InternalTableDSL.g:11956:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalTableDSL.g:11426:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop20:
             do {
                 int alt20=2;
@@ -4579,7 +4527,7 @@ public class InternalTableDSLLexer extends Lexer {
 
                 switch (alt20) {
             	case 1 :
-            	    // InternalTableDSL.g:11956:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalTableDSL.g:11426:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -4599,7 +4547,7 @@ public class InternalTableDSLLexer extends Lexer {
                 }
             } while (true);
 
-            // InternalTableDSL.g:11956:40: ( ( '\\r' )? '\\n' )?
+            // InternalTableDSL.g:11426:40: ( ( '\\r' )? '\\n' )?
             int alt22=2;
             int LA22_0 = input.LA(1);
 
@@ -4608,9 +4556,9 @@ public class InternalTableDSLLexer extends Lexer {
             }
             switch (alt22) {
                 case 1 :
-                    // InternalTableDSL.g:11956:41: ( '\\r' )? '\\n'
+                    // InternalTableDSL.g:11426:41: ( '\\r' )? '\\n'
                     {
-                    // InternalTableDSL.g:11956:41: ( '\\r' )?
+                    // InternalTableDSL.g:11426:41: ( '\\r' )?
                     int alt21=2;
                     int LA21_0 = input.LA(1);
 
@@ -4619,7 +4567,7 @@ public class InternalTableDSLLexer extends Lexer {
                     }
                     switch (alt21) {
                         case 1 :
-                            // InternalTableDSL.g:11956:41: '\\r'
+                            // InternalTableDSL.g:11426:41: '\\r'
                             {
                             match('\r'); 
 
@@ -4651,10 +4599,10 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:11958:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalTableDSL.g:11958:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalTableDSL.g:11428:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalTableDSL.g:11428:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalTableDSL.g:11958:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalTableDSL.g:11428:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt23=0;
             loop23:
             do {
@@ -4708,8 +4656,8 @@ public class InternalTableDSLLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalTableDSL.g:11960:16: ( . )
-            // InternalTableDSL.g:11960:18: .
+            // InternalTableDSL.g:11430:16: ( . )
+            // InternalTableDSL.g:11430:18: .
             {
             matchAny(); 
 
@@ -4724,8 +4672,8 @@ public class InternalTableDSLLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // InternalTableDSL.g:1:8: ( T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | T__135 | T__136 | T__137 | T__138 | T__139 | T__140 | T__141 | T__142 | T__143 | T__144 | T__145 | T__146 | T__147 | T__148 | T__149 | T__150 | T__151 | T__152 | T__153 | T__154 | T__155 | T__156 | T__157 | T__158 | T__159 | T__160 | T__161 | T__162 | T__163 | T__164 | T__165 | T__166 | T__167 | T__168 | T__169 | T__170 | T__171 | T__172 | T__173 | T__174 | T__175 | T__176 | T__177 | T__178 | T__179 | T__180 | T__181 | T__182 | T__183 | T__184 | RULE_THEME_RESOURCE | RULE_EVENT_TOPIC | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt24=181;
+        // InternalTableDSL.g:1:8: ( T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | T__135 | T__136 | T__137 | T__138 | T__139 | T__140 | T__141 | T__142 | T__143 | T__144 | T__145 | T__146 | T__147 | T__148 | T__149 | T__150 | T__151 | T__152 | T__153 | T__154 | T__155 | T__156 | T__157 | T__158 | T__159 | T__160 | T__161 | T__162 | T__163 | T__164 | T__165 | T__166 | T__167 | T__168 | T__169 | T__170 | T__171 | T__172 | T__173 | T__174 | T__175 | T__176 | T__177 | T__178 | T__179 | T__180 | T__181 | RULE_THEME_RESOURCE | RULE_EVENT_TOPIC | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt24=178;
         alt24 = dfa24.predict(input);
         switch (alt24) {
             case 1 :
@@ -5898,98 +5846,77 @@ public class InternalTableDSLLexer extends Lexer {
                 }
                 break;
             case 168 :
-                // InternalTableDSL.g:1:1094: T__182
-                {
-                mT__182(); 
-
-                }
-                break;
-            case 169 :
-                // InternalTableDSL.g:1:1101: T__183
-                {
-                mT__183(); 
-
-                }
-                break;
-            case 170 :
-                // InternalTableDSL.g:1:1108: T__184
-                {
-                mT__184(); 
-
-                }
-                break;
-            case 171 :
-                // InternalTableDSL.g:1:1115: RULE_THEME_RESOURCE
+                // InternalTableDSL.g:1:1094: RULE_THEME_RESOURCE
                 {
                 mRULE_THEME_RESOURCE(); 
 
                 }
                 break;
-            case 172 :
-                // InternalTableDSL.g:1:1135: RULE_EVENT_TOPIC
+            case 169 :
+                // InternalTableDSL.g:1:1114: RULE_EVENT_TOPIC
                 {
                 mRULE_EVENT_TOPIC(); 
 
                 }
                 break;
-            case 173 :
-                // InternalTableDSL.g:1:1152: RULE_HEX
+            case 170 :
+                // InternalTableDSL.g:1:1131: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
-            case 174 :
-                // InternalTableDSL.g:1:1161: RULE_INT
+            case 171 :
+                // InternalTableDSL.g:1:1140: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
-            case 175 :
-                // InternalTableDSL.g:1:1170: RULE_DECIMAL
+            case 172 :
+                // InternalTableDSL.g:1:1149: RULE_DECIMAL
                 {
                 mRULE_DECIMAL(); 
 
                 }
                 break;
-            case 176 :
-                // InternalTableDSL.g:1:1183: RULE_ID
+            case 173 :
+                // InternalTableDSL.g:1:1162: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
-            case 177 :
-                // InternalTableDSL.g:1:1191: RULE_STRING
+            case 174 :
+                // InternalTableDSL.g:1:1170: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
-            case 178 :
-                // InternalTableDSL.g:1:1203: RULE_ML_COMMENT
+            case 175 :
+                // InternalTableDSL.g:1:1182: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
-            case 179 :
-                // InternalTableDSL.g:1:1219: RULE_SL_COMMENT
+            case 176 :
+                // InternalTableDSL.g:1:1198: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
-            case 180 :
-                // InternalTableDSL.g:1:1235: RULE_WS
+            case 177 :
+                // InternalTableDSL.g:1:1214: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
-            case 181 :
-                // InternalTableDSL.g:1:1243: RULE_ANY_OTHER
+            case 178 :
+                // InternalTableDSL.g:1:1222: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -6003,142 +5930,141 @@ public class InternalTableDSLLexer extends Lexer {
 
     protected DFA24 dfa24 = new DFA24(this);
     static final String DFA24_eotS =
-        "\1\uffff\1\70\2\uffff\22\70\1\173\1\176\1\u0082\1\u0085\5\uffff\1\u008d\3\uffff\1\u0094\1\u0096\1\u0098\1\u009a\1\u009c\1\u009e\1\u00a0\1\u00a3\1\u00a5\1\70\1\u00a7\2\u00ac\1\64\4\uffff\3\70\3\uffff\12\70\1\u00c7\1\u00c9\47\70\1\u00fe\7\70\1\u0108\3\70\1\u010e\20\uffff\1\u0110\23\uffff\1\u0112\6\uffff\1\70\1\uffff\2\u00a7\1\uffff\1\u00ac\3\uffff\14\70\1\u0124\12\70\1\u0131\1\uffff\1\70\1\uffff\20\70\1\u0144\7\70\1\u014f\16\70\1\u015f\1\u0160\13\70\1\uffff\11\70\1\uffff\1\u0179\3\70\6\uffff\1\70\2\u00a7\1\uffff\1\70\1\u0184\3\70\1\u0189\6\70\1\u0192\1\uffff\1\u0193\13\70\1\uffff\4\70\1\u01a3\15\70\1\uffff\2\70\1\u01b3\7\70\1\uffff\6\70\1\u01c1\3\70\1\u01c6\2\70\1\uffff\1\70\2\uffff\3\70\1\u01cd\2\70\1\u01d0\16\70\1\u01e0\1\70\2\uffff\1\u01e2\4\70\3\u00a7\1\uffff\1\70\1\uffff\1\u01e9\3\70\1\uffff\1\70\1\u01ee\5\70\1\u01f4\2\uffff\1\70\1\u01f6\15\70\1\uffff\4\70\1\u0208\3\70\1\u020c\6\70\1\uffff\7\70\1\u021b\5\70\1\uffff\1\u0222\1\u0223\2\70\1\uffff\2\70\1\u0228\3\70\1\uffff\1\u022c\1\70\1\uffff\1\u022f\13\70\1\u023b\2\70\1\uffff\1\70\1\uffff\2\70\1\uffff\1\u0241\1\u00a7\1\70\1\uffff\4\70\1\uffff\1\u0247\4\70\3\uffff\1\u024c\16\70\1\u025d\1\u025e\1\uffff\1\u025f\1\70\1\u0261\1\uffff\7\70\1\u0269\1\70\1\u026b\1\u026c\2\70\1\u0270\1\uffff\6\70\2\uffff\4\70\1\uffff\1\70\1\u027d\1\70\1\uffff\2\70\1\uffff\1\u0281\6\70\1\u0288\2\70\2\uffff\1\70\1\u028f\3\70\1\uffff\1\u0293\1\u0294\3\70\1\uffff\1\u0298\1\u029a\2\70\1\uffff\1\70\1\u029e\1\u029f\1\u02a0\1\u02a1\13\70\3\uffff\1\70\1\uffff\1\70\1\u02af\1\70\1\u02b1\3\70\1\uffff\1\70\2\uffff\1\70\1\u02b7\1\70\1\uffff\4\70\1\u02bd\6\70\1\u02c4\1\uffff\3\70\1\uffff\1\70\1\u02c9\1\70\1\u02cb\2\70\1\uffff\1\70\1\u02cf\2\uffff\1\u02d0\1\70\1\uffff\3\70\2\uffff\1\u02d5\1\u02d6\1\70\1\uffff\1\70\1\uffff\3\70\4\uffff\1\70\1\u02dd\10\70\1\u02e6\2\70\1\uffff\1\u02e9\1\uffff\3\70\1\u02ed\1\70\1\uffff\1\70\1\u02f0\1\u02f1\2\70\1\uffff\1\u02f4\4\70\1\u02f9\1\uffff\1\70\1\u02fb\2\70\1\uffff\1\70\1\uffff\3\70\2\uffff\3\70\3\uffff\2\70\1\u0309\1\u030a\2\70\1\uffff\1\u030d\1\u030e\3\70\1\u0312\2\70\1\uffff\2\70\1\uffff\1\u0317\1\u0318\1\u0319\1\uffff\1\u031a\1\u031b\2\uffff\1\70\1\u031d\1\uffff\3\70\1\u0321\1\uffff\1\u0322\1\uffff\1\70\1\u0324\2\70\1\u0327\1\u0328\2\70\1\u032b\2\uffff\2\70\2\uffff\1\70\1\u032f\2\uffff\1\70\1\u0331\1\70\1\uffff\1\u0333\1\70\1\u0335\1\70\5\uffff\1\u0337\1\uffff\1\u0338\2\70\2\uffff\1\u033b\1\uffff\1\70\1\u033d\2\uffff\2\70\1\uffff\2\70\1\u0342\1\uffff\1\70\1\uffff\1\u0344\1\uffff\1\70\1\uffff\1\70\2\uffff\1\u0347\1\u0348\1\uffff\1\70\1\uffff\1\u034a\3\70\1\uffff\1\70\1\uffff\1\u034f\1\u0350\2\uffff\1\70\1\uffff\4\70\2\uffff\3\70\1\u0359\1\u035a\1\u035b\1\u035c\1\70\4\uffff\1\u035e\1\uffff";
+        "\1\uffff\1\67\2\uffff\20\67\1\164\2\67\1\175\1\u0081\1\u0084\5\uffff\1\u008c\3\uffff\1\u0093\1\u0095\1\u0097\1\u0099\1\u009b\1\u009d\1\u009f\1\u00a2\1\u00a4\1\67\1\u00a6\2\u00ab\1\64\4\uffff\2\67\3\uffff\12\67\1\u00c5\1\u00c7\43\67\1\u00f9\7\67\1\u0103\1\67\1\u0106\1\uffff\6\67\17\uffff\1\u010e\23\uffff\1\u0110\6\uffff\1\67\1\uffff\2\u00a6\1\uffff\1\u00ab\3\uffff\13\67\1\u0121\12\67\1\u012e\1\uffff\1\67\1\uffff\20\67\1\u0141\10\67\1\u014d\12\67\1\u0159\1\u015a\13\67\1\uffff\11\67\1\uffff\1\u0173\2\uffff\6\67\4\uffff\1\67\1\uffff\2\u00a6\1\67\1\u0181\2\67\1\u0185\6\67\1\u018e\1\uffff\1\u018f\13\67\1\uffff\4\67\1\u019f\15\67\1\uffff\2\67\1\u01af\10\67\1\uffff\6\67\1\u01be\4\67\2\uffff\3\67\1\u01c7\2\67\1\u01ca\16\67\1\u01da\1\67\2\uffff\3\67\1\uffff\4\67\1\uffff\3\u00a6\1\67\1\uffff\1\u01e5\2\67\1\uffff\1\67\1\u01e9\5\67\1\u01ef\2\uffff\1\67\1\u01f1\15\67\1\uffff\4\67\1\u0203\3\67\1\u0207\6\67\1\uffff\10\67\1\u0216\5\67\1\uffff\1\u021d\1\u021e\2\67\1\u0221\3\67\1\uffff\1\u0225\1\67\1\uffff\1\u0228\13\67\1\u0234\2\67\1\uffff\6\67\1\uffff\1\u023d\1\u00a6\1\67\1\uffff\3\67\1\uffff\1\u0242\4\67\3\uffff\1\u0247\16\67\1\u0257\1\u0258\1\uffff\1\u0259\1\67\1\u025b\1\uffff\7\67\1\u0263\1\67\1\u0265\1\u0266\2\67\1\u026a\1\uffff\6\67\2\uffff\2\67\1\uffff\1\67\1\u0275\1\67\1\uffff\2\67\1\uffff\1\u0279\6\67\1\u0280\2\67\2\uffff\1\67\1\u0287\6\67\1\uffff\1\u028e\3\67\1\uffff\1\u0292\1\u0294\2\67\1\uffff\1\67\1\u0298\1\u0299\1\u029a\1\u029b\12\67\3\uffff\1\67\1\uffff\1\67\1\u02a8\1\67\1\u02aa\3\67\1\uffff\1\67\2\uffff\1\67\1\u02b0\1\67\1\uffff\4\67\1\u02b6\4\67\1\u02bb\1\uffff\3\67\1\uffff\1\67\1\u02c0\1\67\1\u02c2\2\67\1\uffff\1\67\1\u02c6\2\uffff\1\u02c7\1\67\1\uffff\6\67\1\uffff\1\u02cf\1\u02d0\1\67\1\uffff\1\67\1\uffff\3\67\4\uffff\1\67\1\u02d7\7\67\1\u02df\2\67\1\uffff\1\u02e2\1\uffff\2\67\1\u02e5\1\u02e6\1\67\1\uffff\1\67\1\u02e9\1\u02ea\2\67\1\uffff\1\u02ed\2\67\1\u02f0\1\uffff\1\67\1\u02f2\2\67\1\uffff\1\67\1\uffff\3\67\2\uffff\6\67\3\uffff\2\67\1\u0303\1\u0304\2\67\1\uffff\1\u0307\1\u0308\3\67\1\u030c\1\67\1\uffff\2\67\1\uffff\1\u0310\1\u0311\2\uffff\1\u0312\1\u0313\2\uffff\1\67\1\u0315\1\uffff\2\67\1\uffff\1\u0318\1\uffff\1\67\1\u031a\2\67\1\u031d\1\u031e\3\67\1\u0322\1\67\1\u0324\2\uffff\2\67\2\uffff\1\67\1\u0328\2\uffff\1\67\1\u032a\1\67\1\uffff\1\u032c\1\u032d\1\67\4\uffff\1\u032f\1\uffff\1\u0330\1\67\1\uffff\1\u0332\1\uffff\1\67\1\u0334\2\uffff\3\67\1\uffff\1\67\1\uffff\2\67\1\u033b\1\uffff\1\67\1\uffff\1\u033d\2\uffff\1\67\2\uffff\1\u033f\1\uffff\1\67\1\uffff\1\u0341\1\67\1\u0343\3\67\1\uffff\1\67\1\uffff\1\u0348\1\uffff\1\67\1\uffff\1\67\1\uffff\4\67\1\uffff\4\67\1\u0353\1\u0354\1\u0355\1\u0356\1\u0357\1\67\5\uffff\1\u0359\1\uffff";
     static final String DFA24_eofS =
-        "\u035f\uffff";
+        "\u035a\uffff";
     static final String DFA24_minS =
-        "\1\0\1\141\2\uffff\2\141\1\147\1\145\1\141\1\145\1\141\1\144\1\160\3\141\1\143\1\151\1\145\1\162\1\145\1\157\1\56\1\53\1\55\1\52\5\uffff\1\75\3\uffff\1\52\1\75\1\76\1\75\1\174\1\46\1\75\1\56\1\72\1\150\1\44\2\60\1\44\4\uffff\1\143\1\154\1\145\3\uffff\1\142\1\157\1\170\2\145\1\160\1\146\1\156\1\164\1\157\2\44\1\154\1\147\1\151\1\143\1\156\1\141\1\151\1\160\1\156\1\157\1\154\1\141\1\170\1\167\1\144\1\163\1\154\1\162\1\154\1\142\1\151\1\145\1\160\1\163\1\165\1\151\1\124\1\141\1\164\1\157\1\144\3\154\1\163\1\141\1\157\1\141\1\144\1\44\1\144\1\155\1\157\1\166\1\144\1\154\1\164\1\44\1\167\1\145\1\157\1\74\20\uffff\1\75\23\uffff\1\75\6\uffff\1\151\1\uffff\2\44\1\uffff\1\60\3\uffff\1\153\1\150\1\145\1\154\1\157\1\147\1\154\1\153\1\154\1\164\1\156\1\145\1\44\1\155\1\157\1\145\1\143\1\151\3\141\1\163\1\141\1\44\1\uffff\1\145\1\uffff\1\141\1\103\1\162\1\163\1\145\1\164\1\147\1\151\1\154\1\147\1\164\1\145\1\143\1\160\1\164\1\163\1\44\1\110\1\151\1\125\1\165\1\151\1\164\1\141\1\44\1\163\1\145\1\164\1\156\1\145\1\154\1\145\1\141\1\156\1\157\1\156\1\164\1\154\1\55\2\44\2\154\1\145\1\143\1\160\1\156\1\147\1\157\2\145\1\164\1\uffff\1\144\1\154\1\153\2\145\1\151\1\142\1\154\1\40\1\uffff\1\44\1\144\1\141\1\144\6\uffff\1\154\2\44\1\uffff\1\141\1\44\1\163\1\151\1\162\1\44\1\162\1\145\1\111\1\142\1\123\1\144\1\44\1\uffff\1\44\1\145\1\167\1\157\1\162\1\166\1\151\1\165\1\155\1\111\1\155\1\123\1\uffff\1\156\1\171\1\157\1\145\1\44\1\143\1\151\1\154\1\156\1\145\1\151\1\156\1\143\1\162\1\150\2\151\1\165\1\uffff\2\145\1\44\1\172\1\156\1\162\1\156\1\145\1\154\1\141\1\uffff\1\145\1\144\1\141\1\164\1\156\1\151\1\44\1\154\1\147\1\111\1\44\1\157\1\123\1\uffff\1\145\2\uffff\1\141\1\155\1\143\1\44\1\150\1\164\1\44\1\145\1\162\1\147\1\143\1\170\1\141\1\154\1\145\1\123\1\165\1\162\1\154\1\156\1\145\1\44\1\146\2\uffff\1\44\1\156\1\164\1\55\1\145\1\47\2\44\1\uffff\1\147\1\uffff\1\44\1\156\1\144\1\162\1\uffff\1\145\1\44\1\144\1\141\1\151\1\157\1\164\1\44\2\uffff\1\72\1\44\1\146\1\151\1\145\2\154\1\151\1\156\1\141\1\164\1\144\1\163\1\154\1\147\1\uffff\1\164\1\157\1\145\1\147\1\44\1\143\1\141\1\150\1\44\1\162\1\156\1\160\1\162\2\141\1\uffff\1\145\1\164\1\156\1\147\1\162\1\154\1\164\1\44\1\144\1\142\1\124\1\144\1\143\1\uffff\2\44\1\165\1\156\1\uffff\1\156\1\164\1\44\1\160\1\156\1\157\1\uffff\1\44\1\145\1\uffff\1\44\1\164\1\166\1\145\1\141\1\145\1\156\1\141\1\156\1\164\1\160\1\40\1\44\1\141\1\162\1\uffff\1\171\1\uffff\1\106\1\145\1\uffff\2\44\1\145\1\uffff\1\147\1\145\1\164\1\163\1\uffff\1\44\1\162\1\160\1\154\1\171\3\uffff\1\44\1\142\1\144\1\163\1\164\1\143\1\120\1\162\1\171\1\151\1\123\1\165\1\141\1\102\1\156\2\44\1\uffff\1\44\1\164\1\44\1\uffff\1\157\1\147\1\154\1\145\1\144\1\147\1\144\1\44\1\151\2\44\1\151\1\171\1\44\1\uffff\1\145\1\154\1\157\1\151\1\163\1\151\2\uffff\1\155\1\164\1\123\1\171\1\uffff\1\163\1\44\1\154\1\uffff\1\162\1\164\1\uffff\1\44\1\141\1\162\1\164\1\144\1\143\1\142\1\44\1\171\1\163\1\145\1\uffff\1\154\1\44\1\117\2\162\1\uffff\2\44\1\162\1\171\1\163\1\uffff\2\44\1\157\1\154\1\uffff\1\145\4\44\1\141\1\164\1\154\1\156\1\145\1\155\1\164\1\157\1\171\1\154\1\163\3\uffff\1\151\1\uffff\1\156\1\44\1\145\1\44\1\145\1\150\1\145\1\uffff\1\154\2\uffff\1\156\1\44\1\145\1\uffff\1\144\1\145\1\160\1\157\1\44\1\164\1\142\1\145\1\164\1\154\1\145\1\44\1\uffff\1\157\1\163\1\171\1\uffff\1\154\1\44\1\157\1\44\2\145\1\uffff\1\154\1\44\2\uffff\1\44\1\164\1\uffff\1\156\1\157\1\40\2\uffff\2\44\1\142\1\uffff\1\141\1\uffff\1\162\1\145\1\144\4\uffff\1\163\1\44\1\145\1\147\1\154\1\156\1\151\1\156\1\111\1\167\1\44\1\156\1\151\1\uffff\1\44\1\uffff\1\162\1\164\1\162\1\44\1\147\1\uffff\1\162\2\44\1\151\1\156\1\uffff\1\44\1\145\1\147\1\171\1\145\1\44\1\uffff\1\162\1\44\1\154\1\163\1\uffff\1\162\1\uffff\1\157\1\154\1\145\2\uffff\1\171\1\123\1\155\1\145\2\uffff\1\141\1\164\2\44\1\102\1\164\1\uffff\2\44\1\145\1\163\1\157\1\44\1\144\1\141\1\uffff\1\147\1\172\1\uffff\3\44\1\uffff\2\44\2\uffff\1\143\1\44\1\uffff\1\162\1\145\1\154\1\44\1\uffff\1\44\1\uffff\1\145\1\44\1\123\1\146\2\44\1\154\1\145\1\44\2\uffff\1\162\1\164\2\uffff\1\171\1\44\2\uffff\1\143\1\44\1\156\1\uffff\1\44\1\171\1\44\1\145\5\uffff\1\44\1\uffff\1\44\1\162\1\145\2\uffff\1\44\1\uffff\1\164\1\44\2\uffff\1\145\1\154\1\uffff\1\123\1\145\1\44\1\uffff\1\164\1\uffff\1\44\1\uffff\1\163\1\uffff\1\144\2\uffff\2\44\1\uffff\1\171\1\uffff\1\44\1\145\1\164\1\162\1\uffff\1\145\1\uffff\2\44\2\uffff\1\154\1\uffff\1\143\1\171\1\156\1\144\2\uffff\1\145\1\164\1\154\4\44\1\145\4\uffff\1\44\1\uffff";
+        "\1\0\1\141\2\uffff\2\141\1\147\1\145\1\141\1\145\1\141\1\144\1\160\2\141\1\143\1\151\1\145\1\162\1\145\1\56\1\141\1\157\1\53\1\55\1\52\5\uffff\1\75\3\uffff\1\52\1\75\1\76\1\75\1\174\1\46\1\75\1\56\1\72\1\150\1\44\2\60\1\44\4\uffff\1\143\1\145\3\uffff\1\142\1\157\1\170\2\145\1\160\1\146\1\156\1\164\1\157\2\44\1\154\1\147\1\151\1\143\1\156\1\141\1\151\1\160\1\156\1\157\1\154\1\141\1\170\1\167\1\141\1\163\1\154\1\162\1\154\1\142\1\151\1\145\1\160\1\163\1\165\1\151\1\124\3\154\1\163\1\141\1\157\1\141\1\144\1\44\1\144\1\155\1\157\1\166\1\144\1\154\1\164\1\44\1\167\1\74\1\uffff\1\164\2\157\1\144\1\145\1\157\17\uffff\1\75\23\uffff\1\75\6\uffff\1\151\1\uffff\2\44\1\uffff\1\60\3\uffff\1\153\1\150\1\145\1\157\1\147\1\154\1\153\1\154\1\164\1\156\1\145\1\44\1\155\1\157\1\145\1\143\1\151\3\141\1\163\1\141\1\44\1\uffff\1\145\1\uffff\1\141\1\103\1\162\1\163\1\145\1\164\1\147\1\151\1\154\1\147\1\164\1\145\1\143\1\160\1\164\1\163\1\44\1\110\1\144\1\151\1\125\1\165\1\151\1\164\1\141\1\44\1\163\1\145\1\164\1\156\1\145\1\154\1\145\1\141\1\156\1\157\2\44\2\154\1\145\1\143\1\160\1\156\1\147\1\157\2\145\1\164\1\uffff\1\144\1\154\1\153\2\145\1\151\1\142\1\154\1\40\1\uffff\1\44\2\uffff\1\164\1\154\1\142\1\55\1\141\1\144\4\uffff\1\154\1\uffff\2\44\1\141\1\44\1\163\1\162\1\44\1\162\1\145\1\111\1\142\1\123\1\144\1\44\1\uffff\1\44\1\145\1\167\1\157\1\162\1\166\1\151\1\165\1\155\1\111\1\155\1\123\1\uffff\1\156\1\171\1\157\1\145\1\44\1\143\1\151\1\154\1\156\1\145\1\151\1\156\1\143\1\162\1\150\2\151\1\165\1\uffff\2\145\1\44\1\117\1\172\1\156\1\162\1\156\1\145\1\154\1\141\1\uffff\1\145\1\144\1\141\1\164\1\156\1\151\1\44\1\154\1\147\1\111\1\145\2\uffff\1\141\1\155\1\143\1\44\1\150\1\164\1\44\1\145\1\162\1\147\1\143\1\170\1\141\1\154\1\145\1\123\1\165\1\162\1\154\1\156\1\145\1\44\1\146\2\uffff\1\157\1\123\1\111\1\uffff\1\156\1\164\1\55\1\145\1\uffff\1\47\2\44\1\147\1\uffff\1\44\1\144\1\162\1\uffff\1\145\1\44\1\144\1\141\1\151\1\157\1\164\1\44\2\uffff\1\72\1\44\1\146\1\151\1\145\2\154\1\151\1\156\1\141\1\164\1\144\1\163\1\154\1\147\1\uffff\1\164\1\157\1\145\1\147\1\44\1\143\1\141\1\150\1\44\1\162\1\156\1\160\1\162\1\141\1\151\1\uffff\1\156\1\145\1\164\1\156\1\147\1\162\1\154\1\164\1\44\1\144\1\142\1\124\1\144\1\143\1\uffff\2\44\1\165\1\156\1\44\1\160\1\156\1\157\1\uffff\1\44\1\145\1\uffff\1\44\1\164\1\166\1\145\1\141\1\145\1\156\1\141\1\156\1\164\1\160\1\40\1\44\1\141\1\162\1\uffff\1\171\1\156\1\164\1\155\1\106\1\145\1\uffff\2\44\1\145\1\uffff\1\145\1\164\1\163\1\uffff\1\44\1\162\1\160\1\154\1\171\3\uffff\1\44\1\142\1\144\1\163\1\164\1\143\1\120\1\162\1\171\1\151\1\123\1\165\1\141\1\102\1\156\2\44\1\uffff\1\44\1\164\1\44\1\uffff\1\157\1\147\1\154\1\145\1\144\1\147\1\154\1\44\1\151\2\44\1\151\1\171\1\44\1\uffff\1\145\1\154\1\157\1\151\1\163\1\151\2\uffff\1\155\1\164\1\uffff\1\163\1\44\1\154\1\uffff\1\162\1\164\1\uffff\1\44\1\141\1\162\1\164\1\144\1\143\1\142\1\44\1\171\1\163\1\145\1\uffff\1\154\1\44\1\117\1\123\1\171\1\141\2\162\1\uffff\1\44\1\162\1\171\1\163\1\uffff\2\44\1\157\1\154\1\uffff\1\145\4\44\1\141\1\164\1\154\1\156\1\145\1\155\1\164\1\157\1\171\1\163\3\uffff\1\151\1\uffff\1\156\1\44\1\145\1\44\1\145\1\150\1\171\1\uffff\1\154\2\uffff\1\156\1\44\1\145\1\uffff\1\144\1\145\1\160\1\157\1\44\1\164\1\142\2\145\1\44\1\uffff\1\157\1\163\1\171\1\uffff\1\154\1\44\1\157\1\44\2\145\1\uffff\1\154\1\44\2\uffff\1\44\1\164\1\uffff\1\156\1\164\1\154\1\147\1\157\1\40\1\uffff\2\44\1\142\1\uffff\1\141\1\uffff\1\162\1\145\1\144\4\uffff\1\163\1\44\1\145\1\147\1\154\1\156\1\151\1\156\1\111\1\44\1\156\1\151\1\uffff\1\44\1\uffff\1\162\1\164\2\44\1\147\1\uffff\1\162\2\44\1\151\1\156\1\uffff\1\44\1\145\1\147\1\44\1\uffff\1\162\1\44\1\154\1\163\1\uffff\1\162\1\uffff\1\157\1\154\1\145\2\uffff\1\171\1\123\1\171\2\145\1\155\1\145\2\uffff\1\141\1\164\2\44\1\102\1\164\1\uffff\2\44\1\145\1\163\1\157\1\44\1\144\1\uffff\1\147\1\172\1\uffff\2\44\2\uffff\2\44\2\uffff\1\143\1\44\1\uffff\1\162\1\145\1\uffff\1\44\1\uffff\1\145\1\44\1\123\1\146\2\44\1\154\1\145\1\154\1\44\1\123\1\44\2\uffff\1\162\1\164\2\uffff\1\171\1\44\2\uffff\1\143\1\44\1\156\1\uffff\2\44\1\145\4\uffff\1\44\1\uffff\1\44\1\162\1\uffff\1\44\1\uffff\1\164\1\44\2\uffff\1\145\1\154\1\145\1\uffff\1\164\1\uffff\1\123\1\145\1\44\1\uffff\1\164\1\uffff\1\44\2\uffff\1\144\2\uffff\1\44\1\uffff\1\171\1\uffff\1\44\1\145\1\44\1\171\1\164\1\162\1\uffff\1\145\1\uffff\1\44\1\uffff\1\154\1\uffff\1\143\1\uffff\1\154\1\171\1\156\1\144\1\uffff\1\145\1\164\1\145\1\154\5\44\1\145\5\uffff\1\44\1\uffff";
     static final String DFA24_maxS =
-        "\1\uffff\1\162\2\uffff\2\171\1\170\1\171\1\165\2\157\1\170\1\163\1\165\1\141\1\157\1\156\1\164\1\157\1\162\1\165\1\162\1\56\1\75\1\76\1\75\5\uffff\1\76\3\uffff\2\75\1\76\1\75\1\174\1\46\1\75\2\72\1\150\1\172\1\170\1\154\1\172\4\uffff\1\164\1\154\1\157\3\uffff\1\163\1\157\1\170\1\171\1\162\1\160\1\164\1\156\1\171\1\157\2\172\1\167\1\147\1\151\1\154\1\156\1\171\1\151\1\160\1\156\1\157\1\154\1\141\1\170\1\167\1\164\1\163\1\156\1\162\1\154\1\142\1\151\1\145\1\164\1\163\1\165\1\151\1\124\1\141\1\164\1\157\1\144\1\162\2\154\1\164\1\141\1\157\1\160\1\164\1\172\1\144\1\155\1\167\1\166\1\144\1\155\1\164\1\172\1\167\1\151\1\157\1\74\20\uffff\1\75\23\uffff\1\75\6\uffff\1\151\1\uffff\2\172\1\uffff\1\154\3\uffff\1\153\1\150\1\145\1\154\1\157\1\160\1\154\1\153\1\154\1\164\1\156\1\145\1\172\1\156\1\157\1\145\1\143\1\151\3\141\1\163\1\145\1\172\1\uffff\1\145\1\uffff\1\141\1\103\1\162\1\163\1\145\1\164\1\147\1\151\1\154\2\164\1\145\1\143\1\160\1\164\1\163\1\172\1\163\1\151\1\125\1\165\1\151\1\164\1\141\1\172\1\163\1\145\1\164\1\156\1\145\1\154\1\145\1\141\1\156\1\157\1\156\1\164\1\154\1\55\2\172\1\165\1\154\1\145\1\143\1\160\1\156\1\147\1\157\1\145\1\151\1\164\1\uffff\1\145\1\154\1\153\2\145\1\151\1\142\1\154\1\151\1\uffff\1\172\1\144\1\145\1\144\6\uffff\1\154\2\172\1\uffff\1\141\1\172\1\163\1\151\1\162\1\172\1\162\1\145\1\111\1\164\1\143\1\144\1\172\1\uffff\1\172\1\145\1\167\1\157\1\162\1\166\1\151\1\165\1\155\1\111\1\155\1\123\1\uffff\1\156\1\171\1\157\1\145\1\172\1\143\1\151\1\154\1\156\1\145\1\151\1\156\1\143\1\162\1\150\2\151\1\165\1\uffff\2\145\2\172\1\156\1\162\1\156\1\145\1\154\1\141\1\uffff\1\145\1\144\1\141\1\164\1\156\1\151\1\172\1\154\1\147\1\116\1\172\1\157\1\123\1\uffff\1\145\2\uffff\1\141\1\155\1\143\1\172\1\150\1\164\1\172\1\145\2\162\1\143\1\170\1\141\1\154\1\145\1\123\1\165\1\162\1\154\1\156\1\145\1\172\1\146\2\uffff\1\172\1\156\1\164\1\55\1\145\1\47\2\172\1\uffff\1\147\1\uffff\1\172\1\156\1\144\1\162\1\uffff\1\145\1\172\1\144\1\141\1\151\1\157\1\164\1\172\2\uffff\1\72\1\172\1\146\1\151\1\145\2\154\1\151\1\156\1\141\1\164\1\144\1\163\1\154\1\147\1\uffff\1\164\1\157\1\145\1\147\1\172\1\143\1\141\1\150\1\172\1\162\1\156\1\160\1\162\1\141\1\151\1\uffff\1\145\1\164\1\156\1\147\1\162\1\154\1\164\1\172\1\144\1\142\1\124\1\163\1\143\1\uffff\2\172\1\165\1\156\1\uffff\1\156\1\164\1\172\1\160\1\156\1\157\1\uffff\1\172\1\145\1\uffff\1\172\1\164\1\166\1\145\1\141\1\145\1\156\1\141\1\156\1\164\1\160\1\40\1\172\1\141\1\162\1\uffff\1\171\1\uffff\1\106\1\145\1\uffff\2\172\1\145\1\uffff\1\147\1\145\1\164\1\163\1\uffff\1\172\1\162\1\160\1\154\1\171\3\uffff\1\172\1\142\1\144\1\163\1\164\1\143\1\120\1\162\1\171\1\151\1\123\1\165\1\141\1\151\1\156\2\172\1\uffff\1\172\1\164\1\172\1\uffff\1\157\1\147\1\154\1\145\1\144\1\147\1\144\1\172\1\151\2\172\1\151\1\171\1\172\1\uffff\1\145\1\154\1\157\1\151\1\163\1\151\2\uffff\1\155\1\164\1\123\1\171\1\uffff\1\163\1\172\1\154\1\uffff\1\162\1\164\1\uffff\1\172\1\141\1\162\1\164\1\144\1\143\1\142\1\172\1\171\1\163\1\164\1\uffff\1\154\1\172\1\117\2\162\1\uffff\2\172\1\162\1\171\1\163\1\uffff\2\172\1\157\1\154\1\uffff\1\145\4\172\1\141\1\164\1\154\1\156\1\145\1\155\1\164\1\157\1\171\1\154\1\163\3\uffff\1\151\1\uffff\1\156\1\172\1\145\1\172\1\145\1\150\1\145\1\uffff\1\154\2\uffff\1\156\1\172\1\145\1\uffff\1\144\1\145\1\160\1\157\1\172\1\164\1\142\1\145\1\164\1\154\1\145\1\172\1\uffff\1\157\1\163\1\171\1\uffff\1\154\1\172\1\157\1\172\2\145\1\uffff\1\154\1\172\2\uffff\1\172\1\164\1\uffff\1\156\1\157\1\40\2\uffff\2\172\1\142\1\uffff\1\141\1\uffff\1\162\1\145\1\144\4\uffff\1\163\1\172\1\145\1\147\1\154\1\156\1\151\1\156\1\111\1\167\1\172\1\156\1\151\1\uffff\1\172\1\uffff\1\162\1\164\1\162\1\172\1\147\1\uffff\1\162\2\172\1\151\1\156\1\uffff\1\172\1\145\1\147\1\171\1\145\1\172\1\uffff\1\162\1\172\1\154\1\163\1\uffff\1\162\1\uffff\1\157\1\154\1\145\2\uffff\1\171\1\123\1\155\1\164\2\uffff\1\141\1\164\2\172\1\102\1\164\1\uffff\2\172\1\145\1\163\1\157\1\172\1\144\1\141\1\uffff\1\147\1\172\1\uffff\3\172\1\uffff\2\172\2\uffff\1\143\1\172\1\uffff\1\162\1\145\1\154\1\172\1\uffff\1\172\1\uffff\1\145\1\172\1\123\1\146\2\172\1\154\1\145\1\172\2\uffff\1\162\1\164\2\uffff\1\171\1\172\2\uffff\1\143\1\172\1\156\1\uffff\1\172\1\171\1\172\1\145\5\uffff\1\172\1\uffff\1\172\1\162\1\145\2\uffff\1\172\1\uffff\1\164\1\172\2\uffff\1\145\1\154\1\uffff\1\123\1\145\1\172\1\uffff\1\164\1\uffff\1\172\1\uffff\1\163\1\uffff\1\144\2\uffff\2\172\1\uffff\1\171\1\uffff\1\172\1\145\1\164\1\162\1\uffff\1\145\1\uffff\2\172\2\uffff\1\154\1\uffff\1\143\1\171\1\156\1\144\2\uffff\1\145\1\164\1\154\4\172\1\145\4\uffff\1\172\1\uffff";
+        "\1\uffff\1\162\2\uffff\2\171\1\170\1\171\1\165\2\157\1\170\1\163\1\141\1\157\1\156\1\164\1\157\1\162\1\165\1\56\1\165\1\162\1\75\1\76\1\75\5\uffff\1\76\3\uffff\2\75\1\76\1\75\1\174\1\46\1\75\2\72\1\150\1\172\1\170\1\154\1\172\4\uffff\1\164\1\157\3\uffff\1\163\1\157\1\170\1\171\1\162\1\160\1\164\1\156\1\171\1\157\2\172\1\167\1\147\1\151\1\154\1\156\1\171\1\151\1\160\1\156\1\157\1\154\1\141\1\170\1\167\1\164\1\163\1\156\1\162\1\154\1\142\1\151\1\145\1\164\1\163\1\165\1\151\1\124\1\162\2\154\1\164\1\141\1\157\1\160\1\164\1\172\1\144\1\155\1\167\1\166\1\144\1\155\1\164\1\172\1\167\1\74\1\uffff\1\164\2\157\1\144\1\145\1\157\17\uffff\1\75\23\uffff\1\75\6\uffff\1\151\1\uffff\2\172\1\uffff\1\154\3\uffff\1\153\1\150\1\145\1\157\1\160\1\154\1\153\1\154\1\164\1\156\1\145\1\172\1\156\1\157\1\145\1\143\1\151\3\141\1\163\1\145\1\172\1\uffff\1\145\1\uffff\1\141\1\103\1\162\1\163\1\145\1\164\1\147\1\151\1\154\2\164\1\145\1\143\1\160\1\164\1\163\1\172\1\163\1\144\1\151\1\125\1\165\1\151\1\164\1\141\1\172\1\163\1\145\1\164\1\156\1\145\1\154\1\145\1\141\1\156\1\157\2\172\1\165\1\154\1\145\1\143\1\160\1\156\1\147\1\157\1\145\1\151\1\164\1\uffff\1\145\1\154\1\153\2\145\1\151\1\142\1\154\1\151\1\uffff\1\172\2\uffff\1\164\1\154\1\142\1\55\1\145\1\144\4\uffff\1\154\1\uffff\2\172\1\141\1\172\1\163\1\162\1\172\1\162\1\145\1\111\1\164\1\143\1\144\1\172\1\uffff\1\172\1\145\1\167\1\157\1\162\1\166\1\151\1\165\1\155\1\111\1\155\1\123\1\uffff\1\156\1\171\1\157\1\145\1\172\1\143\1\151\1\154\1\156\1\145\1\151\1\156\1\143\1\162\1\150\2\151\1\165\1\uffff\2\145\1\172\1\117\1\172\1\156\1\162\1\156\1\145\1\154\1\141\1\uffff\1\145\1\144\1\141\1\164\1\156\1\151\1\172\1\154\1\147\1\116\1\145\2\uffff\1\141\1\155\1\143\1\172\1\150\1\164\1\172\1\145\2\162\1\143\1\170\1\141\1\154\1\145\1\123\1\165\1\162\1\154\1\156\1\145\1\172\1\146\2\uffff\1\157\1\123\1\111\1\uffff\1\156\1\164\1\55\1\145\1\uffff\1\47\2\172\1\147\1\uffff\1\172\1\144\1\162\1\uffff\1\145\1\172\1\144\1\141\1\151\1\157\1\164\1\172\2\uffff\1\72\1\172\1\146\1\151\1\145\2\154\1\151\1\156\1\141\1\164\1\144\1\163\1\154\1\147\1\uffff\1\164\1\157\1\145\1\147\1\172\1\143\1\141\1\150\1\172\1\162\1\156\1\160\1\162\1\141\1\151\1\uffff\1\156\1\145\1\164\1\156\1\147\1\162\1\154\1\164\1\172\1\144\1\142\1\124\1\163\1\143\1\uffff\2\172\1\165\1\156\1\172\1\160\1\156\1\157\1\uffff\1\172\1\145\1\uffff\1\172\1\164\1\166\1\145\1\141\1\145\1\156\1\141\1\156\1\164\1\160\1\40\1\172\1\141\1\162\1\uffff\1\171\1\156\1\164\1\155\1\106\1\145\1\uffff\2\172\1\145\1\uffff\1\145\1\164\1\163\1\uffff\1\172\1\162\1\160\1\154\1\171\3\uffff\1\172\1\142\1\144\1\163\1\164\1\143\1\120\1\162\1\171\1\151\1\123\1\165\1\141\1\151\1\156\2\172\1\uffff\1\172\1\164\1\172\1\uffff\1\157\1\147\1\154\1\145\1\144\1\147\1\154\1\172\1\151\2\172\1\151\1\171\1\172\1\uffff\1\145\1\154\1\157\1\151\1\163\1\151\2\uffff\1\155\1\164\1\uffff\1\163\1\172\1\154\1\uffff\1\162\1\164\1\uffff\1\172\1\141\1\162\1\164\1\144\1\143\1\142\1\172\1\171\1\163\1\164\1\uffff\1\154\1\172\1\117\1\123\1\171\1\141\2\162\1\uffff\1\172\1\162\1\171\1\163\1\uffff\2\172\1\157\1\154\1\uffff\1\145\4\172\1\141\1\164\1\154\1\156\1\145\1\155\1\164\1\157\1\171\1\163\3\uffff\1\151\1\uffff\1\156\1\172\1\145\1\172\1\145\1\150\1\171\1\uffff\1\154\2\uffff\1\156\1\172\1\145\1\uffff\1\144\1\145\1\160\1\157\1\172\1\164\1\142\2\145\1\172\1\uffff\1\157\1\163\1\171\1\uffff\1\154\1\172\1\157\1\172\2\145\1\uffff\1\154\1\172\2\uffff\1\172\1\164\1\uffff\1\156\1\164\1\154\1\147\1\157\1\40\1\uffff\2\172\1\142\1\uffff\1\141\1\uffff\1\162\1\145\1\144\4\uffff\1\163\1\172\1\145\1\147\1\154\1\156\1\151\1\156\1\111\1\172\1\156\1\151\1\uffff\1\172\1\uffff\1\162\1\164\2\172\1\147\1\uffff\1\162\2\172\1\151\1\156\1\uffff\1\172\1\145\1\147\1\172\1\uffff\1\162\1\172\1\154\1\163\1\uffff\1\162\1\uffff\1\157\1\154\1\145\2\uffff\1\171\1\123\1\171\2\145\1\155\1\164\2\uffff\1\141\1\164\2\172\1\102\1\164\1\uffff\2\172\1\145\1\163\1\157\1\172\1\144\1\uffff\1\147\1\172\1\uffff\2\172\2\uffff\2\172\2\uffff\1\143\1\172\1\uffff\1\162\1\145\1\uffff\1\172\1\uffff\1\145\1\172\1\123\1\146\2\172\1\154\1\145\1\154\1\172\1\123\1\172\2\uffff\1\162\1\164\2\uffff\1\171\1\172\2\uffff\1\143\1\172\1\156\1\uffff\2\172\1\145\4\uffff\1\172\1\uffff\1\172\1\162\1\uffff\1\172\1\uffff\1\164\1\172\2\uffff\1\145\1\154\1\145\1\uffff\1\164\1\uffff\1\123\1\145\1\172\1\uffff\1\164\1\uffff\1\172\2\uffff\1\144\2\uffff\1\172\1\uffff\1\171\1\uffff\1\172\1\145\1\172\1\171\1\164\1\162\1\uffff\1\145\1\uffff\1\172\1\uffff\1\154\1\uffff\1\143\1\uffff\1\154\1\171\1\156\1\144\1\uffff\1\145\1\164\1\145\1\154\5\172\1\145\5\uffff\1\172\1\uffff";
     static final String DFA24_acceptS =
-        "\2\uffff\1\2\1\3\26\uffff\1\127\1\130\1\131\1\132\1\133\1\uffff\1\135\1\136\1\137\16\uffff\1\u00b0\1\u00b1\1\u00b4\1\u00b5\3\uffff\1\u00b0\1\2\1\3\100\uffff\1\100\1\140\1\171\1\120\1\141\1\157\1\172\1\121\1\142\1\165\1\125\1\127\1\130\1\131\1\132\1\133\1\uffff\1\162\1\134\1\135\1\136\1\137\1\143\1\u00b2\1\u00b3\1\166\1\144\1\167\1\163\1\145\1\147\1\146\1\150\1\175\1\151\1\u0097\1\uffff\1\170\1\164\1\174\1\u0096\1\173\1\u0081\1\uffff\1\u00b1\2\uffff\1\u00ad\1\uffff\1\u00ae\1\u00af\1\u00b4\30\uffff\1\u0086\1\uffff\1\6\64\uffff\1\176\11\uffff\1\126\4\uffff\1\160\1\161\1\154\1\152\1\155\1\153\3\uffff\1\u00ac\15\uffff\1\u0092\14\uffff\1\77\22\uffff\1\111\12\uffff\1\u0084\15\uffff\1\u009f\1\uffff\1\u0088\1\u0087\27\uffff\1\u009d\1\u008b\10\uffff\1\u00ac\1\uffff\1\35\4\uffff\1\75\10\uffff\1\u008d\1\117\17\uffff\1\61\17\uffff\1\u00a7\15\uffff\1\177\4\uffff\1\22\6\uffff\1\u0083\2\uffff\1\27\17\uffff\1\u008e\1\uffff\1\71\2\uffff\1\u00a1\3\uffff\1\u00a8\4\uffff\1\4\5\uffff\1\67\1\u00ab\1\u0090\21\uffff\1\76\3\uffff\1\u008a\16\uffff\1\u008c\6\uffff\1\u0098\1\20\4\uffff\1\25\3\uffff\1\u0095\2\uffff\1\30\13\uffff\1\47\5\uffff\1\u0085\5\uffff\1\41\4\uffff\1\u008f\20\uffff\1\11\1\57\1\123\1\uffff\1\u0080\7\uffff\1\37\1\uffff\1\u0091\1\u009e\3\uffff\1\106\14\uffff\1\44\3\uffff\1\122\6\uffff\1\u00a3\2\uffff\1\u009b\1\u009c\2\uffff\1\56\3\uffff\1\1\1\14\3\uffff\1\17\1\uffff\1\70\3\uffff\1\46\1\63\1\u0082\1\36\15\uffff\1\u00a0\1\uffff\1\45\5\uffff\1\u0093\5\uffff\1\u0089\6\uffff\1\u00a6\4\uffff\1\55\1\uffff\1\u00a5\3\uffff\1\33\1\43\4\uffff\1\23\1\50\6\uffff\1\60\10\uffff\1\u00a9\2\uffff\1\10\3\uffff\1\114\2\uffff\1\16\1\74\2\uffff\1\u00a4\4\uffff\1\26\1\uffff\1\u00aa\11\uffff\1\u0099\1\u009a\2\uffff\1\65\1\115\2\uffff\1\105\1\24\3\uffff\1\7\4\uffff\1\13\1\62\1\73\1\15\1\34\1\uffff\1\124\3\uffff\1\104\1\66\1\uffff\1\31\2\uffff\1\32\1\103\2\uffff\1\113\3\uffff\1\54\1\uffff\1\42\1\uffff\1\21\1\uffff\1\u00a2\1\uffff\1\102\1\52\2\uffff\1\116\1\uffff\1\156\4\uffff\1\5\1\uffff\1\51\2\uffff\1\53\1\101\1\uffff\1\107\4\uffff\1\72\1\u0094\10\uffff\1\40\1\12\1\112\1\64\1\uffff\1\110";
+        "\2\uffff\1\2\1\3\26\uffff\1\124\1\125\1\126\1\127\1\130\1\uffff\1\132\1\133\1\134\16\uffff\1\u00ad\1\u00ae\1\u00b1\1\u00b2\2\uffff\1\u00ad\1\2\1\3\72\uffff\1\74\6\uffff\1\135\1\166\1\115\1\136\1\154\1\167\1\116\1\137\1\162\1\122\1\124\1\125\1\126\1\127\1\130\1\uffff\1\157\1\131\1\132\1\133\1\134\1\140\1\u00af\1\u00b0\1\163\1\141\1\164\1\160\1\142\1\144\1\143\1\145\1\172\1\146\1\u0094\1\uffff\1\165\1\161\1\171\1\u0093\1\170\1\176\1\uffff\1\u00ae\2\uffff\1\u00aa\1\uffff\1\u00ab\1\u00ac\1\u00b1\27\uffff\1\u0083\1\uffff\1\6\61\uffff\1\173\11\uffff\1\123\1\uffff\1\155\1\156\6\uffff\1\151\1\147\1\152\1\150\1\uffff\1\u00a9\16\uffff\1\u008f\14\uffff\1\73\22\uffff\1\105\13\uffff\1\u0081\13\uffff\1\u0085\1\u0084\27\uffff\1\u009a\1\u0088\3\uffff\1\u009c\4\uffff\1\u00a9\4\uffff\1\34\3\uffff\1\71\10\uffff\1\u008a\1\114\17\uffff\1\60\17\uffff\1\u00a4\16\uffff\1\174\10\uffff\1\u0080\2\uffff\1\26\17\uffff\1\u008b\6\uffff\1\u009e\3\uffff\1\u00a5\3\uffff\1\4\5\uffff\1\66\1\u00a8\1\u008d\21\uffff\1\72\3\uffff\1\u0087\16\uffff\1\u0089\6\uffff\1\u0095\1\17\2\uffff\1\24\3\uffff\1\u0092\2\uffff\1\27\13\uffff\1\46\10\uffff\1\u0082\4\uffff\1\40\4\uffff\1\u008c\17\uffff\1\11\1\56\1\120\1\uffff\1\175\7\uffff\1\36\1\uffff\1\u008e\1\u009b\3\uffff\1\102\12\uffff\1\43\3\uffff\1\117\6\uffff\1\u00a0\2\uffff\1\u0098\1\u0099\2\uffff\1\55\6\uffff\1\1\3\uffff\1\16\1\uffff\1\67\3\uffff\1\45\1\62\1\177\1\35\14\uffff\1\u009d\1\uffff\1\44\5\uffff\1\u0090\5\uffff\1\u0086\4\uffff\1\u00a3\4\uffff\1\54\1\uffff\1\u00a2\3\uffff\1\32\1\42\7\uffff\1\22\1\47\6\uffff\1\57\7\uffff\1\u00a6\2\uffff\1\10\2\uffff\1\20\1\110\2\uffff\1\15\1\70\2\uffff\1\u00a1\2\uffff\1\25\1\uffff\1\u00a7\14\uffff\1\u0096\1\u0097\2\uffff\1\64\1\111\2\uffff\1\101\1\23\3\uffff\1\7\3\uffff\1\13\1\61\1\14\1\33\1\uffff\1\121\2\uffff\1\65\1\uffff\1\30\2\uffff\1\31\1\77\3\uffff\1\100\1\uffff\1\107\3\uffff\1\53\1\uffff\1\41\1\uffff\1\21\1\u009f\1\uffff\1\76\1\51\1\uffff\1\113\1\uffff\1\153\6\uffff\1\5\1\uffff\1\50\1\uffff\1\52\1\uffff\1\103\1\uffff\1\75\4\uffff\1\u0091\12\uffff\1\37\1\12\1\106\1\63\1\112\1\uffff\1\104";
     static final String DFA24_specialS =
-        "\1\0\u035e\uffff}>";
+        "\1\0\u0359\uffff}>";
     static final String[] DFA24_transitionS = {
-            "\11\64\2\63\2\64\1\63\22\64\1\63\1\51\1\62\1\40\1\61\1\44\1\50\1\55\1\34\1\36\1\31\1\27\1\35\1\30\1\26\1\43\1\56\11\57\1\53\1\32\1\45\1\37\1\46\1\52\1\33\32\61\1\41\1\64\1\42\1\60\1\61\1\64\1\6\1\15\1\17\1\5\1\13\1\12\1\25\1\21\1\20\2\61\1\22\1\10\1\24\1\23\1\1\1\61\1\11\1\7\1\4\1\14\1\16\1\54\3\61\1\2\1\47\1\3\uff82\64",
-            "\1\65\15\uffff\1\66\2\uffff\1\67",
-            "",
-            "",
-            "\1\73\3\uffff\1\75\2\uffff\1\77\6\uffff\1\74\2\uffff\1\76\6\uffff\1\100",
-            "\1\103\3\uffff\1\101\11\uffff\1\105\4\uffff\1\104\4\uffff\1\102",
-            "\1\110\4\uffff\1\107\6\uffff\1\106\4\uffff\1\111",
-            "\1\112\3\uffff\1\113\2\uffff\1\120\7\uffff\1\114\1\116\1\uffff\1\115\1\uffff\1\117",
-            "\1\123\3\uffff\1\122\17\uffff\1\121",
-            "\1\125\3\uffff\1\126\5\uffff\1\124",
-            "\1\131\7\uffff\1\127\5\uffff\1\130",
-            "\1\133\7\uffff\1\136\1\132\3\uffff\1\137\4\uffff\1\134\1\uffff\1\135",
-            "\1\141\2\uffff\1\140",
-            "\1\145\3\uffff\1\142\11\uffff\1\144\5\uffff\1\143",
-            "\1\146",
-            "\1\151\3\uffff\1\150\2\uffff\1\152\6\uffff\1\147",
-            "\1\153\2\uffff\1\156\6\uffff\1\154\1\155",
-            "\1\157\12\uffff\1\160",
-            "\1\162\11\uffff\1\161",
+            "\11\64\2\63\2\64\1\63\22\64\1\63\1\51\1\62\1\40\1\61\1\44\1\50\1\55\1\34\1\36\1\31\1\27\1\35\1\30\1\24\1\43\1\56\11\57\1\53\1\32\1\45\1\37\1\46\1\52\1\33\32\61\1\41\1\64\1\42\1\60\1\61\1\64\1\6\1\25\1\16\1\5\1\13\1\12\1\26\1\20\1\17\2\61\1\21\1\10\1\23\1\22\1\1\1\61\1\11\1\7\1\4\1\14\1\15\1\54\3\61\1\2\1\47\1\3\uff82\64",
+            "\1\65\20\uffff\1\66",
+            "",
+            "",
+            "\1\72\3\uffff\1\74\2\uffff\1\76\6\uffff\1\73\2\uffff\1\75\6\uffff\1\77",
+            "\1\102\3\uffff\1\100\11\uffff\1\104\4\uffff\1\103\4\uffff\1\101",
+            "\1\107\4\uffff\1\106\6\uffff\1\105\4\uffff\1\110",
+            "\1\111\3\uffff\1\112\2\uffff\1\117\7\uffff\1\113\1\115\1\uffff\1\114\1\uffff\1\116",
+            "\1\122\3\uffff\1\121\17\uffff\1\120",
+            "\1\124\3\uffff\1\125\5\uffff\1\123",
+            "\1\130\7\uffff\1\126\5\uffff\1\127",
+            "\1\132\7\uffff\1\135\1\131\3\uffff\1\136\4\uffff\1\133\1\uffff\1\134",
+            "\1\140\2\uffff\1\137",
+            "\1\141",
+            "\1\144\3\uffff\1\143\2\uffff\1\145\6\uffff\1\142",
+            "\1\146\2\uffff\1\151\6\uffff\1\147\1\150",
+            "\1\152\12\uffff\1\153",
+            "\1\155\11\uffff\1\154",
+            "\1\156",
+            "\1\162\11\uffff\1\160\3\uffff\1\161\1\uffff\1\157",
             "\1\163",
-            "\1\167\11\uffff\1\165\3\uffff\1\166\1\uffff\1\164",
-            "\1\171\2\uffff\1\170",
-            "\1\172",
-            "\1\175\21\uffff\1\174",
-            "\1\u0081\17\uffff\1\177\1\u0080",
-            "\1\u0084\22\uffff\1\u0083",
+            "\1\170\12\uffff\1\167\2\uffff\1\166\5\uffff\1\165",
+            "\1\172\2\uffff\1\171",
+            "\1\174\21\uffff\1\173",
+            "\1\u0080\17\uffff\1\176\1\177",
+            "\1\u0083\22\uffff\1\u0082",
             "",
             "",
             "",
             "",
             "",
-            "\1\u008b\1\u008c",
+            "\1\u008a\1\u008b",
             "",
             "",
             "",
-            "\1\u0092\4\uffff\1\u0093\15\uffff\1\u0091",
-            "\1\u0095",
-            "\1\u0097",
-            "\1\u0099",
-            "\1\u009b",
-            "\1\u009d",
-            "\1\u009f",
-            "\1\u00a2\13\uffff\1\u00a1",
-            "\1\u00a4",
-            "\1\u00a6",
-            "\1\u00a9\34\uffff\32\u00a9\3\uffff\1\u00a8\1\u00a9\1\uffff\32\u00a9",
-            "\12\u00ab\10\uffff\1\u00ad\1\uffff\3\u00ad\5\uffff\1\u00ad\13\uffff\1\u00aa\6\uffff\1\u00ab\2\uffff\1\u00ad\1\uffff\3\u00ad\5\uffff\1\u00ad\13\uffff\1\u00aa",
-            "\12\u00ab\10\uffff\1\u00ad\1\uffff\3\u00ad\5\uffff\1\u00ad\22\uffff\1\u00ab\2\uffff\1\u00ad\1\uffff\3\u00ad\5\uffff\1\u00ad",
-            "\1\70\34\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u0091\4\uffff\1\u0092\15\uffff\1\u0090",
+            "\1\u0094",
+            "\1\u0096",
+            "\1\u0098",
+            "\1\u009a",
+            "\1\u009c",
+            "\1\u009e",
+            "\1\u00a1\13\uffff\1\u00a0",
+            "\1\u00a3",
+            "\1\u00a5",
+            "\1\u00a8\34\uffff\32\u00a8\3\uffff\1\u00a7\1\u00a8\1\uffff\32\u00a8",
+            "\12\u00aa\10\uffff\1\u00ac\1\uffff\3\u00ac\5\uffff\1\u00ac\13\uffff\1\u00a9\6\uffff\1\u00aa\2\uffff\1\u00ac\1\uffff\3\u00ac\5\uffff\1\u00ac\13\uffff\1\u00a9",
+            "\12\u00aa\10\uffff\1\u00ac\1\uffff\3\u00ac\5\uffff\1\u00ac\22\uffff\1\u00aa\2\uffff\1\u00ac\1\uffff\3\u00ac\5\uffff\1\u00ac",
+            "\1\67\34\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "",
             "",
             "",
             "",
-            "\1\u00af\3\uffff\1\u00b1\14\uffff\1\u00b0",
-            "\1\u00b2",
-            "\1\u00b3\11\uffff\1\u00b4",
+            "\1\u00ae\3\uffff\1\u00b0\14\uffff\1\u00af",
+            "\1\u00b1\11\uffff\1\u00b2",
             "",
             "",
             "",
-            "\1\u00b5\20\uffff\1\u00b6",
-            "\1\u00b7",
-            "\1\u00b8",
-            "\1\u00b9\17\uffff\1\u00ba\3\uffff\1\u00bb",
-            "\1\u00bc\14\uffff\1\u00bd",
-            "\1\u00be",
-            "\1\u00c2\13\uffff\1\u00c0\1\u00bf\1\u00c1",
-            "\1\u00c3",
-            "\1\u00c5\4\uffff\1\u00c4",
-            "\1\u00c6",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\2\70\1\u00c8\27\70",
-            "\1\u00cb\12\uffff\1\u00ca",
-            "\1\u00cc",
-            "\1\u00cd",
-            "\1\u00cf\10\uffff\1\u00ce",
-            "\1\u00d0",
-            "\1\u00d3\20\uffff\1\u00d1\6\uffff\1\u00d2",
+            "\1\u00b3\20\uffff\1\u00b4",
+            "\1\u00b5",
+            "\1\u00b6",
+            "\1\u00b7\17\uffff\1\u00b8\3\uffff\1\u00b9",
+            "\1\u00ba\14\uffff\1\u00bb",
+            "\1\u00bc",
+            "\1\u00c0\13\uffff\1\u00be\1\u00bd\1\u00bf",
+            "\1\u00c1",
+            "\1\u00c3\4\uffff\1\u00c2",
+            "\1\u00c4",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\2\67\1\u00c6\27\67",
+            "\1\u00c9\12\uffff\1\u00c8",
+            "\1\u00ca",
+            "\1\u00cb",
+            "\1\u00cd\10\uffff\1\u00cc",
+            "\1\u00ce",
+            "\1\u00d1\20\uffff\1\u00cf\6\uffff\1\u00d0",
+            "\1\u00d2",
+            "\1\u00d3",
             "\1\u00d4",
             "\1\u00d5",
             "\1\u00d6",
             "\1\u00d7",
             "\1\u00d8",
             "\1\u00d9",
-            "\1\u00da",
-            "\1\u00db",
-            "\1\u00dd\16\uffff\1\u00dc\1\u00de",
-            "\1\u00df",
-            "\1\u00e0\1\uffff\1\u00e1",
+            "\1\u00da\2\uffff\1\u00dc\16\uffff\1\u00db\1\u00dd",
+            "\1\u00de",
+            "\1\u00df\1\uffff\1\u00e0",
+            "\1\u00e1",
             "\1\u00e2",
             "\1\u00e3",
             "\1\u00e4",
             "\1\u00e5",
-            "\1\u00e6",
-            "\1\u00e8\3\uffff\1\u00e7",
+            "\1\u00e7\3\uffff\1\u00e6",
+            "\1\u00e8",
             "\1\u00e9",
             "\1\u00ea",
             "\1\u00eb",
-            "\1\u00ec",
-            "\1\u00ed",
+            "\1\u00ec\5\uffff\1\u00ed",
             "\1\u00ee",
             "\1\u00ef",
-            "\1\u00f0",
-            "\1\u00f1\5\uffff\1\u00f2",
+            "\1\u00f0\1\u00f1",
+            "\1\u00f2",
             "\1\u00f3",
-            "\1\u00f4",
-            "\1\u00f5\1\u00f6",
-            "\1\u00f7",
-            "\1\u00f8",
-            "\1\u00f9\16\uffff\1\u00fa",
-            "\1\u00fc\16\uffff\1\u00fd\1\u00fb",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u00f4\16\uffff\1\u00f5",
+            "\1\u00f7\16\uffff\1\u00f8\1\u00f6",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u00fa",
+            "\1\u00fb",
+            "\1\u00fc\7\uffff\1\u00fd",
+            "\1\u00fe",
             "\1\u00ff",
-            "\1\u0100",
-            "\1\u0101\7\uffff\1\u0102",
-            "\1\u0103",
+            "\1\u0101\1\u0100",
+            "\1\u0102",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u0104",
-            "\1\u0106\1\u0105",
+            "\1\u0105",
+            "",
             "\1\u0107",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u0108",
             "\1\u0109",
-            "\1\u010b\3\uffff\1\u010a",
+            "\1\u010a",
+            "\1\u010b",
             "\1\u010c",
-            "\1\u010d",
-            "",
             "",
             "",
             "",
@@ -6154,7 +6080,7 @@ public class InternalTableDSLLexer extends Lexer {
             "",
             "",
             "",
-            "\1\u010f",
+            "\1\u010d",
             "",
             "",
             "",
@@ -6174,74 +6100,76 @@ public class InternalTableDSLLexer extends Lexer {
             "",
             "",
             "",
-            "\1\u0111",
+            "\1\u010f",
             "",
             "",
             "",
             "",
             "",
             "",
-            "\1\u0113",
+            "\1\u0111",
             "",
-            "\1\u00a9\34\uffff\32\u00a9\4\uffff\1\u00a9\1\uffff\32\u00a9",
-            "\1\u0114\2\uffff\1\u0116\7\uffff\1\u0115\12\u0114\7\uffff\32\u0114\4\uffff\1\u0114\1\uffff\32\u0114",
+            "\1\u00a8\34\uffff\32\u00a8\4\uffff\1\u00a8\1\uffff\32\u00a8",
+            "\1\u0113\2\uffff\1\u0112\7\uffff\1\u0114\12\u0113\7\uffff\32\u0113\4\uffff\1\u0113\1\uffff\32\u0113",
             "",
-            "\12\u00ab\10\uffff\1\u00ad\1\uffff\3\u00ad\5\uffff\1\u00ad\22\uffff\1\u00ab\2\uffff\1\u00ad\1\uffff\3\u00ad\5\uffff\1\u00ad",
+            "\12\u00aa\10\uffff\1\u00ac\1\uffff\3\u00ac\5\uffff\1\u00ac\22\uffff\1\u00aa\2\uffff\1\u00ac\1\uffff\3\u00ac\5\uffff\1\u00ac",
             "",
             "",
             "",
+            "\1\u0115",
+            "\1\u0116",
             "\1\u0117",
             "\1\u0118",
-            "\1\u0119",
-            "\1\u011a",
+            "\1\u011a\10\uffff\1\u0119",
             "\1\u011b",
-            "\1\u011d\10\uffff\1\u011c",
+            "\1\u011c",
+            "\1\u011d",
             "\1\u011e",
             "\1\u011f",
             "\1\u0120",
-            "\1\u0121",
-            "\1\u0122",
-            "\1\u0123",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u0126\1\u0125",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u0123\1\u0122",
+            "\1\u0124",
+            "\1\u0125",
+            "\1\u0126",
             "\1\u0127",
             "\1\u0128",
             "\1\u0129",
             "\1\u012a",
             "\1\u012b",
-            "\1\u012c",
-            "\1\u012d",
-            "\1\u012e",
-            "\1\u012f\3\uffff\1\u0130",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u012c\3\uffff\1\u012d",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "",
-            "\1\u0132",
+            "\1\u012f",
             "",
+            "\1\u0130",
+            "\1\u0131",
+            "\1\u0132",
             "\1\u0133",
             "\1\u0134",
             "\1\u0135",
             "\1\u0136",
             "\1\u0137",
             "\1\u0138",
-            "\1\u0139",
-            "\1\u013a",
+            "\1\u013a\14\uffff\1\u0139",
             "\1\u013b",
-            "\1\u013d\14\uffff\1\u013c",
+            "\1\u013c",
+            "\1\u013d",
             "\1\u013e",
             "\1\u013f",
             "\1\u0140",
-            "\1\u0141",
-            "\1\u0142",
-            "\1\u0143",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u0145\37\uffff\1\u0146\12\uffff\1\u0147",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u0142\37\uffff\1\u0143\12\uffff\1\u0144",
+            "\1\u0145",
+            "\1\u0146",
+            "\1\u0147",
             "\1\u0148",
             "\1\u0149",
             "\1\u014a",
             "\1\u014b",
-            "\1\u014c",
-            "\1\u014d",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\14\70\1\u014e\15\70",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\14\67\1\u014c\15\67",
+            "\1\u014e",
+            "\1\u014f",
             "\1\u0150",
             "\1\u0151",
             "\1\u0152",
@@ -6250,65 +6178,65 @@ public class InternalTableDSLLexer extends Lexer {
             "\1\u0155",
             "\1\u0156",
             "\1\u0157",
-            "\1\u0158",
-            "\1\u0159",
-            "\1\u015a",
-            "\1\u015b",
-            "\1\u015c",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\24\67\1\u0158\5\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u015b\10\uffff\1\u015c",
             "\1\u015d",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\24\70\1\u015e\5\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u0161\10\uffff\1\u0162",
+            "\1\u015e",
+            "\1\u015f",
+            "\1\u0160",
+            "\1\u0161",
+            "\1\u0162",
             "\1\u0163",
             "\1\u0164",
-            "\1\u0165",
-            "\1\u0166",
+            "\1\u0166\3\uffff\1\u0165",
             "\1\u0167",
-            "\1\u0168",
-            "\1\u0169",
+            "",
+            "\1\u0169\1\u0168",
             "\1\u016a",
-            "\1\u016c\3\uffff\1\u016b",
+            "\1\u016b",
+            "\1\u016c",
             "\1\u016d",
-            "",
-            "\1\u016f\1\u016e",
+            "\1\u016e",
+            "\1\u016f",
             "\1\u0170",
-            "\1\u0171",
-            "\1\u0172",
-            "\1\u0173",
+            "\1\u0172\110\uffff\1\u0171",
+            "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "",
+            "",
             "\1\u0174",
             "\1\u0175",
             "\1\u0176",
-            "\1\u0178\110\uffff\1\u0177",
-            "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u0177",
+            "\1\u0179\3\uffff\1\u0178",
             "\1\u017a",
-            "\1\u017c\3\uffff\1\u017b",
-            "\1\u017d",
-            "",
-            "",
             "",
             "",
             "",
             "",
-            "\1\u017e",
-            "\1\u0114\2\uffff\1\u0116\7\uffff\1\u0115\12\u0114\7\uffff\32\u0114\4\uffff\1\u0114\1\uffff\32\u0114",
-            "\1\u0181\5\uffff\1\u017f\26\uffff\32\u0181\3\uffff\1\u0180\1\u0181\1\uffff\32\u0181",
+            "\1\u017b",
             "",
+            "\1\u0113\2\uffff\1\u0112\7\uffff\1\u0114\12\u0113\7\uffff\32\u0113\4\uffff\1\u0113\1\uffff\32\u0113",
+            "\1\u017f\5\uffff\1\u017d\26\uffff\32\u017f\3\uffff\1\u017e\1\u017f\1\uffff\32\u017f",
+            "\1\u0180",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u0182",
             "\1\u0183",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u0185",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\4\67\1\u0184\25\67",
             "\1\u0186",
             "\1\u0187",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\4\70\1\u0188\25\70",
-            "\1\u018a",
-            "\1\u018b",
-            "\1\u018c",
-            "\1\u018d\21\uffff\1\u018e",
-            "\1\u0190\17\uffff\1\u018f",
+            "\1\u0188",
+            "\1\u0189\21\uffff\1\u018a",
+            "\1\u018c\17\uffff\1\u018b",
+            "\1\u018d",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u0190",
             "\1\u0191",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u0192",
+            "\1\u0193",
             "\1\u0194",
             "\1\u0195",
             "\1\u0196",
@@ -6316,16 +6244,16 @@ public class InternalTableDSLLexer extends Lexer {
             "\1\u0198",
             "\1\u0199",
             "\1\u019a",
+            "",
             "\1\u019b",
             "\1\u019c",
             "\1\u019d",
             "\1\u019e",
-            "",
-            "\1\u019f",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u01a0",
             "\1\u01a1",
             "\1\u01a2",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u01a3",
             "\1\u01a4",
             "\1\u01a5",
             "\1\u01a6",
@@ -6335,92 +6263,92 @@ public class InternalTableDSLLexer extends Lexer {
             "\1\u01aa",
             "\1\u01ab",
             "\1\u01ac",
+            "",
             "\1\u01ad",
             "\1\u01ae",
-            "\1\u01af",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u01b0",
-            "",
             "\1\u01b1",
             "\1\u01b2",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u01b3",
             "\1\u01b4",
             "\1\u01b5",
             "\1\u01b6",
             "\1\u01b7",
+            "",
             "\1\u01b8",
             "\1\u01b9",
             "\1\u01ba",
-            "",
             "\1\u01bb",
             "\1\u01bc",
             "\1\u01bd",
-            "\1\u01be",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u01bf",
             "\1\u01c0",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u01c2",
+            "\1\u01c2\4\uffff\1\u01c1",
             "\1\u01c3",
-            "\1\u01c5\4\uffff\1\u01c4",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u01c7",
-            "\1\u01c8",
             "",
-            "\1\u01c9",
             "",
-            "",
-            "\1\u01ca",
+            "\1\u01c4",
+            "\1\u01c5",
+            "\1\u01c6",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u01c8",
+            "\1\u01c9",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u01cb",
             "\1\u01cc",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u01ce",
+            "\1\u01ce\12\uffff\1\u01cd",
             "\1\u01cf",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u01d0",
             "\1\u01d1",
             "\1\u01d2",
-            "\1\u01d4\12\uffff\1\u01d3",
+            "\1\u01d3",
+            "\1\u01d4",
             "\1\u01d5",
             "\1\u01d6",
             "\1\u01d7",
             "\1\u01d8",
             "\1\u01d9",
-            "\1\u01da",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u01db",
+            "",
+            "",
             "\1\u01dc",
             "\1\u01dd",
             "\1\u01de",
+            "",
             "\1\u01df",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u01e0",
             "\1\u01e1",
+            "\1\u01e2",
             "",
-            "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u01e3",
+            "\1\u0112",
+            "\1\u017f\34\uffff\32\u017f\4\uffff\1\u017f\1\uffff\32\u017f",
+            "\1\u01e3\2\uffff\1\u0112\7\uffff\1\u0114\12\u01e3\7\uffff\32\u01e3\4\uffff\1\u01e3\1\uffff\32\u01e3",
             "\1\u01e4",
-            "\1\u01e5",
+            "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u01e6",
-            "\1\u0116",
-            "\1\u0181\34\uffff\32\u0181\4\uffff\1\u0181\1\uffff\32\u0181",
-            "\1\u01e7\2\uffff\1\u0116\7\uffff\1\u0115\12\u01e7\7\uffff\32\u01e7\4\uffff\1\u01e7\1\uffff\32\u01e7",
+            "\1\u01e7",
             "",
             "\1\u01e8",
-            "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u01ea",
             "\1\u01eb",
             "\1\u01ec",
-            "",
             "\1\u01ed",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u01ef",
+            "\1\u01ee",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "",
+            "",
             "\1\u01f0",
-            "\1\u01f1",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u01f2",
             "\1\u01f3",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "",
-            "",
+            "\1\u01f4",
             "\1\u01f5",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u01f6",
             "\1\u01f7",
             "\1\u01f8",
             "\1\u01f9",
@@ -6429,96 +6357,95 @@ public class InternalTableDSLLexer extends Lexer {
             "\1\u01fc",
             "\1\u01fd",
             "\1\u01fe",
+            "",
             "\1\u01ff",
             "\1\u0200",
             "\1\u0201",
             "\1\u0202",
-            "\1\u0203",
-            "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u0204",
             "\1\u0205",
             "\1\u0206",
-            "\1\u0207",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u0208",
             "\1\u0209",
             "\1\u020a",
             "\1\u020b",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u020c",
             "\1\u020d",
+            "",
             "\1\u020e",
             "\1\u020f",
             "\1\u0210",
             "\1\u0211",
-            "\1\u0213\7\uffff\1\u0212",
-            "",
+            "\1\u0212",
+            "\1\u0213",
             "\1\u0214",
             "\1\u0215",
-            "\1\u0216",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u0217",
             "\1\u0218",
             "\1\u0219",
-            "\1\u021a",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u021b\16\uffff\1\u021a",
             "\1\u021c",
-            "\1\u021d",
-            "\1\u021e",
-            "\1\u0220\16\uffff\1\u021f",
-            "\1\u0221",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u021f",
+            "\1\u0220",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u0222",
+            "\1\u0223",
             "\1\u0224",
-            "\1\u0225",
             "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u0226",
-            "\1\u0227",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "",
+            "\1\67\13\uffff\12\67\7\uffff\22\67\1\u0227\7\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u0229",
             "\1\u022a",
             "\1\u022b",
-            "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u022c",
             "\1\u022d",
-            "",
-            "\1\70\13\uffff\12\70\7\uffff\22\70\1\u022e\7\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u022e",
+            "\1\u022f",
             "\1\u0230",
             "\1\u0231",
             "\1\u0232",
             "\1\u0233",
-            "\1\u0234",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u0235",
             "\1\u0236",
+            "",
             "\1\u0237",
             "\1\u0238",
             "\1\u0239",
             "\1\u023a",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u023b",
             "\1\u023c",
-            "\1\u023d",
             "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u01e3\2\uffff\1\u0112\7\uffff\1\u0114\12\u01e3\7\uffff\32\u01e3\4\uffff\1\u01e3\1\uffff\32\u01e3",
             "\1\u023e",
             "",
             "\1\u023f",
             "\1\u0240",
+            "\1\u0241",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u01e7\2\uffff\1\u0116\7\uffff\1\u0115\12\u01e7\7\uffff\32\u01e7\4\uffff\1\u01e7\1\uffff\32\u01e7",
-            "\1\u0242",
-            "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u0243",
             "\1\u0244",
             "\1\u0245",
             "\1\u0246",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "",
+            "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u0248",
             "\1\u0249",
             "\1\u024a",
             "\1\u024b",
-            "",
-            "",
-            "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u024c",
             "\1\u024d",
             "\1\u024e",
             "\1\u024f",
@@ -6526,357 +6453,352 @@ public class InternalTableDSLLexer extends Lexer {
             "\1\u0251",
             "\1\u0252",
             "\1\u0253",
-            "\1\u0254",
-            "\1\u0255",
+            "\1\u0255\46\uffff\1\u0254",
             "\1\u0256",
-            "\1\u0257",
-            "\1\u0258",
-            "\1\u025a\36\uffff\1\u025b\7\uffff\1\u0259",
-            "\1\u025c",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u0260",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u025a",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "",
+            "\1\u025c",
+            "\1\u025d",
+            "\1\u025e",
+            "\1\u025f",
+            "\1\u0260",
+            "\1\u0261",
             "\1\u0262",
-            "\1\u0263",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u0264",
-            "\1\u0265",
-            "\1\u0266",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u0267",
             "\1\u0268",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u026a",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\23\67\1\u0269\6\67",
+            "",
+            "\1\u026b",
+            "\1\u026c",
             "\1\u026d",
             "\1\u026e",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\23\70\1\u026f\6\70",
+            "\1\u026f",
+            "\1\u0270",
+            "",
             "",
             "\1\u0271",
             "\1\u0272",
+            "",
             "\1\u0273",
-            "\1\u0274",
-            "\1\u0275",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\22\67\1\u0274\7\67",
             "\1\u0276",
             "",
-            "",
             "\1\u0277",
             "\1\u0278",
-            "\1\u0279",
-            "\1\u027a",
             "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u027a",
             "\1\u027b",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\22\70\1\u027c\7\70",
+            "\1\u027c",
+            "\1\u027d",
             "\1\u027e",
-            "",
             "\1\u027f",
-            "\1\u0280",
-            "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u0281",
             "\1\u0282",
-            "\1\u0283",
-            "\1\u0284",
+            "\1\u0283\16\uffff\1\u0284",
+            "",
             "\1\u0285",
-            "\1\u0286",
-            "\1\u0287",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\67\13\uffff\12\67\7\uffff\22\67\1\u0286\7\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u0288",
             "\1\u0289",
             "\1\u028a",
-            "\1\u028b\16\uffff\1\u028c",
-            "",
+            "\1\u028b",
+            "\1\u028c",
             "\1\u028d",
-            "\1\70\13\uffff\12\70\7\uffff\22\70\1\u028e\7\70\4\uffff\1\70\1\uffff\32\70",
+            "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u028f",
             "\1\u0290",
             "\1\u0291",
-            "\1\u0292",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\17\67\1\u0293\12\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u0295",
             "\1\u0296",
-            "\1\u0297",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\17\70\1\u0299\12\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u029b",
+            "\1\u0297",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u029c",
-            "",
             "\1\u029d",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u029e",
+            "\1\u029f",
+            "\1\u02a0",
+            "\1\u02a1",
             "\1\u02a2",
             "\1\u02a3",
             "\1\u02a4",
             "\1\u02a5",
+            "",
+            "",
+            "",
             "\1\u02a6",
+            "",
             "\1\u02a7",
-            "\1\u02a8",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u02a9",
-            "\1\u02aa",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u02ab",
             "\1\u02ac",
+            "\1\u02ad",
             "",
+            "\1\u02ae",
             "",
             "",
-            "\1\u02ad",
+            "\1\u02af",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u02b1",
             "",
-            "\1\u02ae",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u02b0",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
             "\1\u02b2",
             "\1\u02b3",
             "\1\u02b4",
-            "",
             "\1\u02b5",
-            "",
-            "",
-            "\1\u02b6",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u02b7",
             "\1\u02b8",
-            "",
             "\1\u02b9",
             "\1\u02ba",
-            "\1\u02bb",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "",
             "\1\u02bc",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u02bd",
             "\1\u02be",
+            "",
             "\1\u02bf",
-            "\1\u02c0",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u02c1",
-            "\1\u02c2",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u02c3",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u02c4",
             "",
             "\1\u02c5",
-            "\1\u02c6",
-            "\1\u02c7",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "",
             "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u02c8",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "",
+            "\1\u02c9",
             "\1\u02ca",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u02cb",
             "\1\u02cc",
             "\1\u02cd",
-            "",
             "\1\u02ce",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
             "",
-            "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u02d1",
             "",
             "\1\u02d2",
+            "",
             "\1\u02d3",
             "\1\u02d4",
+            "\1\u02d5",
             "",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u02d7",
             "",
-            "\1\u02d8",
             "",
+            "\1\u02d6",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u02d8",
             "\1\u02d9",
             "\1\u02da",
             "\1\u02db",
-            "",
-            "",
-            "",
-            "",
             "\1\u02dc",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u02dd",
             "\1\u02de",
-            "\1\u02df",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u02e0",
             "\1\u02e1",
-            "\1\u02e2",
+            "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "",
             "\1\u02e3",
             "\1\u02e4",
-            "\1\u02e5",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u02e7",
-            "\1\u02e8",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "",
-            "\1\u02ea",
+            "\1\u02e8",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u02eb",
             "\1\u02ec",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u02ee",
             "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u02ee",
             "\1\u02ef",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u02f2",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "",
+            "\1\u02f1",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u02f3",
+            "\1\u02f4",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
             "\1\u02f5",
+            "",
             "\1\u02f6",
             "\1\u02f7",
             "\1\u02f8",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
             "",
+            "",
+            "\1\u02f9",
             "\1\u02fa",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u02fb",
             "\1\u02fc",
             "\1\u02fd",
-            "",
             "\1\u02fe",
+            "\1\u02ff\16\uffff\1\u0300",
+            "",
             "",
-            "\1\u02ff",
-            "\1\u0300",
             "\1\u0301",
+            "\1\u0302",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u0305",
+            "\1\u0306",
+            "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u0309",
+            "\1\u030a",
+            "\1\u030b",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u030d",
             "",
+            "\1\u030e",
+            "\1\u030f",
             "",
-            "\1\u0302",
-            "\1\u0303",
-            "\1\u0304",
-            "\1\u0305\16\uffff\1\u0306",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "",
             "",
-            "\1\u0307",
-            "\1\u0308",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u030b",
-            "\1\u030c",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u030f",
-            "\1\u0310",
-            "\1\u0311",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u0313",
             "\1\u0314",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "",
-            "\1\u0315",
             "\1\u0316",
+            "\1\u0317",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "",
+            "\1\u0319",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u031b",
             "\1\u031c",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "",
-            "\1\u031e",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u031f",
             "\1\u0320",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u0321",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u0323",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
             "",
-            "\1\u0323",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
             "\1\u0325",
             "\1\u0326",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u0329",
-            "\1\u032a",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
             "",
             "",
-            "\1\u032c",
-            "\1\u032d",
+            "\1\u0327",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "",
             "",
+            "\1\u0329",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u032b",
             "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u032e",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
             "",
             "",
-            "\1\u0330",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u0332",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u0334",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u0336",
             "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u0331",
             "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "",
+            "\1\u0333",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u0339",
-            "\1\u033a",
+            "\1\u0335",
+            "\1\u0336",
+            "\1\u0337",
             "",
+            "\1\u0338",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u0339",
+            "\1\u033a",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "",
             "\1\u033c",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "",
             "",
             "\1\u033e",
-            "\1\u033f",
             "",
-            "\1\u0340",
-            "\1\u0341",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
             "",
-            "\1\u0343",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u0340",
             "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u0342",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\u0344",
             "\1\u0345",
-            "",
             "\1\u0346",
             "",
+            "\1\u0347",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "",
             "\1\u0349",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "\1\u034a",
+            "",
             "\1\u034b",
             "\1\u034c",
             "\1\u034d",
-            "",
             "\1\u034e",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "",
-            "",
+            "\1\u034f",
+            "\1\u0350",
             "\1\u0351",
-            "",
             "\1\u0352",
-            "\1\u0353",
-            "\1\u0354",
-            "\1\u0355",
-            "",
-            "",
-            "\1\u0356",
-            "\1\u0357",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             "\1\u0358",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
-            "\1\u035d",
             "",
             "",
             "",
             "",
-            "\1\70\13\uffff\12\70\7\uffff\32\70\4\uffff\1\70\1\uffff\32\70",
+            "",
+            "\1\67\13\uffff\12\67\7\uffff\32\67\4\uffff\1\67\1\uffff\32\67",
             ""
     };
 
@@ -6910,7 +6832,7 @@ public class InternalTableDSLLexer extends Lexer {
             this.transition = DFA24_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | T__135 | T__136 | T__137 | T__138 | T__139 | T__140 | T__141 | T__142 | T__143 | T__144 | T__145 | T__146 | T__147 | T__148 | T__149 | T__150 | T__151 | T__152 | T__153 | T__154 | T__155 | T__156 | T__157 | T__158 | T__159 | T__160 | T__161 | T__162 | T__163 | T__164 | T__165 | T__166 | T__167 | T__168 | T__169 | T__170 | T__171 | T__172 | T__173 | T__174 | T__175 | T__176 | T__177 | T__178 | T__179 | T__180 | T__181 | T__182 | T__183 | T__184 | RULE_THEME_RESOURCE | RULE_EVENT_TOPIC | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            return "1:1: Tokens : ( T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | T__135 | T__136 | T__137 | T__138 | T__139 | T__140 | T__141 | T__142 | T__143 | T__144 | T__145 | T__146 | T__147 | T__148 | T__149 | T__150 | T__151 | T__152 | T__153 | T__154 | T__155 | T__156 | T__157 | T__158 | T__159 | T__160 | T__161 | T__162 | T__163 | T__164 | T__165 | T__166 | T__167 | T__168 | T__169 | T__170 | T__171 | T__172 | T__173 | T__174 | T__175 | T__176 | T__177 | T__178 | T__179 | T__180 | T__181 | RULE_THEME_RESOURCE | RULE_EVENT_TOPIC | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             IntStream input = _input;
@@ -6944,25 +6866,25 @@ public class InternalTableDSLLexer extends Lexer {
 
                         else if ( (LA24_0=='u') ) {s = 12;}
 
-                        else if ( (LA24_0=='b') ) {s = 13;}
+                        else if ( (LA24_0=='v') ) {s = 13;}
 
-                        else if ( (LA24_0=='v') ) {s = 14;}
+                        else if ( (LA24_0=='c') ) {s = 14;}
 
-                        else if ( (LA24_0=='c') ) {s = 15;}
+                        else if ( (LA24_0=='i') ) {s = 15;}
 
-                        else if ( (LA24_0=='i') ) {s = 16;}
+                        else if ( (LA24_0=='h') ) {s = 16;}
 
-                        else if ( (LA24_0=='h') ) {s = 17;}
+                        else if ( (LA24_0=='l') ) {s = 17;}
 
-                        else if ( (LA24_0=='l') ) {s = 18;}
+                        else if ( (LA24_0=='o') ) {s = 18;}
 
-                        else if ( (LA24_0=='o') ) {s = 19;}
+                        else if ( (LA24_0=='n') ) {s = 19;}
 
-                        else if ( (LA24_0=='n') ) {s = 20;}
+                        else if ( (LA24_0=='.') ) {s = 20;}
 
-                        else if ( (LA24_0=='g') ) {s = 21;}
+                        else if ( (LA24_0=='b') ) {s = 21;}
 
-                        else if ( (LA24_0=='.') ) {s = 22;}
+                        else if ( (LA24_0=='g') ) {s = 22;}
 
                         else if ( (LA24_0=='+') ) {s = 23;}
 
diff --git a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSLParser.java b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSLParser.java
index 528e2db..da34d4e 100644
--- a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSLParser.java
+++ b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/parser/antlr/internal/InternalTableDSLParser.java
@@ -1,3 +1,17 @@
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
+ */
 package org.eclipse.osbp.xtext.table.parser.antlr.internal;
 
 import org.eclipse.xtext.*;
@@ -23,7 +37,7 @@ import java.util.HashMap;
 @SuppressWarnings("all")
 public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_THEME_RESOURCE", "RULE_INT", "RULE_HEX", "RULE_DECIMAL", "RULE_EVENT_TOPIC", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'package'", "'{'", "'}'", "'table'", "'describedBy'", "'as'", "'selection'", "'multiple'", "'single'", "'alwaysSelected'", "'rowHeader'", "'polling'", "'filtering'", "'embedded'", "'toolbar'", "'using'", "'selectById'", "'bean'", "'preorder'", "'ascending'", "'value'", "'collapse'", "'icon'", "'image'", "'intervals'", "'hidelabel'", "'lookups'", "'formatter'", "'path'", "'dynamic'", "'resize'", "'tooltipPattern'", "'taskId'", "'allColumns'", "'ordinal'", "'column'", "'measure'", "'derived'", "'level'", "'property'", "'aggregation'", "'upToNumber'", "'upToInteger'", "'daysInPast'", "'integer'", "'number'", "'string'", "'datamart'", "'axis'", "'rowheight'", "'details'", "'notifyOnSelect'", "'textcolor'", "'cellcolor'", "'trend'", "'tooltip'", "'grid'", "'selectalways'", "'rowheader'", "'editable'", "'prop'", "'style'", "'dto'", "'.'", "'buttonStyle'", "'eventTopic'", "'htmlStyle'", "'boolStyle'", "'dateStyle'", "'format'", "'numberStyle'", "'progressbarStyle'", "'max'", "'indicatorStyle'", "'greenFrom'", "'redUntil'", "'textStyle'", "'imageStyle'", "'then'", "'+'", "'-'", "'import'", "'static'", "'extension'", "'*'", "'ns'", "';'", "'@'", "'('", "','", "')'", "'='", "'#'", "'['", "']'", "'+='", "'-='", "'*='", "'/='", "'%='", "'<'", "'>'", "'>='", "'||'", "'&&'", "'=='", "'!='", "'==='", "'!=='", "'instanceof'", "'->'", "'..<'", "'..'", "'=>'", "'<>'", "'?:'", "'**'", "'/'", "'%'", "'!'", "'++'", "'--'", "'::'", "'?.'", "'|'", "'if'", "'else'", "'switch'", "':'", "'default'", "'case'", "'for'", "'while'", "'do'", "'var'", "'val'", "'extends'", "'super'", "'new'", "'false'", "'true'", "'null'", "'typeof'", "'throw'", "'return'", "'try'", "'finally'", "'synchronized'", "'catch'", "'?'", "'&'", "'equal'", "'greater equal'", "'greater than'", "'lower equal'", "'lower than'", "'not equal'", "'rising'", "'bad-rising'", "'sloping'", "'good-sloping'", "'stagnating'", "'hidden'", "'explicit'", "'indexed'", "'columns'", "'rows'", "'pages'", "'sections'", "'chapters'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_THEME_RESOURCE", "RULE_INT", "RULE_HEX", "RULE_DECIMAL", "RULE_EVENT_TOPIC", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'package'", "'{'", "'}'", "'table'", "'describedBy'", "'as'", "'selection'", "'multiple'", "'single'", "'alwaysSelected'", "'rowHeader'", "'filtering'", "'embedded'", "'toolbar'", "'using'", "'readOnly'", "'selectById'", "'preorder'", "'ascending'", "'value'", "'collapse'", "'icon'", "'image'", "'intervals'", "'hidelabel'", "'lookups'", "'formatter'", "'path'", "'dynamic'", "'resize'", "'tooltipPattern'", "'taskId'", "'allColumns'", "'ordinal'", "'column'", "'measure'", "'derived'", "'level'", "'property'", "'aggregation'", "'upToNumber'", "'upToInteger'", "'daysInPast'", "'integer'", "'number'", "'string'", "'datamart'", "'axis'", "'rowheight'", "'details'", "'notifyOnSelect'", "'textcolor'", "'cellcolor'", "'trend'", "'tooltip'", "'editable'", "'prop'", "'style'", "'dto'", "'.'", "'buttonStyle'", "'eventTopic'", "'htmlStyle'", "'boolStyle'", "'dateStyle'", "'format'", "'numberStyle'", "'progressbarStyle'", "'max'", "'indicatorStyle'", "'greenFrom'", "'redUntil'", "'textStyle'", "'blobImageStyle'", "'imageStyle'", "'then'", "'+'", "'-'", "'import'", "'static'", "'extension'", "'*'", "'ns'", "';'", "'@'", "'('", "','", "')'", "'='", "'#'", "'['", "']'", "'+='", "'-='", "'*='", "'/='", "'%='", "'<'", "'>'", "'>='", "'||'", "'&&'", "'=='", "'!='", "'==='", "'!=='", "'instanceof'", "'->'", "'..<'", "'..'", "'=>'", "'<>'", "'?:'", "'**'", "'/'", "'%'", "'!'", "'++'", "'--'", "'::'", "'?.'", "'|'", "'if'", "'else'", "'switch'", "':'", "'default'", "'case'", "'for'", "'while'", "'do'", "'var'", "'val'", "'extends'", "'super'", "'new'", "'false'", "'true'", "'null'", "'typeof'", "'throw'", "'return'", "'try'", "'finally'", "'synchronized'", "'catch'", "'?'", "'&'", "'equal'", "'greater equal'", "'greater than'", "'lower equal'", "'lower than'", "'not equal'", "'rising'", "'bad-rising'", "'sloping'", "'good-sloping'", "'stagnating'", "'hidden'", "'explicit'", "'indexed'", "'columns'", "'rows'", "'pages'", "'sections'", "'chapters'"
     };
     public static final int T__144=144;
     public static final int T__143=143;
@@ -122,11 +136,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     public static final int T__102=102;
     public static final int T__94=94;
     public static final int T__101=101;
-    public static final int T__184=184;
-    public static final int T__183=183;
     public static final int T__90=90;
     public static final int T__180=180;
-    public static final int T__182=182;
     public static final int T__181=181;
     public static final int T__19=19;
     public static final int T__15=15;
@@ -311,7 +322,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             int alt1=2;
             int LA1_0 = input.LA(1);
 
-            if ( (LA1_0==96) ) {
+            if ( (LA1_0==93) ) {
                 alt1=1;
             }
             switch (alt1) {
@@ -950,7 +961,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableOption"
-    // InternalTableDSL.g:313:1: ruleTableOption returns [EObject current=null] : (this_TableSelection_0= ruleTableSelection | this_TableTable_1= ruleTableTable | this_TableGrid_2= ruleTableGrid | this_TableBean_3= ruleTableBean ) ;
+    // InternalTableDSL.g:313:1: ruleTableOption returns [EObject current=null] : (this_TableSelection_0= ruleTableSelection | this_TableTable_1= ruleTableTable | this_TableGrid_2= ruleTableGrid ) ;
     public final EObject ruleTableOption() throws RecognitionException {
         EObject current = null;
 
@@ -960,39 +971,32 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
         EObject this_TableGrid_2 = null;
 
-        EObject this_TableBean_3 = null;
-
 
 
         	enterRule();
 
         try {
-            // InternalTableDSL.g:319:2: ( (this_TableSelection_0= ruleTableSelection | this_TableTable_1= ruleTableTable | this_TableGrid_2= ruleTableGrid | this_TableBean_3= ruleTableBean ) )
-            // InternalTableDSL.g:320:2: (this_TableSelection_0= ruleTableSelection | this_TableTable_1= ruleTableTable | this_TableGrid_2= ruleTableGrid | this_TableBean_3= ruleTableBean )
+            // InternalTableDSL.g:319:2: ( (this_TableSelection_0= ruleTableSelection | this_TableTable_1= ruleTableTable | this_TableGrid_2= ruleTableGrid ) )
+            // InternalTableDSL.g:320:2: (this_TableSelection_0= ruleTableSelection | this_TableTable_1= ruleTableTable | this_TableGrid_2= ruleTableGrid )
             {
-            // InternalTableDSL.g:320:2: (this_TableSelection_0= ruleTableSelection | this_TableTable_1= ruleTableTable | this_TableGrid_2= ruleTableGrid | this_TableBean_3= ruleTableBean )
-            int alt6=4;
+            // InternalTableDSL.g:320:2: (this_TableSelection_0= ruleTableSelection | this_TableTable_1= ruleTableTable | this_TableGrid_2= ruleTableGrid )
+            int alt6=3;
             switch ( input.LA(1) ) {
             case 21:
                 {
                 alt6=1;
                 }
                 break;
-            case 18:
+            case 30:
                 {
                 alt6=2;
                 }
                 break;
-            case 71:
+            case 70:
                 {
                 alt6=3;
                 }
                 break;
-            case 32:
-                {
-                alt6=4;
-                }
-                break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
@@ -1068,28 +1072,6 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
                     break;
-                case 4 :
-                    // InternalTableDSL.g:348:3: this_TableBean_3= ruleTableBean
-                    {
-                    if ( state.backtracking==0 ) {
-
-                      			newCompositeNode(grammarAccess.getTableOptionAccess().getTableBeanParserRuleCall_3());
-                      		
-                    }
-                    pushFollow(FOLLOW_2);
-                    this_TableBean_3=ruleTableBean();
-
-                    state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      			current = this_TableBean_3;
-                      			afterParserOrEnumRuleCall();
-                      		
-                    }
-
-                    }
-                    break;
 
             }
 
@@ -1115,7 +1097,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableSelection"
-    // InternalTableDSL.g:360:1: entryRuleTableSelection returns [EObject current=null] : iv_ruleTableSelection= ruleTableSelection EOF ;
+    // InternalTableDSL.g:351:1: entryRuleTableSelection returns [EObject current=null] : iv_ruleTableSelection= ruleTableSelection EOF ;
     public final EObject entryRuleTableSelection() throws RecognitionException {
         EObject current = null;
 
@@ -1123,8 +1105,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:360:55: (iv_ruleTableSelection= ruleTableSelection EOF )
-            // InternalTableDSL.g:361:2: iv_ruleTableSelection= ruleTableSelection EOF
+            // InternalTableDSL.g:351:55: (iv_ruleTableSelection= ruleTableSelection EOF )
+            // InternalTableDSL.g:352:2: iv_ruleTableSelection= ruleTableSelection EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableSelectionRule()); 
@@ -1155,7 +1137,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableSelection"
-    // InternalTableDSL.g:367:1: ruleTableSelection returns [EObject current=null] : ( () otherlv_1= 'selection' ( ( (lv_multiSelection_2_0= 'multiple' ) ) | otherlv_3= 'single' ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_14= 'using' ( (lv_source_15_0= ruleTableDatamart ) ) )? ) ;
+    // InternalTableDSL.g:358:1: ruleTableSelection returns [EObject current=null] : ( () otherlv_1= 'selection' ( ( (lv_multiSelection_2_0= 'multiple' ) ) | otherlv_3= 'single' ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_12= 'using' ( (lv_source_13_0= ruleTableDatamart ) ) )? ) ;
     public final EObject ruleTableSelection() throws RecognitionException {
         EObject current = null;
 
@@ -1164,31 +1146,28 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         Token otherlv_3=null;
         Token lv_selectalways_5_0=null;
         Token otherlv_6=null;
-        Token lv_polling_8_0=null;
-        Token lv_filtering_10_0=null;
-        Token lv_embedded_11_0=null;
+        Token lv_filtering_8_0=null;
+        Token lv_embedded_9_0=null;
+        Token otherlv_10=null;
+        Token otherlv_11=null;
         Token otherlv_12=null;
-        Token otherlv_13=null;
-        Token otherlv_14=null;
         Enumerator lv_headerMode_7_0 = null;
 
-        AntlrDatatypeRuleToken lv_pollingTime_9_0 = null;
-
-        EObject lv_source_15_0 = null;
+        EObject lv_source_13_0 = null;
 
 
 
         	enterRule();
 
         try {
-            // InternalTableDSL.g:373:2: ( ( () otherlv_1= 'selection' ( ( (lv_multiSelection_2_0= 'multiple' ) ) | otherlv_3= 'single' ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_14= 'using' ( (lv_source_15_0= ruleTableDatamart ) ) )? ) )
-            // InternalTableDSL.g:374:2: ( () otherlv_1= 'selection' ( ( (lv_multiSelection_2_0= 'multiple' ) ) | otherlv_3= 'single' ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_14= 'using' ( (lv_source_15_0= ruleTableDatamart ) ) )? )
+            // InternalTableDSL.g:364:2: ( ( () otherlv_1= 'selection' ( ( (lv_multiSelection_2_0= 'multiple' ) ) | otherlv_3= 'single' ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_12= 'using' ( (lv_source_13_0= ruleTableDatamart ) ) )? ) )
+            // InternalTableDSL.g:365:2: ( () otherlv_1= 'selection' ( ( (lv_multiSelection_2_0= 'multiple' ) ) | otherlv_3= 'single' ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_12= 'using' ( (lv_source_13_0= ruleTableDatamart ) ) )? )
             {
-            // InternalTableDSL.g:374:2: ( () otherlv_1= 'selection' ( ( (lv_multiSelection_2_0= 'multiple' ) ) | otherlv_3= 'single' ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_14= 'using' ( (lv_source_15_0= ruleTableDatamart ) ) )? )
-            // InternalTableDSL.g:375:3: () otherlv_1= 'selection' ( ( (lv_multiSelection_2_0= 'multiple' ) ) | otherlv_3= 'single' ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_14= 'using' ( (lv_source_15_0= ruleTableDatamart ) ) )?
+            // InternalTableDSL.g:365:2: ( () otherlv_1= 'selection' ( ( (lv_multiSelection_2_0= 'multiple' ) ) | otherlv_3= 'single' ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_12= 'using' ( (lv_source_13_0= ruleTableDatamart ) ) )? )
+            // InternalTableDSL.g:366:3: () otherlv_1= 'selection' ( ( (lv_multiSelection_2_0= 'multiple' ) ) | otherlv_3= 'single' ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_12= 'using' ( (lv_source_13_0= ruleTableDatamart ) ) )?
             {
-            // InternalTableDSL.g:375:3: ()
-            // InternalTableDSL.g:376:4: 
+            // InternalTableDSL.g:366:3: ()
+            // InternalTableDSL.g:367:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -1206,7 +1185,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			newLeafNode(otherlv_1, grammarAccess.getTableSelectionAccess().getSelectionKeyword_1());
               		
             }
-            // InternalTableDSL.g:386:3: ( ( (lv_multiSelection_2_0= 'multiple' ) ) | otherlv_3= 'single' )
+            // InternalTableDSL.g:377:3: ( ( (lv_multiSelection_2_0= 'multiple' ) ) | otherlv_3= 'single' )
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -1225,13 +1204,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             }
             switch (alt7) {
                 case 1 :
-                    // InternalTableDSL.g:387:4: ( (lv_multiSelection_2_0= 'multiple' ) )
+                    // InternalTableDSL.g:378:4: ( (lv_multiSelection_2_0= 'multiple' ) )
                     {
-                    // InternalTableDSL.g:387:4: ( (lv_multiSelection_2_0= 'multiple' ) )
-                    // InternalTableDSL.g:388:5: (lv_multiSelection_2_0= 'multiple' )
+                    // InternalTableDSL.g:378:4: ( (lv_multiSelection_2_0= 'multiple' ) )
+                    // InternalTableDSL.g:379:5: (lv_multiSelection_2_0= 'multiple' )
                     {
-                    // InternalTableDSL.g:388:5: (lv_multiSelection_2_0= 'multiple' )
-                    // InternalTableDSL.g:389:6: lv_multiSelection_2_0= 'multiple'
+                    // InternalTableDSL.g:379:5: (lv_multiSelection_2_0= 'multiple' )
+                    // InternalTableDSL.g:380:6: lv_multiSelection_2_0= 'multiple'
                     {
                     lv_multiSelection_2_0=(Token)match(input,22,FOLLOW_12); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
@@ -1257,7 +1236,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:402:4: otherlv_3= 'single'
+                    // InternalTableDSL.g:393:4: otherlv_3= 'single'
                     {
                     otherlv_3=(Token)match(input,23,FOLLOW_12); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
@@ -1271,20 +1250,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:407:3: ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) ) ) )* ) ) )
-            // InternalTableDSL.g:408:4: ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) ) ) )* ) )
+            // InternalTableDSL.g:398:3: ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) ) ) )* ) ) )
+            // InternalTableDSL.g:399:4: ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) ) ) )* ) )
             {
-            // InternalTableDSL.g:408:4: ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) ) ) )* ) )
-            // InternalTableDSL.g:409:5: ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) ) ) )* )
+            // InternalTableDSL.g:399:4: ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) ) ) )* ) )
+            // InternalTableDSL.g:400:5: ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) ) ) )* )
             {
             getUnorderedGroupHelper().enter(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3());
-            // InternalTableDSL.g:412:5: ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) ) ) )* )
-            // InternalTableDSL.g:413:6: ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) ) ) )*
+            // InternalTableDSL.g:403:5: ( ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) ) ) )* )
+            // InternalTableDSL.g:404:6: ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) ) ) )*
             {
-            // InternalTableDSL.g:413:6: ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) ) ) )*
+            // InternalTableDSL.g:404:6: ( ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) ) ) )*
             loop8:
             do {
-                int alt8=7;
+                int alt8=6;
                 int LA8_0 = input.LA(1);
 
                 if ( LA8_0 == 24 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
@@ -1302,38 +1281,35 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                 else if ( LA8_0 == 28 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
                     alt8=5;
                 }
-                else if ( LA8_0 == 29 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5) ) {
-                    alt8=6;
-                }
 
 
                 switch (alt8) {
             	case 1 :
-            	    // InternalTableDSL.g:414:4: ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) )
+            	    // InternalTableDSL.g:405:4: ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:414:4: ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) )
-            	    // InternalTableDSL.g:415:5: {...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) )
+            	    // InternalTableDSL.g:405:4: ({...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) ) )
+            	    // InternalTableDSL.g:406:5: {...}? => ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableSelection", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0)");
             	    }
-            	    // InternalTableDSL.g:415:111: ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) )
-            	    // InternalTableDSL.g:416:6: ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) )
+            	    // InternalTableDSL.g:406:111: ( ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) ) )
+            	    // InternalTableDSL.g:407:6: ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 0);
-            	    // InternalTableDSL.g:419:9: ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) )
-            	    // InternalTableDSL.g:419:10: {...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) )
+            	    // InternalTableDSL.g:410:9: ({...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) ) )
+            	    // InternalTableDSL.g:410:10: {...}? => ( (lv_selectalways_5_0= 'alwaysSelected' ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableSelection", "true");
             	    }
-            	    // InternalTableDSL.g:419:19: ( (lv_selectalways_5_0= 'alwaysSelected' ) )
-            	    // InternalTableDSL.g:419:20: (lv_selectalways_5_0= 'alwaysSelected' )
+            	    // InternalTableDSL.g:410:19: ( (lv_selectalways_5_0= 'alwaysSelected' ) )
+            	    // InternalTableDSL.g:410:20: (lv_selectalways_5_0= 'alwaysSelected' )
             	    {
-            	    // InternalTableDSL.g:419:20: (lv_selectalways_5_0= 'alwaysSelected' )
-            	    // InternalTableDSL.g:420:10: lv_selectalways_5_0= 'alwaysSelected'
+            	    // InternalTableDSL.g:410:20: (lv_selectalways_5_0= 'alwaysSelected' )
+            	    // InternalTableDSL.g:411:10: lv_selectalways_5_0= 'alwaysSelected'
             	    {
             	    lv_selectalways_5_0=(Token)match(input,24,FOLLOW_12); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
@@ -1369,28 +1345,28 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // InternalTableDSL.g:437:4: ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) )
+            	    // InternalTableDSL.g:428:4: ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:437:4: ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) )
-            	    // InternalTableDSL.g:438:5: {...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) )
+            	    // InternalTableDSL.g:428:4: ({...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) ) )
+            	    // InternalTableDSL.g:429:5: {...}? => ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableSelection", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1)");
             	    }
-            	    // InternalTableDSL.g:438:111: ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) )
-            	    // InternalTableDSL.g:439:6: ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) )
+            	    // InternalTableDSL.g:429:111: ( ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) ) )
+            	    // InternalTableDSL.g:430:6: ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 1);
-            	    // InternalTableDSL.g:442:9: ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) )
-            	    // InternalTableDSL.g:442:10: {...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) )
+            	    // InternalTableDSL.g:433:9: ({...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) ) )
+            	    // InternalTableDSL.g:433:10: {...}? => (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableSelection", "true");
             	    }
-            	    // InternalTableDSL.g:442:19: (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) )
-            	    // InternalTableDSL.g:442:20: otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) )
+            	    // InternalTableDSL.g:433:19: (otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) ) )
+            	    // InternalTableDSL.g:433:20: otherlv_6= 'rowHeader' ( (lv_headerMode_7_0= ruleRowHeaderMode ) )
             	    {
             	    otherlv_6=(Token)match(input,25,FOLLOW_13); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
@@ -1398,11 +1374,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      									newLeafNode(otherlv_6, grammarAccess.getTableSelectionAccess().getRowHeaderKeyword_3_1_0());
             	      								
             	    }
-            	    // InternalTableDSL.g:446:9: ( (lv_headerMode_7_0= ruleRowHeaderMode ) )
-            	    // InternalTableDSL.g:447:10: (lv_headerMode_7_0= ruleRowHeaderMode )
+            	    // InternalTableDSL.g:437:9: ( (lv_headerMode_7_0= ruleRowHeaderMode ) )
+            	    // InternalTableDSL.g:438:10: (lv_headerMode_7_0= ruleRowHeaderMode )
             	    {
-            	    // InternalTableDSL.g:447:10: (lv_headerMode_7_0= ruleRowHeaderMode )
-            	    // InternalTableDSL.g:448:11: lv_headerMode_7_0= ruleRowHeaderMode
+            	    // InternalTableDSL.g:438:10: (lv_headerMode_7_0= ruleRowHeaderMode )
+            	    // InternalTableDSL.g:439:11: lv_headerMode_7_0= ruleRowHeaderMode
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -1450,88 +1426,47 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // InternalTableDSL.g:471:4: ({...}? => ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) ) )
+            	    // InternalTableDSL.g:462:4: ({...}? => ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:471:4: ({...}? => ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) ) )
-            	    // InternalTableDSL.g:472:5: {...}? => ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) )
+            	    // InternalTableDSL.g:462:4: ({...}? => ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) ) )
+            	    // InternalTableDSL.g:463:5: {...}? => ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableSelection", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2)");
             	    }
-            	    // InternalTableDSL.g:472:111: ( ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) ) )
-            	    // InternalTableDSL.g:473:6: ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) )
+            	    // InternalTableDSL.g:463:111: ( ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) ) )
+            	    // InternalTableDSL.g:464:6: ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 2);
-            	    // InternalTableDSL.g:476:9: ({...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) ) )
-            	    // InternalTableDSL.g:476:10: {...}? => ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) )
+            	    // InternalTableDSL.g:467:9: ({...}? => ( (lv_filtering_8_0= 'filtering' ) ) )
+            	    // InternalTableDSL.g:467:10: {...}? => ( (lv_filtering_8_0= 'filtering' ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableSelection", "true");
             	    }
-            	    // InternalTableDSL.g:476:19: ( ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) ) )
-            	    // InternalTableDSL.g:476:20: ( (lv_polling_8_0= 'polling' ) ) ( (lv_pollingTime_9_0= ruleNumber ) )
-            	    {
-            	    // InternalTableDSL.g:476:20: ( (lv_polling_8_0= 'polling' ) )
-            	    // InternalTableDSL.g:477:10: (lv_polling_8_0= 'polling' )
-            	    {
-            	    // InternalTableDSL.g:477:10: (lv_polling_8_0= 'polling' )
-            	    // InternalTableDSL.g:478:11: lv_polling_8_0= 'polling'
-            	    {
-            	    lv_polling_8_0=(Token)match(input,26,FOLLOW_14); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      											newLeafNode(lv_polling_8_0, grammarAccess.getTableSelectionAccess().getPollingPollingKeyword_3_2_0_0());
-            	      										
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      											if (current==null) {
-            	      												current = createModelElement(grammarAccess.getTableSelectionRule());
-            	      											}
-            	      											setWithLastConsumed(current, "polling", true, "polling");
-            	      										
-            	    }
-
-            	    }
-
-
-            	    }
-
-            	    // InternalTableDSL.g:490:9: ( (lv_pollingTime_9_0= ruleNumber ) )
-            	    // InternalTableDSL.g:491:10: (lv_pollingTime_9_0= ruleNumber )
+            	    // InternalTableDSL.g:467:19: ( (lv_filtering_8_0= 'filtering' ) )
+            	    // InternalTableDSL.g:467:20: (lv_filtering_8_0= 'filtering' )
             	    {
-            	    // InternalTableDSL.g:491:10: (lv_pollingTime_9_0= ruleNumber )
-            	    // InternalTableDSL.g:492:11: lv_pollingTime_9_0= ruleNumber
+            	    // InternalTableDSL.g:467:20: (lv_filtering_8_0= 'filtering' )
+            	    // InternalTableDSL.g:468:10: lv_filtering_8_0= 'filtering'
             	    {
+            	    lv_filtering_8_0=(Token)match(input,26,FOLLOW_12); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
-            	      											newCompositeNode(grammarAccess.getTableSelectionAccess().getPollingTimeNumberParserRuleCall_3_2_1_0());
-            	      										
+            	      										newLeafNode(lv_filtering_8_0, grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_2_0());
+            	      									
             	    }
-            	    pushFollow(FOLLOW_12);
-            	    lv_pollingTime_9_0=ruleNumber();
-
-            	    state._fsp--;
-            	    if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
-            	      											if (current==null) {
-            	      												current = createModelElementForParent(grammarAccess.getTableSelectionRule());
-            	      											}
-            	      											set(
-            	      												current,
-            	      												"pollingTime",
-            	      												lv_pollingTime_9_0,
-            	      												"org.eclipse.xtext.xbase.Xbase.Number");
-            	      											afterParserOrEnumRuleCall();
-            	      										
-            	    }
-
+            	      										if (current==null) {
+            	      											current = createModelElement(grammarAccess.getTableSelectionRule());
+            	      										}
+            	      										setWithLastConsumed(current, "filtering", true, "filtering");
+            	      									
             	    }
 
-
             	    }
 
 
@@ -1551,36 +1486,36 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 4 :
-            	    // InternalTableDSL.g:515:4: ({...}? => ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) ) )
+            	    // InternalTableDSL.g:485:4: ({...}? => ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:515:4: ({...}? => ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) ) )
-            	    // InternalTableDSL.g:516:5: {...}? => ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) )
+            	    // InternalTableDSL.g:485:4: ({...}? => ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) ) )
+            	    // InternalTableDSL.g:486:5: {...}? => ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableSelection", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3)");
             	    }
-            	    // InternalTableDSL.g:516:111: ( ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) ) )
-            	    // InternalTableDSL.g:517:6: ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) )
+            	    // InternalTableDSL.g:486:111: ( ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) ) )
+            	    // InternalTableDSL.g:487:6: ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 3);
-            	    // InternalTableDSL.g:520:9: ({...}? => ( (lv_filtering_10_0= 'filtering' ) ) )
-            	    // InternalTableDSL.g:520:10: {...}? => ( (lv_filtering_10_0= 'filtering' ) )
+            	    // InternalTableDSL.g:490:9: ({...}? => ( (lv_embedded_9_0= 'embedded' ) ) )
+            	    // InternalTableDSL.g:490:10: {...}? => ( (lv_embedded_9_0= 'embedded' ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableSelection", "true");
             	    }
-            	    // InternalTableDSL.g:520:19: ( (lv_filtering_10_0= 'filtering' ) )
-            	    // InternalTableDSL.g:520:20: (lv_filtering_10_0= 'filtering' )
+            	    // InternalTableDSL.g:490:19: ( (lv_embedded_9_0= 'embedded' ) )
+            	    // InternalTableDSL.g:490:20: (lv_embedded_9_0= 'embedded' )
             	    {
-            	    // InternalTableDSL.g:520:20: (lv_filtering_10_0= 'filtering' )
-            	    // InternalTableDSL.g:521:10: lv_filtering_10_0= 'filtering'
+            	    // InternalTableDSL.g:490:20: (lv_embedded_9_0= 'embedded' )
+            	    // InternalTableDSL.g:491:10: lv_embedded_9_0= 'embedded'
             	    {
-            	    lv_filtering_10_0=(Token)match(input,27,FOLLOW_12); if (state.failed) return current;
+            	    lv_embedded_9_0=(Token)match(input,27,FOLLOW_12); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
-            	      										newLeafNode(lv_filtering_10_0, grammarAccess.getTableSelectionAccess().getFilteringFilteringKeyword_3_3_0());
+            	      										newLeafNode(lv_embedded_9_0, grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_3_0());
             	      									
             	    }
             	    if ( state.backtracking==0 ) {
@@ -1588,7 +1523,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      										if (current==null) {
             	      											current = createModelElement(grammarAccess.getTableSelectionRule());
             	      										}
-            	      										setWithLastConsumed(current, "filtering", true, "filtering");
+            	      										setWithLastConsumed(current, "embedded", true, "embedded");
             	      									
             	    }
 
@@ -1611,100 +1546,40 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 5 :
-            	    // InternalTableDSL.g:538:4: ({...}? => ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) ) )
+            	    // InternalTableDSL.g:508:4: ({...}? => ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:538:4: ({...}? => ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) ) )
-            	    // InternalTableDSL.g:539:5: {...}? => ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) )
+            	    // InternalTableDSL.g:508:4: ({...}? => ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) ) )
+            	    // InternalTableDSL.g:509:5: {...}? => ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableSelection", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4)");
             	    }
-            	    // InternalTableDSL.g:539:111: ( ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) ) )
-            	    // InternalTableDSL.g:540:6: ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) )
+            	    // InternalTableDSL.g:509:111: ( ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) ) )
+            	    // InternalTableDSL.g:510:6: ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 4);
-            	    // InternalTableDSL.g:543:9: ({...}? => ( (lv_embedded_11_0= 'embedded' ) ) )
-            	    // InternalTableDSL.g:543:10: {...}? => ( (lv_embedded_11_0= 'embedded' ) )
-            	    {
-            	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableSelection", "true");
-            	    }
-            	    // InternalTableDSL.g:543:19: ( (lv_embedded_11_0= 'embedded' ) )
-            	    // InternalTableDSL.g:543:20: (lv_embedded_11_0= 'embedded' )
-            	    {
-            	    // InternalTableDSL.g:543:20: (lv_embedded_11_0= 'embedded' )
-            	    // InternalTableDSL.g:544:10: lv_embedded_11_0= 'embedded'
-            	    {
-            	    lv_embedded_11_0=(Token)match(input,28,FOLLOW_12); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      										newLeafNode(lv_embedded_11_0, grammarAccess.getTableSelectionAccess().getEmbeddedEmbeddedKeyword_3_4_0());
-            	      									
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      										if (current==null) {
-            	      											current = createModelElement(grammarAccess.getTableSelectionRule());
-            	      										}
-            	      										setWithLastConsumed(current, "embedded", true, "embedded");
-            	      									
-            	    }
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3());
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-            	case 6 :
-            	    // InternalTableDSL.g:561:4: ({...}? => ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) ) )
-            	    {
-            	    // InternalTableDSL.g:561:4: ({...}? => ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) ) )
-            	    // InternalTableDSL.g:562:5: {...}? => ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) )
-            	    {
-            	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableSelection", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5)");
-            	    }
-            	    // InternalTableDSL.g:562:111: ( ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) ) )
-            	    // InternalTableDSL.g:563:6: ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) )
-            	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getTableSelectionAccess().getUnorderedGroup_3(), 5);
-            	    // InternalTableDSL.g:566:9: ({...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) ) )
-            	    // InternalTableDSL.g:566:10: {...}? => (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) )
+            	    // InternalTableDSL.g:513:9: ({...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) ) )
+            	    // InternalTableDSL.g:513:10: {...}? => (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableSelection", "true");
             	    }
-            	    // InternalTableDSL.g:566:19: (otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) ) )
-            	    // InternalTableDSL.g:566:20: otherlv_12= 'toolbar' ( (otherlv_13= RULE_ID ) )
+            	    // InternalTableDSL.g:513:19: (otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) ) )
+            	    // InternalTableDSL.g:513:20: otherlv_10= 'toolbar' ( (otherlv_11= RULE_ID ) )
             	    {
-            	    otherlv_12=(Token)match(input,29,FOLLOW_4); if (state.failed) return current;
+            	    otherlv_10=(Token)match(input,28,FOLLOW_4); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
-            	      									newLeafNode(otherlv_12, grammarAccess.getTableSelectionAccess().getToolbarKeyword_3_5_0());
+            	      									newLeafNode(otherlv_10, grammarAccess.getTableSelectionAccess().getToolbarKeyword_3_4_0());
             	      								
             	    }
-            	    // InternalTableDSL.g:570:9: ( (otherlv_13= RULE_ID ) )
-            	    // InternalTableDSL.g:571:10: (otherlv_13= RULE_ID )
+            	    // InternalTableDSL.g:517:9: ( (otherlv_11= RULE_ID ) )
+            	    // InternalTableDSL.g:518:10: (otherlv_11= RULE_ID )
             	    {
-            	    // InternalTableDSL.g:571:10: (otherlv_13= RULE_ID )
-            	    // InternalTableDSL.g:572:11: otherlv_13= RULE_ID
+            	    // InternalTableDSL.g:518:10: (otherlv_11= RULE_ID )
+            	    // InternalTableDSL.g:519:11: otherlv_11= RULE_ID
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -1713,10 +1588,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      											}
             	      										
             	    }
-            	    otherlv_13=(Token)match(input,RULE_ID,FOLLOW_12); if (state.failed) return current;
+            	    otherlv_11=(Token)match(input,RULE_ID,FOLLOW_12); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
-            	      											newLeafNode(otherlv_13, grammarAccess.getTableSelectionAccess().getToolbarActionToolbarCrossReference_3_5_1_0());
+            	      											newLeafNode(otherlv_11, grammarAccess.getTableSelectionAccess().getToolbarActionToolbarCrossReference_3_4_1_0());
             	      										
             	    }
 
@@ -1757,28 +1632,28 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:596:3: (otherlv_14= 'using' ( (lv_source_15_0= ruleTableDatamart ) ) )?
+            // InternalTableDSL.g:543:3: (otherlv_12= 'using' ( (lv_source_13_0= ruleTableDatamart ) ) )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
-            if ( (LA9_0==30) ) {
+            if ( (LA9_0==29) ) {
                 alt9=1;
             }
             switch (alt9) {
                 case 1 :
-                    // InternalTableDSL.g:597:4: otherlv_14= 'using' ( (lv_source_15_0= ruleTableDatamart ) )
+                    // InternalTableDSL.g:544:4: otherlv_12= 'using' ( (lv_source_13_0= ruleTableDatamart ) )
                     {
-                    otherlv_14=(Token)match(input,30,FOLLOW_15); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,29,FOLLOW_14); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      				newLeafNode(otherlv_14, grammarAccess.getTableSelectionAccess().getUsingKeyword_4_0());
+                      				newLeafNode(otherlv_12, grammarAccess.getTableSelectionAccess().getUsingKeyword_4_0());
                       			
                     }
-                    // InternalTableDSL.g:601:4: ( (lv_source_15_0= ruleTableDatamart ) )
-                    // InternalTableDSL.g:602:5: (lv_source_15_0= ruleTableDatamart )
+                    // InternalTableDSL.g:548:4: ( (lv_source_13_0= ruleTableDatamart ) )
+                    // InternalTableDSL.g:549:5: (lv_source_13_0= ruleTableDatamart )
                     {
-                    // InternalTableDSL.g:602:5: (lv_source_15_0= ruleTableDatamart )
-                    // InternalTableDSL.g:603:6: lv_source_15_0= ruleTableDatamart
+                    // InternalTableDSL.g:549:5: (lv_source_13_0= ruleTableDatamart )
+                    // InternalTableDSL.g:550:6: lv_source_13_0= ruleTableDatamart
                     {
                     if ( state.backtracking==0 ) {
 
@@ -1786,7 +1661,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       					
                     }
                     pushFollow(FOLLOW_2);
-                    lv_source_15_0=ruleTableDatamart();
+                    lv_source_13_0=ruleTableDatamart();
 
                     state._fsp--;
                     if (state.failed) return current;
@@ -1798,7 +1673,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       						set(
                       							current,
                       							"source",
-                      							lv_source_15_0,
+                      							lv_source_13_0,
                       							"org.eclipse.osbp.xtext.table.TableDSL.TableDatamart");
                       						afterParserOrEnumRuleCall();
                       					
@@ -1840,7 +1715,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableTable"
-    // InternalTableDSL.g:625:1: entryRuleTableTable returns [EObject current=null] : iv_ruleTableTable= ruleTableTable EOF ;
+    // InternalTableDSL.g:572:1: entryRuleTableTable returns [EObject current=null] : iv_ruleTableTable= ruleTableTable EOF ;
     public final EObject entryRuleTableTable() throws RecognitionException {
         EObject current = null;
 
@@ -1848,8 +1723,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:625:51: (iv_ruleTableTable= ruleTableTable EOF )
-            // InternalTableDSL.g:626:2: iv_ruleTableTable= ruleTableTable EOF
+            // InternalTableDSL.g:572:51: (iv_ruleTableTable= ruleTableTable EOF )
+            // InternalTableDSL.g:573:2: iv_ruleTableTable= ruleTableTable EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableTableRule()); 
@@ -1880,7 +1755,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableTable"
-    // InternalTableDSL.g:632:1: ruleTableTable returns [EObject current=null] : ( () otherlv_1= 'table' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDatamart ) ) )? ) ;
+    // InternalTableDSL.g:579:1: ruleTableTable returns [EObject current=null] : ( () otherlv_1= 'readOnly' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_11= 'using' ( (lv_source_12_0= ruleTableDatamart ) ) )? ) ;
     public final EObject ruleTableTable() throws RecognitionException {
         EObject current = null;
 
@@ -1888,31 +1763,28 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         Token lv_selectalways_3_0=null;
         Token lv_selectById_4_0=null;
         Token otherlv_5=null;
-        Token lv_polling_7_0=null;
-        Token lv_filtering_9_0=null;
-        Token lv_embedded_10_0=null;
+        Token lv_filtering_7_0=null;
+        Token lv_embedded_8_0=null;
+        Token otherlv_9=null;
+        Token otherlv_10=null;
         Token otherlv_11=null;
-        Token otherlv_12=null;
-        Token otherlv_13=null;
         Enumerator lv_headerMode_6_0 = null;
 
-        AntlrDatatypeRuleToken lv_pollingTime_8_0 = null;
-
-        EObject lv_source_14_0 = null;
+        EObject lv_source_12_0 = null;
 
 
 
         	enterRule();
 
         try {
-            // InternalTableDSL.g:638:2: ( ( () otherlv_1= 'table' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDatamart ) ) )? ) )
-            // InternalTableDSL.g:639:2: ( () otherlv_1= 'table' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDatamart ) ) )? )
+            // InternalTableDSL.g:585:2: ( ( () otherlv_1= 'readOnly' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_11= 'using' ( (lv_source_12_0= ruleTableDatamart ) ) )? ) )
+            // InternalTableDSL.g:586:2: ( () otherlv_1= 'readOnly' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_11= 'using' ( (lv_source_12_0= ruleTableDatamart ) ) )? )
             {
-            // InternalTableDSL.g:639:2: ( () otherlv_1= 'table' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDatamart ) ) )? )
-            // InternalTableDSL.g:640:3: () otherlv_1= 'table' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDatamart ) ) )?
+            // InternalTableDSL.g:586:2: ( () otherlv_1= 'readOnly' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_11= 'using' ( (lv_source_12_0= ruleTableDatamart ) ) )? )
+            // InternalTableDSL.g:587:3: () otherlv_1= 'readOnly' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_11= 'using' ( (lv_source_12_0= ruleTableDatamart ) ) )?
             {
-            // InternalTableDSL.g:640:3: ()
-            // InternalTableDSL.g:641:4: 
+            // InternalTableDSL.g:587:3: ()
+            // InternalTableDSL.g:588:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -1924,26 +1796,26 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,18,FOLLOW_16); if (state.failed) return current;
+            otherlv_1=(Token)match(input,30,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
-              			newLeafNode(otherlv_1, grammarAccess.getTableTableAccess().getTableKeyword_1());
+              			newLeafNode(otherlv_1, grammarAccess.getTableTableAccess().getReadOnlyKeyword_1());
               		
             }
-            // InternalTableDSL.g:651:3: ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) )
-            // InternalTableDSL.g:652:4: ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) )
+            // InternalTableDSL.g:598:3: ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) ) ) )* ) ) )
+            // InternalTableDSL.g:599:4: ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) ) ) )* ) )
             {
-            // InternalTableDSL.g:652:4: ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) )
-            // InternalTableDSL.g:653:5: ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* )
+            // InternalTableDSL.g:599:4: ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) ) ) )* ) )
+            // InternalTableDSL.g:600:5: ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) ) ) )* )
             {
             getUnorderedGroupHelper().enter(grammarAccess.getTableTableAccess().getUnorderedGroup_2());
-            // InternalTableDSL.g:656:5: ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* )
-            // InternalTableDSL.g:657:6: ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )*
+            // InternalTableDSL.g:603:5: ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) ) ) )* )
+            // InternalTableDSL.g:604:6: ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) ) ) )*
             {
-            // InternalTableDSL.g:657:6: ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )*
+            // InternalTableDSL.g:604:6: ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) ) ) )*
             loop10:
             do {
-                int alt10=8;
+                int alt10=7;
                 int LA10_0 = input.LA(1);
 
                 if ( LA10_0 == 24 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
@@ -1964,40 +1836,37 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                 else if ( LA10_0 == 28 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
                     alt10=6;
                 }
-                else if ( LA10_0 == 29 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6) ) {
-                    alt10=7;
-                }
 
 
                 switch (alt10) {
             	case 1 :
-            	    // InternalTableDSL.g:658:4: ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) )
+            	    // InternalTableDSL.g:605:4: ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:658:4: ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) )
-            	    // InternalTableDSL.g:659:5: {...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) )
+            	    // InternalTableDSL.g:605:4: ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) )
+            	    // InternalTableDSL.g:606:5: {...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableTable", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0)");
             	    }
-            	    // InternalTableDSL.g:659:107: ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) )
-            	    // InternalTableDSL.g:660:6: ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) )
+            	    // InternalTableDSL.g:606:107: ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) )
+            	    // InternalTableDSL.g:607:6: ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 0);
-            	    // InternalTableDSL.g:663:9: ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) )
-            	    // InternalTableDSL.g:663:10: {...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) )
+            	    // InternalTableDSL.g:610:9: ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) )
+            	    // InternalTableDSL.g:610:10: {...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableTable", "true");
             	    }
-            	    // InternalTableDSL.g:663:19: ( (lv_selectalways_3_0= 'alwaysSelected' ) )
-            	    // InternalTableDSL.g:663:20: (lv_selectalways_3_0= 'alwaysSelected' )
+            	    // InternalTableDSL.g:610:19: ( (lv_selectalways_3_0= 'alwaysSelected' ) )
+            	    // InternalTableDSL.g:610:20: (lv_selectalways_3_0= 'alwaysSelected' )
             	    {
-            	    // InternalTableDSL.g:663:20: (lv_selectalways_3_0= 'alwaysSelected' )
-            	    // InternalTableDSL.g:664:10: lv_selectalways_3_0= 'alwaysSelected'
+            	    // InternalTableDSL.g:610:20: (lv_selectalways_3_0= 'alwaysSelected' )
+            	    // InternalTableDSL.g:611:10: lv_selectalways_3_0= 'alwaysSelected'
             	    {
-            	    lv_selectalways_3_0=(Token)match(input,24,FOLLOW_16); if (state.failed) return current;
+            	    lv_selectalways_3_0=(Token)match(input,24,FOLLOW_15); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      										newLeafNode(lv_selectalways_3_0, grammarAccess.getTableTableAccess().getSelectalwaysAlwaysSelectedKeyword_2_0_0());
@@ -2031,33 +1900,33 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // InternalTableDSL.g:681:4: ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) )
+            	    // InternalTableDSL.g:628:4: ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:681:4: ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) )
-            	    // InternalTableDSL.g:682:5: {...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) )
+            	    // InternalTableDSL.g:628:4: ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) )
+            	    // InternalTableDSL.g:629:5: {...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableTable", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1)");
             	    }
-            	    // InternalTableDSL.g:682:107: ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) )
-            	    // InternalTableDSL.g:683:6: ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) )
+            	    // InternalTableDSL.g:629:107: ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) )
+            	    // InternalTableDSL.g:630:6: ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 1);
-            	    // InternalTableDSL.g:686:9: ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) )
-            	    // InternalTableDSL.g:686:10: {...}? => ( (lv_selectById_4_0= 'selectById' ) )
+            	    // InternalTableDSL.g:633:9: ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) )
+            	    // InternalTableDSL.g:633:10: {...}? => ( (lv_selectById_4_0= 'selectById' ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableTable", "true");
             	    }
-            	    // InternalTableDSL.g:686:19: ( (lv_selectById_4_0= 'selectById' ) )
-            	    // InternalTableDSL.g:686:20: (lv_selectById_4_0= 'selectById' )
+            	    // InternalTableDSL.g:633:19: ( (lv_selectById_4_0= 'selectById' ) )
+            	    // InternalTableDSL.g:633:20: (lv_selectById_4_0= 'selectById' )
             	    {
-            	    // InternalTableDSL.g:686:20: (lv_selectById_4_0= 'selectById' )
-            	    // InternalTableDSL.g:687:10: lv_selectById_4_0= 'selectById'
+            	    // InternalTableDSL.g:633:20: (lv_selectById_4_0= 'selectById' )
+            	    // InternalTableDSL.g:634:10: lv_selectById_4_0= 'selectById'
             	    {
-            	    lv_selectById_4_0=(Token)match(input,31,FOLLOW_16); if (state.failed) return current;
+            	    lv_selectById_4_0=(Token)match(input,31,FOLLOW_15); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      										newLeafNode(lv_selectById_4_0, grammarAccess.getTableTableAccess().getSelectByIdSelectByIdKeyword_2_1_0());
@@ -2091,28 +1960,28 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // InternalTableDSL.g:704:4: ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) )
+            	    // InternalTableDSL.g:651:4: ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:704:4: ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) )
-            	    // InternalTableDSL.g:705:5: {...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) )
+            	    // InternalTableDSL.g:651:4: ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) )
+            	    // InternalTableDSL.g:652:5: {...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableTable", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2)");
             	    }
-            	    // InternalTableDSL.g:705:107: ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) )
-            	    // InternalTableDSL.g:706:6: ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) )
+            	    // InternalTableDSL.g:652:107: ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) )
+            	    // InternalTableDSL.g:653:6: ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 2);
-            	    // InternalTableDSL.g:709:9: ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) )
-            	    // InternalTableDSL.g:709:10: {...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) )
+            	    // InternalTableDSL.g:656:9: ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) )
+            	    // InternalTableDSL.g:656:10: {...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableTable", "true");
             	    }
-            	    // InternalTableDSL.g:709:19: (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) )
-            	    // InternalTableDSL.g:709:20: otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) )
+            	    // InternalTableDSL.g:656:19: (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) )
+            	    // InternalTableDSL.g:656:20: otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) )
             	    {
             	    otherlv_5=(Token)match(input,25,FOLLOW_13); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
@@ -2120,18 +1989,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      									newLeafNode(otherlv_5, grammarAccess.getTableTableAccess().getRowHeaderKeyword_2_2_0());
             	      								
             	    }
-            	    // InternalTableDSL.g:713:9: ( (lv_headerMode_6_0= ruleRowHeaderMode ) )
-            	    // InternalTableDSL.g:714:10: (lv_headerMode_6_0= ruleRowHeaderMode )
+            	    // InternalTableDSL.g:660:9: ( (lv_headerMode_6_0= ruleRowHeaderMode ) )
+            	    // InternalTableDSL.g:661:10: (lv_headerMode_6_0= ruleRowHeaderMode )
             	    {
-            	    // InternalTableDSL.g:714:10: (lv_headerMode_6_0= ruleRowHeaderMode )
-            	    // InternalTableDSL.g:715:11: lv_headerMode_6_0= ruleRowHeaderMode
+            	    // InternalTableDSL.g:661:10: (lv_headerMode_6_0= ruleRowHeaderMode )
+            	    // InternalTableDSL.g:662:11: lv_headerMode_6_0= ruleRowHeaderMode
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      											newCompositeNode(grammarAccess.getTableTableAccess().getHeaderModeRowHeaderModeEnumRuleCall_2_2_1_0());
             	      										
             	    }
-            	    pushFollow(FOLLOW_16);
+            	    pushFollow(FOLLOW_15);
             	    lv_headerMode_6_0=ruleRowHeaderMode();
 
             	    state._fsp--;
@@ -2172,88 +2041,47 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 4 :
-            	    // InternalTableDSL.g:738:4: ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) )
+            	    // InternalTableDSL.g:685:4: ({...}? => ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:738:4: ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) )
-            	    // InternalTableDSL.g:739:5: {...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) )
+            	    // InternalTableDSL.g:685:4: ({...}? => ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) ) )
+            	    // InternalTableDSL.g:686:5: {...}? => ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableTable", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3)");
             	    }
-            	    // InternalTableDSL.g:739:107: ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) )
-            	    // InternalTableDSL.g:740:6: ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) )
+            	    // InternalTableDSL.g:686:107: ( ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) ) )
+            	    // InternalTableDSL.g:687:6: ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 3);
-            	    // InternalTableDSL.g:743:9: ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) )
-            	    // InternalTableDSL.g:743:10: {...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) )
+            	    // InternalTableDSL.g:690:9: ({...}? => ( (lv_filtering_7_0= 'filtering' ) ) )
+            	    // InternalTableDSL.g:690:10: {...}? => ( (lv_filtering_7_0= 'filtering' ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableTable", "true");
             	    }
-            	    // InternalTableDSL.g:743:19: ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) )
-            	    // InternalTableDSL.g:743:20: ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) )
-            	    {
-            	    // InternalTableDSL.g:743:20: ( (lv_polling_7_0= 'polling' ) )
-            	    // InternalTableDSL.g:744:10: (lv_polling_7_0= 'polling' )
-            	    {
-            	    // InternalTableDSL.g:744:10: (lv_polling_7_0= 'polling' )
-            	    // InternalTableDSL.g:745:11: lv_polling_7_0= 'polling'
-            	    {
-            	    lv_polling_7_0=(Token)match(input,26,FOLLOW_14); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      											newLeafNode(lv_polling_7_0, grammarAccess.getTableTableAccess().getPollingPollingKeyword_2_3_0_0());
-            	      										
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      											if (current==null) {
-            	      												current = createModelElement(grammarAccess.getTableTableRule());
-            	      											}
-            	      											setWithLastConsumed(current, "polling", true, "polling");
-            	      										
-            	    }
-
-            	    }
-
-
-            	    }
-
-            	    // InternalTableDSL.g:757:9: ( (lv_pollingTime_8_0= ruleNumber ) )
-            	    // InternalTableDSL.g:758:10: (lv_pollingTime_8_0= ruleNumber )
+            	    // InternalTableDSL.g:690:19: ( (lv_filtering_7_0= 'filtering' ) )
+            	    // InternalTableDSL.g:690:20: (lv_filtering_7_0= 'filtering' )
             	    {
-            	    // InternalTableDSL.g:758:10: (lv_pollingTime_8_0= ruleNumber )
-            	    // InternalTableDSL.g:759:11: lv_pollingTime_8_0= ruleNumber
+            	    // InternalTableDSL.g:690:20: (lv_filtering_7_0= 'filtering' )
+            	    // InternalTableDSL.g:691:10: lv_filtering_7_0= 'filtering'
             	    {
+            	    lv_filtering_7_0=(Token)match(input,26,FOLLOW_15); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
-            	      											newCompositeNode(grammarAccess.getTableTableAccess().getPollingTimeNumberParserRuleCall_2_3_1_0());
-            	      										
+            	      										newLeafNode(lv_filtering_7_0, grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_3_0());
+            	      									
             	    }
-            	    pushFollow(FOLLOW_16);
-            	    lv_pollingTime_8_0=ruleNumber();
-
-            	    state._fsp--;
-            	    if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
-            	      											if (current==null) {
-            	      												current = createModelElementForParent(grammarAccess.getTableTableRule());
-            	      											}
-            	      											set(
-            	      												current,
-            	      												"pollingTime",
-            	      												lv_pollingTime_8_0,
-            	      												"org.eclipse.xtext.xbase.Xbase.Number");
-            	      											afterParserOrEnumRuleCall();
-            	      										
-            	    }
-
+            	      										if (current==null) {
+            	      											current = createModelElement(grammarAccess.getTableTableRule());
+            	      										}
+            	      										setWithLastConsumed(current, "filtering", true, "filtering");
+            	      									
             	    }
 
-
             	    }
 
 
@@ -2273,36 +2101,36 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 5 :
-            	    // InternalTableDSL.g:782:4: ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) )
+            	    // InternalTableDSL.g:708:4: ({...}? => ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:782:4: ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) )
-            	    // InternalTableDSL.g:783:5: {...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) )
+            	    // InternalTableDSL.g:708:4: ({...}? => ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) ) )
+            	    // InternalTableDSL.g:709:5: {...}? => ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableTable", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4)");
             	    }
-            	    // InternalTableDSL.g:783:107: ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) )
-            	    // InternalTableDSL.g:784:6: ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) )
+            	    // InternalTableDSL.g:709:107: ( ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) ) )
+            	    // InternalTableDSL.g:710:6: ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 4);
-            	    // InternalTableDSL.g:787:9: ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) )
-            	    // InternalTableDSL.g:787:10: {...}? => ( (lv_filtering_9_0= 'filtering' ) )
+            	    // InternalTableDSL.g:713:9: ({...}? => ( (lv_embedded_8_0= 'embedded' ) ) )
+            	    // InternalTableDSL.g:713:10: {...}? => ( (lv_embedded_8_0= 'embedded' ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableTable", "true");
             	    }
-            	    // InternalTableDSL.g:787:19: ( (lv_filtering_9_0= 'filtering' ) )
-            	    // InternalTableDSL.g:787:20: (lv_filtering_9_0= 'filtering' )
+            	    // InternalTableDSL.g:713:19: ( (lv_embedded_8_0= 'embedded' ) )
+            	    // InternalTableDSL.g:713:20: (lv_embedded_8_0= 'embedded' )
             	    {
-            	    // InternalTableDSL.g:787:20: (lv_filtering_9_0= 'filtering' )
-            	    // InternalTableDSL.g:788:10: lv_filtering_9_0= 'filtering'
+            	    // InternalTableDSL.g:713:20: (lv_embedded_8_0= 'embedded' )
+            	    // InternalTableDSL.g:714:10: lv_embedded_8_0= 'embedded'
             	    {
-            	    lv_filtering_9_0=(Token)match(input,27,FOLLOW_16); if (state.failed) return current;
+            	    lv_embedded_8_0=(Token)match(input,27,FOLLOW_15); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
-            	      										newLeafNode(lv_filtering_9_0, grammarAccess.getTableTableAccess().getFilteringFilteringKeyword_2_4_0());
+            	      										newLeafNode(lv_embedded_8_0, grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_4_0());
             	      									
             	    }
             	    if ( state.backtracking==0 ) {
@@ -2310,7 +2138,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      										if (current==null) {
             	      											current = createModelElement(grammarAccess.getTableTableRule());
             	      										}
-            	      										setWithLastConsumed(current, "filtering", true, "filtering");
+            	      										setWithLastConsumed(current, "embedded", true, "embedded");
             	      									
             	    }
 
@@ -2333,100 +2161,40 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 6 :
-            	    // InternalTableDSL.g:805:4: ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) )
+            	    // InternalTableDSL.g:731:4: ({...}? => ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:805:4: ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) )
-            	    // InternalTableDSL.g:806:5: {...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) )
+            	    // InternalTableDSL.g:731:4: ({...}? => ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) ) )
+            	    // InternalTableDSL.g:732:5: {...}? => ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableTable", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5)");
             	    }
-            	    // InternalTableDSL.g:806:107: ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) )
-            	    // InternalTableDSL.g:807:6: ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) )
+            	    // InternalTableDSL.g:732:107: ( ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) ) )
+            	    // InternalTableDSL.g:733:6: ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 5);
-            	    // InternalTableDSL.g:810:9: ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) )
-            	    // InternalTableDSL.g:810:10: {...}? => ( (lv_embedded_10_0= 'embedded' ) )
+            	    // InternalTableDSL.g:736:9: ({...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) ) )
+            	    // InternalTableDSL.g:736:10: {...}? => (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableTable", "true");
             	    }
-            	    // InternalTableDSL.g:810:19: ( (lv_embedded_10_0= 'embedded' ) )
-            	    // InternalTableDSL.g:810:20: (lv_embedded_10_0= 'embedded' )
-            	    {
-            	    // InternalTableDSL.g:810:20: (lv_embedded_10_0= 'embedded' )
-            	    // InternalTableDSL.g:811:10: lv_embedded_10_0= 'embedded'
+            	    // InternalTableDSL.g:736:19: (otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) ) )
+            	    // InternalTableDSL.g:736:20: otherlv_9= 'toolbar' ( (otherlv_10= RULE_ID ) )
             	    {
-            	    lv_embedded_10_0=(Token)match(input,28,FOLLOW_16); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      										newLeafNode(lv_embedded_10_0, grammarAccess.getTableTableAccess().getEmbeddedEmbeddedKeyword_2_5_0());
-            	      									
-            	    }
+            	    otherlv_9=(Token)match(input,28,FOLLOW_4); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
-            	      										if (current==null) {
-            	      											current = createModelElement(grammarAccess.getTableTableRule());
-            	      										}
-            	      										setWithLastConsumed(current, "embedded", true, "embedded");
-            	      									
-            	    }
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableTableAccess().getUnorderedGroup_2());
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-            	case 7 :
-            	    // InternalTableDSL.g:828:4: ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) )
-            	    {
-            	    // InternalTableDSL.g:828:4: ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) )
-            	    // InternalTableDSL.g:829:5: {...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) )
-            	    {
-            	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableTable", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6)");
-            	    }
-            	    // InternalTableDSL.g:829:107: ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) )
-            	    // InternalTableDSL.g:830:6: ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) )
-            	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getTableTableAccess().getUnorderedGroup_2(), 6);
-            	    // InternalTableDSL.g:833:9: ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) )
-            	    // InternalTableDSL.g:833:10: {...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) )
-            	    {
-            	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableTable", "true");
-            	    }
-            	    // InternalTableDSL.g:833:19: (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) )
-            	    // InternalTableDSL.g:833:20: otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) )
-            	    {
-            	    otherlv_11=(Token)match(input,29,FOLLOW_4); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      									newLeafNode(otherlv_11, grammarAccess.getTableTableAccess().getToolbarKeyword_2_6_0());
+            	      									newLeafNode(otherlv_9, grammarAccess.getTableTableAccess().getToolbarKeyword_2_5_0());
             	      								
             	    }
-            	    // InternalTableDSL.g:837:9: ( (otherlv_12= RULE_ID ) )
-            	    // InternalTableDSL.g:838:10: (otherlv_12= RULE_ID )
+            	    // InternalTableDSL.g:740:9: ( (otherlv_10= RULE_ID ) )
+            	    // InternalTableDSL.g:741:10: (otherlv_10= RULE_ID )
             	    {
-            	    // InternalTableDSL.g:838:10: (otherlv_12= RULE_ID )
-            	    // InternalTableDSL.g:839:11: otherlv_12= RULE_ID
+            	    // InternalTableDSL.g:741:10: (otherlv_10= RULE_ID )
+            	    // InternalTableDSL.g:742:11: otherlv_10= RULE_ID
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -2435,10 +2203,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      											}
             	      										
             	    }
-            	    otherlv_12=(Token)match(input,RULE_ID,FOLLOW_16); if (state.failed) return current;
+            	    otherlv_10=(Token)match(input,RULE_ID,FOLLOW_15); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
-            	      											newLeafNode(otherlv_12, grammarAccess.getTableTableAccess().getToolbarActionToolbarCrossReference_2_6_1_0());
+            	      											newLeafNode(otherlv_10, grammarAccess.getTableTableAccess().getToolbarActionToolbarCrossReference_2_5_1_0());
             	      										
             	    }
 
@@ -2479,28 +2247,28 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:863:3: (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDatamart ) ) )?
+            // InternalTableDSL.g:766:3: (otherlv_11= 'using' ( (lv_source_12_0= ruleTableDatamart ) ) )?
             int alt11=2;
             int LA11_0 = input.LA(1);
 
-            if ( (LA11_0==30) ) {
+            if ( (LA11_0==29) ) {
                 alt11=1;
             }
             switch (alt11) {
                 case 1 :
-                    // InternalTableDSL.g:864:4: otherlv_13= 'using' ( (lv_source_14_0= ruleTableDatamart ) )
+                    // InternalTableDSL.g:767:4: otherlv_11= 'using' ( (lv_source_12_0= ruleTableDatamart ) )
                     {
-                    otherlv_13=(Token)match(input,30,FOLLOW_15); if (state.failed) return current;
+                    otherlv_11=(Token)match(input,29,FOLLOW_14); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      				newLeafNode(otherlv_13, grammarAccess.getTableTableAccess().getUsingKeyword_3_0());
+                      				newLeafNode(otherlv_11, grammarAccess.getTableTableAccess().getUsingKeyword_3_0());
                       			
                     }
-                    // InternalTableDSL.g:868:4: ( (lv_source_14_0= ruleTableDatamart ) )
-                    // InternalTableDSL.g:869:5: (lv_source_14_0= ruleTableDatamart )
+                    // InternalTableDSL.g:771:4: ( (lv_source_12_0= ruleTableDatamart ) )
+                    // InternalTableDSL.g:772:5: (lv_source_12_0= ruleTableDatamart )
                     {
-                    // InternalTableDSL.g:869:5: (lv_source_14_0= ruleTableDatamart )
-                    // InternalTableDSL.g:870:6: lv_source_14_0= ruleTableDatamart
+                    // InternalTableDSL.g:772:5: (lv_source_12_0= ruleTableDatamart )
+                    // InternalTableDSL.g:773:6: lv_source_12_0= ruleTableDatamart
                     {
                     if ( state.backtracking==0 ) {
 
@@ -2508,7 +2276,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       					
                     }
                     pushFollow(FOLLOW_2);
-                    lv_source_14_0=ruleTableDatamart();
+                    lv_source_12_0=ruleTableDatamart();
 
                     state._fsp--;
                     if (state.failed) return current;
@@ -2520,7 +2288,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       						set(
                       							current,
                       							"source",
-                      							lv_source_14_0,
+                      							lv_source_12_0,
                       							"org.eclipse.osbp.xtext.table.TableDSL.TableDatamart");
                       						afterParserOrEnumRuleCall();
                       					
@@ -2561,730 +2329,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     // $ANTLR end "ruleTableTable"
 
 
-    // $ANTLR start "entryRuleTableBean"
-    // InternalTableDSL.g:892:1: entryRuleTableBean returns [EObject current=null] : iv_ruleTableBean= ruleTableBean EOF ;
-    public final EObject entryRuleTableBean() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleTableBean = null;
-
-
-        try {
-            // InternalTableDSL.g:892:50: (iv_ruleTableBean= ruleTableBean EOF )
-            // InternalTableDSL.g:893:2: iv_ruleTableBean= ruleTableBean EOF
-            {
-            if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getTableBeanRule()); 
-            }
-            pushFollow(FOLLOW_1);
-            iv_ruleTableBean=ruleTableBean();
-
-            state._fsp--;
-            if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-               current =iv_ruleTableBean; 
-            }
-            match(input,EOF,FOLLOW_2); if (state.failed) return current;
-
-            }
-
-        }
-
-            catch (RecognitionException re) {
-                recover(input,re);
-                appendSkippedTokens();
-            }
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleTableBean"
-
-
-    // $ANTLR start "ruleTableBean"
-    // InternalTableDSL.g:899:1: ruleTableBean returns [EObject current=null] : ( () otherlv_1= 'bean' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDatamart ) ) )? ) ;
-    public final EObject ruleTableBean() throws RecognitionException {
-        EObject current = null;
-
-        Token otherlv_1=null;
-        Token lv_selectalways_3_0=null;
-        Token lv_selectById_4_0=null;
-        Token otherlv_5=null;
-        Token lv_polling_7_0=null;
-        Token lv_filtering_9_0=null;
-        Token lv_embedded_10_0=null;
-        Token otherlv_11=null;
-        Token otherlv_12=null;
-        Token otherlv_13=null;
-        Enumerator lv_headerMode_6_0 = null;
-
-        AntlrDatatypeRuleToken lv_pollingTime_8_0 = null;
-
-        EObject lv_source_14_0 = null;
-
-
-
-        	enterRule();
-
-        try {
-            // InternalTableDSL.g:905:2: ( ( () otherlv_1= 'bean' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDatamart ) ) )? ) )
-            // InternalTableDSL.g:906:2: ( () otherlv_1= 'bean' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDatamart ) ) )? )
-            {
-            // InternalTableDSL.g:906:2: ( () otherlv_1= 'bean' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDatamart ) ) )? )
-            // InternalTableDSL.g:907:3: () otherlv_1= 'bean' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDatamart ) ) )?
-            {
-            // InternalTableDSL.g:907:3: ()
-            // InternalTableDSL.g:908:4: 
-            {
-            if ( state.backtracking==0 ) {
-
-              				current = forceCreateModelElement(
-              					grammarAccess.getTableBeanAccess().getTableBeanAction_0(),
-              					current);
-              			
-            }
-
-            }
-
-            otherlv_1=(Token)match(input,32,FOLLOW_16); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-
-              			newLeafNode(otherlv_1, grammarAccess.getTableBeanAccess().getBeanKeyword_1());
-              		
-            }
-            // InternalTableDSL.g:918:3: ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) )
-            // InternalTableDSL.g:919:4: ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) )
-            {
-            // InternalTableDSL.g:919:4: ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) )
-            // InternalTableDSL.g:920:5: ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* )
-            {
-            getUnorderedGroupHelper().enter(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-            // InternalTableDSL.g:923:5: ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* )
-            // InternalTableDSL.g:924:6: ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )*
-            {
-            // InternalTableDSL.g:924:6: ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )*
-            loop12:
-            do {
-                int alt12=8;
-                int LA12_0 = input.LA(1);
-
-                if ( LA12_0 == 24 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0) ) {
-                    alt12=1;
-                }
-                else if ( LA12_0 == 31 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1) ) {
-                    alt12=2;
-                }
-                else if ( LA12_0 == 25 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2) ) {
-                    alt12=3;
-                }
-                else if ( LA12_0 == 26 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3) ) {
-                    alt12=4;
-                }
-                else if ( LA12_0 == 27 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4) ) {
-                    alt12=5;
-                }
-                else if ( LA12_0 == 28 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5) ) {
-                    alt12=6;
-                }
-                else if ( LA12_0 == 29 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6) ) {
-                    alt12=7;
-                }
-
-
-                switch (alt12) {
-            	case 1 :
-            	    // InternalTableDSL.g:925:4: ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) )
-            	    {
-            	    // InternalTableDSL.g:925:4: ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) ) )
-            	    // InternalTableDSL.g:926:5: {...}? => ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) )
-            	    {
-            	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableBean", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0)");
-            	    }
-            	    // InternalTableDSL.g:926:106: ( ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) ) )
-            	    // InternalTableDSL.g:927:6: ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) )
-            	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 0);
-            	    // InternalTableDSL.g:930:9: ({...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) ) )
-            	    // InternalTableDSL.g:930:10: {...}? => ( (lv_selectalways_3_0= 'alwaysSelected' ) )
-            	    {
-            	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableBean", "true");
-            	    }
-            	    // InternalTableDSL.g:930:19: ( (lv_selectalways_3_0= 'alwaysSelected' ) )
-            	    // InternalTableDSL.g:930:20: (lv_selectalways_3_0= 'alwaysSelected' )
-            	    {
-            	    // InternalTableDSL.g:930:20: (lv_selectalways_3_0= 'alwaysSelected' )
-            	    // InternalTableDSL.g:931:10: lv_selectalways_3_0= 'alwaysSelected'
-            	    {
-            	    lv_selectalways_3_0=(Token)match(input,24,FOLLOW_16); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      										newLeafNode(lv_selectalways_3_0, grammarAccess.getTableBeanAccess().getSelectalwaysAlwaysSelectedKeyword_2_0_0());
-            	      									
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      										if (current==null) {
-            	      											current = createModelElement(grammarAccess.getTableBeanRule());
-            	      										}
-            	      										setWithLastConsumed(current, "selectalways", true, "alwaysSelected");
-            	      									
-            	    }
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-            	case 2 :
-            	    // InternalTableDSL.g:948:4: ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) )
-            	    {
-            	    // InternalTableDSL.g:948:4: ({...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) ) )
-            	    // InternalTableDSL.g:949:5: {...}? => ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) )
-            	    {
-            	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableBean", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1)");
-            	    }
-            	    // InternalTableDSL.g:949:106: ( ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) ) )
-            	    // InternalTableDSL.g:950:6: ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) )
-            	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 1);
-            	    // InternalTableDSL.g:953:9: ({...}? => ( (lv_selectById_4_0= 'selectById' ) ) )
-            	    // InternalTableDSL.g:953:10: {...}? => ( (lv_selectById_4_0= 'selectById' ) )
-            	    {
-            	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableBean", "true");
-            	    }
-            	    // InternalTableDSL.g:953:19: ( (lv_selectById_4_0= 'selectById' ) )
-            	    // InternalTableDSL.g:953:20: (lv_selectById_4_0= 'selectById' )
-            	    {
-            	    // InternalTableDSL.g:953:20: (lv_selectById_4_0= 'selectById' )
-            	    // InternalTableDSL.g:954:10: lv_selectById_4_0= 'selectById'
-            	    {
-            	    lv_selectById_4_0=(Token)match(input,31,FOLLOW_16); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      										newLeafNode(lv_selectById_4_0, grammarAccess.getTableBeanAccess().getSelectByIdSelectByIdKeyword_2_1_0());
-            	      									
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      										if (current==null) {
-            	      											current = createModelElement(grammarAccess.getTableBeanRule());
-            	      										}
-            	      										setWithLastConsumed(current, "selectById", true, "selectById");
-            	      									
-            	    }
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-            	case 3 :
-            	    // InternalTableDSL.g:971:4: ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) )
-            	    {
-            	    // InternalTableDSL.g:971:4: ({...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) ) )
-            	    // InternalTableDSL.g:972:5: {...}? => ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) )
-            	    {
-            	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableBean", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2)");
-            	    }
-            	    // InternalTableDSL.g:972:106: ( ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) ) )
-            	    // InternalTableDSL.g:973:6: ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) )
-            	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 2);
-            	    // InternalTableDSL.g:976:9: ({...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) ) )
-            	    // InternalTableDSL.g:976:10: {...}? => (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) )
-            	    {
-            	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableBean", "true");
-            	    }
-            	    // InternalTableDSL.g:976:19: (otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) ) )
-            	    // InternalTableDSL.g:976:20: otherlv_5= 'rowHeader' ( (lv_headerMode_6_0= ruleRowHeaderMode ) )
-            	    {
-            	    otherlv_5=(Token)match(input,25,FOLLOW_13); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      									newLeafNode(otherlv_5, grammarAccess.getTableBeanAccess().getRowHeaderKeyword_2_2_0());
-            	      								
-            	    }
-            	    // InternalTableDSL.g:980:9: ( (lv_headerMode_6_0= ruleRowHeaderMode ) )
-            	    // InternalTableDSL.g:981:10: (lv_headerMode_6_0= ruleRowHeaderMode )
-            	    {
-            	    // InternalTableDSL.g:981:10: (lv_headerMode_6_0= ruleRowHeaderMode )
-            	    // InternalTableDSL.g:982:11: lv_headerMode_6_0= ruleRowHeaderMode
-            	    {
-            	    if ( state.backtracking==0 ) {
-
-            	      											newCompositeNode(grammarAccess.getTableBeanAccess().getHeaderModeRowHeaderModeEnumRuleCall_2_2_1_0());
-            	      										
-            	    }
-            	    pushFollow(FOLLOW_16);
-            	    lv_headerMode_6_0=ruleRowHeaderMode();
-
-            	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      											if (current==null) {
-            	      												current = createModelElementForParent(grammarAccess.getTableBeanRule());
-            	      											}
-            	      											set(
-            	      												current,
-            	      												"headerMode",
-            	      												lv_headerMode_6_0,
-            	      												"org.eclipse.osbp.xtext.table.TableDSL.RowHeaderMode");
-            	      											afterParserOrEnumRuleCall();
-            	      										
-            	    }
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-            	case 4 :
-            	    // InternalTableDSL.g:1005:4: ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) )
-            	    {
-            	    // InternalTableDSL.g:1005:4: ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) )
-            	    // InternalTableDSL.g:1006:5: {...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) )
-            	    {
-            	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableBean", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3)");
-            	    }
-            	    // InternalTableDSL.g:1006:106: ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) )
-            	    // InternalTableDSL.g:1007:6: ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) )
-            	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 3);
-            	    // InternalTableDSL.g:1010:9: ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) )
-            	    // InternalTableDSL.g:1010:10: {...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) )
-            	    {
-            	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableBean", "true");
-            	    }
-            	    // InternalTableDSL.g:1010:19: ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) )
-            	    // InternalTableDSL.g:1010:20: ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) )
-            	    {
-            	    // InternalTableDSL.g:1010:20: ( (lv_polling_7_0= 'polling' ) )
-            	    // InternalTableDSL.g:1011:10: (lv_polling_7_0= 'polling' )
-            	    {
-            	    // InternalTableDSL.g:1011:10: (lv_polling_7_0= 'polling' )
-            	    // InternalTableDSL.g:1012:11: lv_polling_7_0= 'polling'
-            	    {
-            	    lv_polling_7_0=(Token)match(input,26,FOLLOW_14); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      											newLeafNode(lv_polling_7_0, grammarAccess.getTableBeanAccess().getPollingPollingKeyword_2_3_0_0());
-            	      										
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      											if (current==null) {
-            	      												current = createModelElement(grammarAccess.getTableBeanRule());
-            	      											}
-            	      											setWithLastConsumed(current, "polling", true, "polling");
-            	      										
-            	    }
-
-            	    }
-
-
-            	    }
-
-            	    // InternalTableDSL.g:1024:9: ( (lv_pollingTime_8_0= ruleNumber ) )
-            	    // InternalTableDSL.g:1025:10: (lv_pollingTime_8_0= ruleNumber )
-            	    {
-            	    // InternalTableDSL.g:1025:10: (lv_pollingTime_8_0= ruleNumber )
-            	    // InternalTableDSL.g:1026:11: lv_pollingTime_8_0= ruleNumber
-            	    {
-            	    if ( state.backtracking==0 ) {
-
-            	      											newCompositeNode(grammarAccess.getTableBeanAccess().getPollingTimeNumberParserRuleCall_2_3_1_0());
-            	      										
-            	    }
-            	    pushFollow(FOLLOW_16);
-            	    lv_pollingTime_8_0=ruleNumber();
-
-            	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      											if (current==null) {
-            	      												current = createModelElementForParent(grammarAccess.getTableBeanRule());
-            	      											}
-            	      											set(
-            	      												current,
-            	      												"pollingTime",
-            	      												lv_pollingTime_8_0,
-            	      												"org.eclipse.xtext.xbase.Xbase.Number");
-            	      											afterParserOrEnumRuleCall();
-            	      										
-            	    }
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-            	case 5 :
-            	    // InternalTableDSL.g:1049:4: ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) )
-            	    {
-            	    // InternalTableDSL.g:1049:4: ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) )
-            	    // InternalTableDSL.g:1050:5: {...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) )
-            	    {
-            	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableBean", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4)");
-            	    }
-            	    // InternalTableDSL.g:1050:106: ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) )
-            	    // InternalTableDSL.g:1051:6: ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) )
-            	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 4);
-            	    // InternalTableDSL.g:1054:9: ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) )
-            	    // InternalTableDSL.g:1054:10: {...}? => ( (lv_filtering_9_0= 'filtering' ) )
-            	    {
-            	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableBean", "true");
-            	    }
-            	    // InternalTableDSL.g:1054:19: ( (lv_filtering_9_0= 'filtering' ) )
-            	    // InternalTableDSL.g:1054:20: (lv_filtering_9_0= 'filtering' )
-            	    {
-            	    // InternalTableDSL.g:1054:20: (lv_filtering_9_0= 'filtering' )
-            	    // InternalTableDSL.g:1055:10: lv_filtering_9_0= 'filtering'
-            	    {
-            	    lv_filtering_9_0=(Token)match(input,27,FOLLOW_16); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      										newLeafNode(lv_filtering_9_0, grammarAccess.getTableBeanAccess().getFilteringFilteringKeyword_2_4_0());
-            	      									
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      										if (current==null) {
-            	      											current = createModelElement(grammarAccess.getTableBeanRule());
-            	      										}
-            	      										setWithLastConsumed(current, "filtering", true, "filtering");
-            	      									
-            	    }
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-            	case 6 :
-            	    // InternalTableDSL.g:1072:4: ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) )
-            	    {
-            	    // InternalTableDSL.g:1072:4: ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) )
-            	    // InternalTableDSL.g:1073:5: {...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) )
-            	    {
-            	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableBean", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5)");
-            	    }
-            	    // InternalTableDSL.g:1073:106: ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) )
-            	    // InternalTableDSL.g:1074:6: ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) )
-            	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 5);
-            	    // InternalTableDSL.g:1077:9: ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) )
-            	    // InternalTableDSL.g:1077:10: {...}? => ( (lv_embedded_10_0= 'embedded' ) )
-            	    {
-            	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableBean", "true");
-            	    }
-            	    // InternalTableDSL.g:1077:19: ( (lv_embedded_10_0= 'embedded' ) )
-            	    // InternalTableDSL.g:1077:20: (lv_embedded_10_0= 'embedded' )
-            	    {
-            	    // InternalTableDSL.g:1077:20: (lv_embedded_10_0= 'embedded' )
-            	    // InternalTableDSL.g:1078:10: lv_embedded_10_0= 'embedded'
-            	    {
-            	    lv_embedded_10_0=(Token)match(input,28,FOLLOW_16); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      										newLeafNode(lv_embedded_10_0, grammarAccess.getTableBeanAccess().getEmbeddedEmbeddedKeyword_2_5_0());
-            	      									
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      										if (current==null) {
-            	      											current = createModelElement(grammarAccess.getTableBeanRule());
-            	      										}
-            	      										setWithLastConsumed(current, "embedded", true, "embedded");
-            	      									
-            	    }
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-            	case 7 :
-            	    // InternalTableDSL.g:1095:4: ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) )
-            	    {
-            	    // InternalTableDSL.g:1095:4: ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) )
-            	    // InternalTableDSL.g:1096:5: {...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) )
-            	    {
-            	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableBean", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6)");
-            	    }
-            	    // InternalTableDSL.g:1096:106: ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) )
-            	    // InternalTableDSL.g:1097:6: ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) )
-            	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getTableBeanAccess().getUnorderedGroup_2(), 6);
-            	    // InternalTableDSL.g:1100:9: ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) )
-            	    // InternalTableDSL.g:1100:10: {...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) )
-            	    {
-            	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableBean", "true");
-            	    }
-            	    // InternalTableDSL.g:1100:19: (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) )
-            	    // InternalTableDSL.g:1100:20: otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) )
-            	    {
-            	    otherlv_11=(Token)match(input,29,FOLLOW_4); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      									newLeafNode(otherlv_11, grammarAccess.getTableBeanAccess().getToolbarKeyword_2_6_0());
-            	      								
-            	    }
-            	    // InternalTableDSL.g:1104:9: ( (otherlv_12= RULE_ID ) )
-            	    // InternalTableDSL.g:1105:10: (otherlv_12= RULE_ID )
-            	    {
-            	    // InternalTableDSL.g:1105:10: (otherlv_12= RULE_ID )
-            	    // InternalTableDSL.g:1106:11: otherlv_12= RULE_ID
-            	    {
-            	    if ( state.backtracking==0 ) {
-
-            	      											if (current==null) {
-            	      												current = createModelElement(grammarAccess.getTableBeanRule());
-            	      											}
-            	      										
-            	    }
-            	    otherlv_12=(Token)match(input,RULE_ID,FOLLOW_16); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      											newLeafNode(otherlv_12, grammarAccess.getTableBeanAccess().getToolbarActionToolbarCrossReference_2_6_1_0());
-            	      										
-            	    }
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop12;
-                }
-            } while (true);
-
-
-            }
-
-
-            }
-
-            getUnorderedGroupHelper().leave(grammarAccess.getTableBeanAccess().getUnorderedGroup_2());
-
-            }
-
-            // InternalTableDSL.g:1130:3: (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDatamart ) ) )?
-            int alt13=2;
-            int LA13_0 = input.LA(1);
-
-            if ( (LA13_0==30) ) {
-                alt13=1;
-            }
-            switch (alt13) {
-                case 1 :
-                    // InternalTableDSL.g:1131:4: otherlv_13= 'using' ( (lv_source_14_0= ruleTableDatamart ) )
-                    {
-                    otherlv_13=(Token)match(input,30,FOLLOW_15); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      				newLeafNode(otherlv_13, grammarAccess.getTableBeanAccess().getUsingKeyword_3_0());
-                      			
-                    }
-                    // InternalTableDSL.g:1135:4: ( (lv_source_14_0= ruleTableDatamart ) )
-                    // InternalTableDSL.g:1136:5: (lv_source_14_0= ruleTableDatamart )
-                    {
-                    // InternalTableDSL.g:1136:5: (lv_source_14_0= ruleTableDatamart )
-                    // InternalTableDSL.g:1137:6: lv_source_14_0= ruleTableDatamart
-                    {
-                    if ( state.backtracking==0 ) {
-
-                      						newCompositeNode(grammarAccess.getTableBeanAccess().getSourceTableDatamartParserRuleCall_3_1_0());
-                      					
-                    }
-                    pushFollow(FOLLOW_2);
-                    lv_source_14_0=ruleTableDatamart();
-
-                    state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      						if (current==null) {
-                      							current = createModelElementForParent(grammarAccess.getTableBeanRule());
-                      						}
-                      						set(
-                      							current,
-                      							"source",
-                      							lv_source_14_0,
-                      							"org.eclipse.osbp.xtext.table.TableDSL.TableDatamart");
-                      						afterParserOrEnumRuleCall();
-                      					
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-
-            }
-
-            if ( state.backtracking==0 ) {
-
-              	leaveRule();
-
-            }
-        }
-
-            catch (RecognitionException re) {
-                recover(input,re);
-                appendSkippedTokens();
-            }
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleTableBean"
-
-
     // $ANTLR start "entryRuleTablePreorder"
-    // InternalTableDSL.g:1159:1: entryRuleTablePreorder returns [EObject current=null] : iv_ruleTablePreorder= ruleTablePreorder EOF ;
+    // InternalTableDSL.g:795:1: entryRuleTablePreorder returns [EObject current=null] : iv_ruleTablePreorder= ruleTablePreorder EOF ;
     public final EObject entryRuleTablePreorder() throws RecognitionException {
         EObject current = null;
 
@@ -3292,8 +2338,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:1159:54: (iv_ruleTablePreorder= ruleTablePreorder EOF )
-            // InternalTableDSL.g:1160:2: iv_ruleTablePreorder= ruleTablePreorder EOF
+            // InternalTableDSL.g:795:54: (iv_ruleTablePreorder= ruleTablePreorder EOF )
+            // InternalTableDSL.g:796:2: iv_ruleTablePreorder= ruleTablePreorder EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTablePreorderRule()); 
@@ -3324,7 +2370,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTablePreorder"
-    // InternalTableDSL.g:1166:1: ruleTablePreorder returns [EObject current=null] : ( () otherlv_1= 'preorder' ( (lv_column_2_0= ruleTableValueElement ) ) ( (lv_ascending_3_0= 'ascending' ) )? ) ;
+    // InternalTableDSL.g:802:1: ruleTablePreorder returns [EObject current=null] : ( () otherlv_1= 'preorder' ( (lv_column_2_0= ruleTableValueElement ) ) ( (lv_ascending_3_0= 'ascending' ) )? ) ;
     public final EObject ruleTablePreorder() throws RecognitionException {
         EObject current = null;
 
@@ -3337,14 +2383,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:1172:2: ( ( () otherlv_1= 'preorder' ( (lv_column_2_0= ruleTableValueElement ) ) ( (lv_ascending_3_0= 'ascending' ) )? ) )
-            // InternalTableDSL.g:1173:2: ( () otherlv_1= 'preorder' ( (lv_column_2_0= ruleTableValueElement ) ) ( (lv_ascending_3_0= 'ascending' ) )? )
+            // InternalTableDSL.g:808:2: ( ( () otherlv_1= 'preorder' ( (lv_column_2_0= ruleTableValueElement ) ) ( (lv_ascending_3_0= 'ascending' ) )? ) )
+            // InternalTableDSL.g:809:2: ( () otherlv_1= 'preorder' ( (lv_column_2_0= ruleTableValueElement ) ) ( (lv_ascending_3_0= 'ascending' ) )? )
             {
-            // InternalTableDSL.g:1173:2: ( () otherlv_1= 'preorder' ( (lv_column_2_0= ruleTableValueElement ) ) ( (lv_ascending_3_0= 'ascending' ) )? )
-            // InternalTableDSL.g:1174:3: () otherlv_1= 'preorder' ( (lv_column_2_0= ruleTableValueElement ) ) ( (lv_ascending_3_0= 'ascending' ) )?
+            // InternalTableDSL.g:809:2: ( () otherlv_1= 'preorder' ( (lv_column_2_0= ruleTableValueElement ) ) ( (lv_ascending_3_0= 'ascending' ) )? )
+            // InternalTableDSL.g:810:3: () otherlv_1= 'preorder' ( (lv_column_2_0= ruleTableValueElement ) ) ( (lv_ascending_3_0= 'ascending' ) )?
             {
-            // InternalTableDSL.g:1174:3: ()
-            // InternalTableDSL.g:1175:4: 
+            // InternalTableDSL.g:810:3: ()
+            // InternalTableDSL.g:811:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -3356,24 +2402,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,33,FOLLOW_17); if (state.failed) return current;
+            otherlv_1=(Token)match(input,32,FOLLOW_16); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getTablePreorderAccess().getPreorderKeyword_1());
               		
             }
-            // InternalTableDSL.g:1185:3: ( (lv_column_2_0= ruleTableValueElement ) )
-            // InternalTableDSL.g:1186:4: (lv_column_2_0= ruleTableValueElement )
+            // InternalTableDSL.g:821:3: ( (lv_column_2_0= ruleTableValueElement ) )
+            // InternalTableDSL.g:822:4: (lv_column_2_0= ruleTableValueElement )
             {
-            // InternalTableDSL.g:1186:4: (lv_column_2_0= ruleTableValueElement )
-            // InternalTableDSL.g:1187:5: lv_column_2_0= ruleTableValueElement
+            // InternalTableDSL.g:822:4: (lv_column_2_0= ruleTableValueElement )
+            // InternalTableDSL.g:823:5: lv_column_2_0= ruleTableValueElement
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getTablePreorderAccess().getColumnTableValueElementParserRuleCall_2_0());
               				
             }
-            pushFollow(FOLLOW_18);
+            pushFollow(FOLLOW_17);
             lv_column_2_0=ruleTableValueElement();
 
             state._fsp--;
@@ -3397,21 +2443,21 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:1204:3: ( (lv_ascending_3_0= 'ascending' ) )?
-            int alt14=2;
-            int LA14_0 = input.LA(1);
+            // InternalTableDSL.g:840:3: ( (lv_ascending_3_0= 'ascending' ) )?
+            int alt12=2;
+            int LA12_0 = input.LA(1);
 
-            if ( (LA14_0==34) ) {
-                alt14=1;
+            if ( (LA12_0==33) ) {
+                alt12=1;
             }
-            switch (alt14) {
+            switch (alt12) {
                 case 1 :
-                    // InternalTableDSL.g:1205:4: (lv_ascending_3_0= 'ascending' )
+                    // InternalTableDSL.g:841:4: (lv_ascending_3_0= 'ascending' )
                     {
-                    // InternalTableDSL.g:1205:4: (lv_ascending_3_0= 'ascending' )
-                    // InternalTableDSL.g:1206:5: lv_ascending_3_0= 'ascending'
+                    // InternalTableDSL.g:841:4: (lv_ascending_3_0= 'ascending' )
+                    // InternalTableDSL.g:842:5: lv_ascending_3_0= 'ascending'
                     {
-                    lv_ascending_3_0=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
+                    lv_ascending_3_0=(Token)match(input,33,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(lv_ascending_3_0, grammarAccess.getTablePreorderAccess().getAscendingAscendingKeyword_3_0());
@@ -3459,7 +2505,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableValue"
-    // InternalTableDSL.g:1222:1: entryRuleTableValue returns [EObject current=null] : iv_ruleTableValue= ruleTableValue EOF ;
+    // InternalTableDSL.g:858:1: entryRuleTableValue returns [EObject current=null] : iv_ruleTableValue= ruleTableValue EOF ;
     public final EObject entryRuleTableValue() throws RecognitionException {
         EObject current = null;
 
@@ -3467,8 +2513,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:1222:51: (iv_ruleTableValue= ruleTableValue EOF )
-            // InternalTableDSL.g:1223:2: iv_ruleTableValue= ruleTableValue EOF
+            // InternalTableDSL.g:858:51: (iv_ruleTableValue= ruleTableValue EOF )
+            // InternalTableDSL.g:859:2: iv_ruleTableValue= ruleTableValue EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableValueRule()); 
@@ -3499,7 +2545,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableValue"
-    // InternalTableDSL.g:1229:1: ruleTableValue returns [EObject current=null] : ( () otherlv_1= 'value' ( (lv_column_2_0= ruleTableValueElement ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) ) ) ) ;
+    // InternalTableDSL.g:865:1: ruleTableValue returns [EObject current=null] : ( () otherlv_1= 'value' ( (lv_column_2_0= ruleTableValueElement ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) ) ) ) ;
     public final EObject ruleTableValue() throws RecognitionException {
         EObject current = null;
 
@@ -3533,14 +2579,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:1235:2: ( ( () otherlv_1= 'value' ( (lv_column_2_0= ruleTableValueElement ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) ) ) ) )
-            // InternalTableDSL.g:1236:2: ( () otherlv_1= 'value' ( (lv_column_2_0= ruleTableValueElement ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) ) ) )
+            // InternalTableDSL.g:871:2: ( ( () otherlv_1= 'value' ( (lv_column_2_0= ruleTableValueElement ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) ) ) ) )
+            // InternalTableDSL.g:872:2: ( () otherlv_1= 'value' ( (lv_column_2_0= ruleTableValueElement ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) ) ) )
             {
-            // InternalTableDSL.g:1236:2: ( () otherlv_1= 'value' ( (lv_column_2_0= ruleTableValueElement ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) ) ) )
-            // InternalTableDSL.g:1237:3: () otherlv_1= 'value' ( (lv_column_2_0= ruleTableValueElement ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) ) )
+            // InternalTableDSL.g:872:2: ( () otherlv_1= 'value' ( (lv_column_2_0= ruleTableValueElement ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) ) ) )
+            // InternalTableDSL.g:873:3: () otherlv_1= 'value' ( (lv_column_2_0= ruleTableValueElement ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) ) )
             {
-            // InternalTableDSL.g:1237:3: ()
-            // InternalTableDSL.g:1238:4: 
+            // InternalTableDSL.g:873:3: ()
+            // InternalTableDSL.g:874:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -3552,24 +2598,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,35,FOLLOW_17); if (state.failed) return current;
+            otherlv_1=(Token)match(input,34,FOLLOW_16); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getTableValueAccess().getValueKeyword_1());
               		
             }
-            // InternalTableDSL.g:1248:3: ( (lv_column_2_0= ruleTableValueElement ) )
-            // InternalTableDSL.g:1249:4: (lv_column_2_0= ruleTableValueElement )
+            // InternalTableDSL.g:884:3: ( (lv_column_2_0= ruleTableValueElement ) )
+            // InternalTableDSL.g:885:4: (lv_column_2_0= ruleTableValueElement )
             {
-            // InternalTableDSL.g:1249:4: (lv_column_2_0= ruleTableValueElement )
-            // InternalTableDSL.g:1250:5: lv_column_2_0= ruleTableValueElement
+            // InternalTableDSL.g:885:4: (lv_column_2_0= ruleTableValueElement )
+            // InternalTableDSL.g:886:5: lv_column_2_0= ruleTableValueElement
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getTableValueAccess().getColumnTableValueElementParserRuleCall_2_0());
               				
             }
-            pushFollow(FOLLOW_19);
+            pushFollow(FOLLOW_18);
             lv_column_2_0=ruleTableValueElement();
 
             state._fsp--;
@@ -3593,68 +2639,68 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:1267:3: ( ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) ) )
-            // InternalTableDSL.g:1268:4: ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) )
+            // InternalTableDSL.g:903:3: ( ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) ) )
+            // InternalTableDSL.g:904:4: ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) )
             {
-            // InternalTableDSL.g:1268:4: ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) )
-            // InternalTableDSL.g:1269:5: ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* )
+            // InternalTableDSL.g:904:4: ( ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* ) )
+            // InternalTableDSL.g:905:5: ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* )
             {
             getUnorderedGroupHelper().enter(grammarAccess.getTableValueAccess().getUnorderedGroup_3());
-            // InternalTableDSL.g:1272:5: ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* )
-            // InternalTableDSL.g:1273:6: ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )*
+            // InternalTableDSL.g:908:5: ( ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )* )
+            // InternalTableDSL.g:909:6: ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )*
             {
-            // InternalTableDSL.g:1273:6: ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )*
-            loop15:
+            // InternalTableDSL.g:909:6: ( ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) ) )*
+            loop13:
             do {
-                int alt15=6;
-                int LA15_0 = input.LA(1);
+                int alt13=6;
+                int LA13_0 = input.LA(1);
 
-                if ( LA15_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
-                    alt15=1;
+                if ( LA13_0 == 35 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
+                    alt13=1;
                 }
-                else if ( LA15_0 == 37 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
-                    alt15=2;
+                else if ( LA13_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
+                    alt13=2;
                 }
-                else if ( LA15_0 == 42 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
-                    alt15=3;
+                else if ( LA13_0 == 41 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
+                    alt13=3;
                 }
-                else if ( LA15_0 == 38 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
-                    alt15=4;
+                else if ( LA13_0 == 37 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
+                    alt13=4;
                 }
-                else if ( LA15_0 == 46 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
-                    alt15=5;
+                else if ( LA13_0 == 45 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
+                    alt13=5;
                 }
 
 
-                switch (alt15) {
+                switch (alt13) {
             	case 1 :
-            	    // InternalTableDSL.g:1274:4: ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) )
+            	    // InternalTableDSL.g:910:4: ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:1274:4: ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) )
-            	    // InternalTableDSL.g:1275:5: {...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) )
+            	    // InternalTableDSL.g:910:4: ({...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) ) )
+            	    // InternalTableDSL.g:911:5: {...}? => ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableValue", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0)");
             	    }
-            	    // InternalTableDSL.g:1275:107: ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) )
-            	    // InternalTableDSL.g:1276:6: ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) )
+            	    // InternalTableDSL.g:911:107: ( ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) ) )
+            	    // InternalTableDSL.g:912:6: ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 0);
-            	    // InternalTableDSL.g:1279:9: ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) )
-            	    // InternalTableDSL.g:1279:10: {...}? => ( (lv_collapsed_4_0= 'collapse' ) )
+            	    // InternalTableDSL.g:915:9: ({...}? => ( (lv_collapsed_4_0= 'collapse' ) ) )
+            	    // InternalTableDSL.g:915:10: {...}? => ( (lv_collapsed_4_0= 'collapse' ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableValue", "true");
             	    }
-            	    // InternalTableDSL.g:1279:19: ( (lv_collapsed_4_0= 'collapse' ) )
-            	    // InternalTableDSL.g:1279:20: (lv_collapsed_4_0= 'collapse' )
+            	    // InternalTableDSL.g:915:19: ( (lv_collapsed_4_0= 'collapse' ) )
+            	    // InternalTableDSL.g:915:20: (lv_collapsed_4_0= 'collapse' )
             	    {
-            	    // InternalTableDSL.g:1279:20: (lv_collapsed_4_0= 'collapse' )
-            	    // InternalTableDSL.g:1280:10: lv_collapsed_4_0= 'collapse'
+            	    // InternalTableDSL.g:915:20: (lv_collapsed_4_0= 'collapse' )
+            	    // InternalTableDSL.g:916:10: lv_collapsed_4_0= 'collapse'
             	    {
-            	    lv_collapsed_4_0=(Token)match(input,36,FOLLOW_19); if (state.failed) return current;
+            	    lv_collapsed_4_0=(Token)match(input,35,FOLLOW_18); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      										newLeafNode(lv_collapsed_4_0, grammarAccess.getTableValueAccess().getCollapsedCollapseKeyword_3_0_0());
@@ -3688,42 +2734,42 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // InternalTableDSL.g:1297:4: ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) )
+            	    // InternalTableDSL.g:933:4: ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:1297:4: ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) )
-            	    // InternalTableDSL.g:1298:5: {...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) )
+            	    // InternalTableDSL.g:933:4: ({...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) ) )
+            	    // InternalTableDSL.g:934:5: {...}? => ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableValue", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1)");
             	    }
-            	    // InternalTableDSL.g:1298:107: ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) )
-            	    // InternalTableDSL.g:1299:6: ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) )
+            	    // InternalTableDSL.g:934:107: ( ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) ) )
+            	    // InternalTableDSL.g:935:6: ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 1);
-            	    // InternalTableDSL.g:1302:9: ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) )
-            	    // InternalTableDSL.g:1302:10: {...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) )
+            	    // InternalTableDSL.g:938:9: ({...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) ) )
+            	    // InternalTableDSL.g:938:10: {...}? => (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableValue", "true");
             	    }
-            	    // InternalTableDSL.g:1302:19: (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) )
-            	    // InternalTableDSL.g:1302:20: otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) )
+            	    // InternalTableDSL.g:938:19: (otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) ) )
+            	    // InternalTableDSL.g:938:20: otherlv_5= 'icon' ( (lv_iconName_6_0= RULE_STRING ) )
             	    {
-            	    otherlv_5=(Token)match(input,37,FOLLOW_8); if (state.failed) return current;
+            	    otherlv_5=(Token)match(input,36,FOLLOW_8); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      									newLeafNode(otherlv_5, grammarAccess.getTableValueAccess().getIconKeyword_3_1_0());
             	      								
             	    }
-            	    // InternalTableDSL.g:1306:9: ( (lv_iconName_6_0= RULE_STRING ) )
-            	    // InternalTableDSL.g:1307:10: (lv_iconName_6_0= RULE_STRING )
+            	    // InternalTableDSL.g:942:9: ( (lv_iconName_6_0= RULE_STRING ) )
+            	    // InternalTableDSL.g:943:10: (lv_iconName_6_0= RULE_STRING )
             	    {
-            	    // InternalTableDSL.g:1307:10: (lv_iconName_6_0= RULE_STRING )
-            	    // InternalTableDSL.g:1308:11: lv_iconName_6_0= RULE_STRING
+            	    // InternalTableDSL.g:943:10: (lv_iconName_6_0= RULE_STRING )
+            	    // InternalTableDSL.g:944:11: lv_iconName_6_0= RULE_STRING
             	    {
-            	    lv_iconName_6_0=(Token)match(input,RULE_STRING,FOLLOW_19); if (state.failed) return current;
+            	    lv_iconName_6_0=(Token)match(input,RULE_STRING,FOLLOW_18); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      											newLeafNode(lv_iconName_6_0, grammarAccess.getTableValueAccess().getIconNameSTRINGTerminalRuleCall_3_1_1_0());
@@ -3764,38 +2810,38 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // InternalTableDSL.g:1330:4: ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) )
+            	    // InternalTableDSL.g:966:4: ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:1330:4: ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) )
-            	    // InternalTableDSL.g:1331:5: {...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) )
+            	    // InternalTableDSL.g:966:4: ({...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) ) )
+            	    // InternalTableDSL.g:967:5: {...}? => ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableValue", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2)");
             	    }
-            	    // InternalTableDSL.g:1331:107: ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) )
-            	    // InternalTableDSL.g:1332:6: ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) )
+            	    // InternalTableDSL.g:967:107: ( ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) ) )
+            	    // InternalTableDSL.g:968:6: ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 2);
-            	    // InternalTableDSL.g:1335:9: ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) )
-            	    // InternalTableDSL.g:1335:10: {...}? => ( (lv_formatter_7_0= ruleTableFormatter ) )
+            	    // InternalTableDSL.g:971:9: ({...}? => ( (lv_formatter_7_0= ruleTableFormatter ) ) )
+            	    // InternalTableDSL.g:971:10: {...}? => ( (lv_formatter_7_0= ruleTableFormatter ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableValue", "true");
             	    }
-            	    // InternalTableDSL.g:1335:19: ( (lv_formatter_7_0= ruleTableFormatter ) )
-            	    // InternalTableDSL.g:1335:20: (lv_formatter_7_0= ruleTableFormatter )
+            	    // InternalTableDSL.g:971:19: ( (lv_formatter_7_0= ruleTableFormatter ) )
+            	    // InternalTableDSL.g:971:20: (lv_formatter_7_0= ruleTableFormatter )
             	    {
-            	    // InternalTableDSL.g:1335:20: (lv_formatter_7_0= ruleTableFormatter )
-            	    // InternalTableDSL.g:1336:10: lv_formatter_7_0= ruleTableFormatter
+            	    // InternalTableDSL.g:971:20: (lv_formatter_7_0= ruleTableFormatter )
+            	    // InternalTableDSL.g:972:10: lv_formatter_7_0= ruleTableFormatter
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      										newCompositeNode(grammarAccess.getTableValueAccess().getFormatterTableFormatterParserRuleCall_3_2_0());
             	      									
             	    }
-            	    pushFollow(FOLLOW_19);
+            	    pushFollow(FOLLOW_18);
             	    lv_formatter_7_0=ruleTableFormatter();
 
             	    state._fsp--;
@@ -3833,36 +2879,36 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 4 :
-            	    // InternalTableDSL.g:1358:4: ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) )
+            	    // InternalTableDSL.g:994:4: ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:1358:4: ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) )
-            	    // InternalTableDSL.g:1359:5: {...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) )
+            	    // InternalTableDSL.g:994:4: ({...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) ) )
+            	    // InternalTableDSL.g:995:5: {...}? => ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableValue", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3)");
             	    }
-            	    // InternalTableDSL.g:1359:107: ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) )
-            	    // InternalTableDSL.g:1360:6: ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) )
+            	    // InternalTableDSL.g:995:107: ( ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) ) )
+            	    // InternalTableDSL.g:996:6: ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 3);
-            	    // InternalTableDSL.g:1363:9: ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) )
-            	    // InternalTableDSL.g:1363:10: {...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) )
+            	    // InternalTableDSL.g:999:9: ({...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) ) )
+            	    // InternalTableDSL.g:999:10: {...}? => ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableValue", "true");
             	    }
-            	    // InternalTableDSL.g:1363:19: ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) )
-            	    // InternalTableDSL.g:1363:20: ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) )
+            	    // InternalTableDSL.g:999:19: ( ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) ) )
+            	    // InternalTableDSL.g:999:20: ( (lv_hasImage_8_0= 'image' ) ) ( (lv_image_9_0= ruleTableImage ) )
             	    {
-            	    // InternalTableDSL.g:1363:20: ( (lv_hasImage_8_0= 'image' ) )
-            	    // InternalTableDSL.g:1364:10: (lv_hasImage_8_0= 'image' )
+            	    // InternalTableDSL.g:999:20: ( (lv_hasImage_8_0= 'image' ) )
+            	    // InternalTableDSL.g:1000:10: (lv_hasImage_8_0= 'image' )
             	    {
-            	    // InternalTableDSL.g:1364:10: (lv_hasImage_8_0= 'image' )
-            	    // InternalTableDSL.g:1365:11: lv_hasImage_8_0= 'image'
+            	    // InternalTableDSL.g:1000:10: (lv_hasImage_8_0= 'image' )
+            	    // InternalTableDSL.g:1001:11: lv_hasImage_8_0= 'image'
             	    {
-            	    lv_hasImage_8_0=(Token)match(input,38,FOLLOW_20); if (state.failed) return current;
+            	    lv_hasImage_8_0=(Token)match(input,37,FOLLOW_19); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      											newLeafNode(lv_hasImage_8_0, grammarAccess.getTableValueAccess().getHasImageImageKeyword_3_3_0_0());
@@ -3882,18 +2928,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:1377:9: ( (lv_image_9_0= ruleTableImage ) )
-            	    // InternalTableDSL.g:1378:10: (lv_image_9_0= ruleTableImage )
+            	    // InternalTableDSL.g:1013:9: ( (lv_image_9_0= ruleTableImage ) )
+            	    // InternalTableDSL.g:1014:10: (lv_image_9_0= ruleTableImage )
             	    {
-            	    // InternalTableDSL.g:1378:10: (lv_image_9_0= ruleTableImage )
-            	    // InternalTableDSL.g:1379:11: lv_image_9_0= ruleTableImage
+            	    // InternalTableDSL.g:1014:10: (lv_image_9_0= ruleTableImage )
+            	    // InternalTableDSL.g:1015:11: lv_image_9_0= ruleTableImage
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      											newCompositeNode(grammarAccess.getTableValueAccess().getImageTableImageParserRuleCall_3_3_1_0());
             	      										
             	    }
-            	    pushFollow(FOLLOW_19);
+            	    pushFollow(FOLLOW_18);
             	    lv_image_9_0=ruleTableImage();
 
             	    state._fsp--;
@@ -3934,38 +2980,38 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 5 :
-            	    // InternalTableDSL.g:1402:4: ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) )
+            	    // InternalTableDSL.g:1038:4: ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:1402:4: ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) )
-            	    // InternalTableDSL.g:1403:5: {...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) )
+            	    // InternalTableDSL.g:1038:4: ({...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) ) )
+            	    // InternalTableDSL.g:1039:5: {...}? => ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableValue", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4)");
             	    }
-            	    // InternalTableDSL.g:1403:107: ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) )
-            	    // InternalTableDSL.g:1404:6: ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) )
+            	    // InternalTableDSL.g:1039:107: ( ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) ) )
+            	    // InternalTableDSL.g:1040:6: ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_3(), 4);
-            	    // InternalTableDSL.g:1407:9: ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) )
-            	    // InternalTableDSL.g:1407:10: {...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) )
+            	    // InternalTableDSL.g:1043:9: ({...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) ) )
+            	    // InternalTableDSL.g:1043:10: {...}? => ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableValue", "true");
             	    }
-            	    // InternalTableDSL.g:1407:19: ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) )
-            	    // InternalTableDSL.g:1407:20: (lv_tooltipPattern_10_0= ruleTableTooltipPattern )
+            	    // InternalTableDSL.g:1043:19: ( (lv_tooltipPattern_10_0= ruleTableTooltipPattern ) )
+            	    // InternalTableDSL.g:1043:20: (lv_tooltipPattern_10_0= ruleTableTooltipPattern )
             	    {
-            	    // InternalTableDSL.g:1407:20: (lv_tooltipPattern_10_0= ruleTableTooltipPattern )
-            	    // InternalTableDSL.g:1408:10: lv_tooltipPattern_10_0= ruleTableTooltipPattern
+            	    // InternalTableDSL.g:1043:20: (lv_tooltipPattern_10_0= ruleTableTooltipPattern )
+            	    // InternalTableDSL.g:1044:10: lv_tooltipPattern_10_0= ruleTableTooltipPattern
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      										newCompositeNode(grammarAccess.getTableValueAccess().getTooltipPatternTableTooltipPatternParserRuleCall_3_4_0());
             	      									
             	    }
-            	    pushFollow(FOLLOW_19);
+            	    pushFollow(FOLLOW_18);
             	    lv_tooltipPattern_10_0=ruleTableTooltipPattern();
 
             	    state._fsp--;
@@ -4004,7 +3050,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop15;
+            	    break loop13;
                 }
             } while (true);
 
@@ -4018,76 +3064,76 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:1437:3: ( ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) ) )
-            // InternalTableDSL.g:1438:4: ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) )
+            // InternalTableDSL.g:1073:3: ( ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) ) )
+            // InternalTableDSL.g:1074:4: ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) )
             {
-            // InternalTableDSL.g:1438:4: ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) )
-            // InternalTableDSL.g:1439:5: ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* )
+            // InternalTableDSL.g:1074:4: ( ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* ) )
+            // InternalTableDSL.g:1075:5: ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* )
             {
             getUnorderedGroupHelper().enter(grammarAccess.getTableValueAccess().getUnorderedGroup_4());
-            // InternalTableDSL.g:1442:5: ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* )
-            // InternalTableDSL.g:1443:6: ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )*
+            // InternalTableDSL.g:1078:5: ( ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )* )
+            // InternalTableDSL.g:1079:6: ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )*
             {
-            // InternalTableDSL.g:1443:6: ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )*
-            loop20:
+            // InternalTableDSL.g:1079:6: ( ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) ) | ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) ) )*
+            loop18:
             do {
-                int alt20=3;
-                int LA20_0 = input.LA(1);
+                int alt18=3;
+                int LA18_0 = input.LA(1);
 
-                if ( LA20_0 == 39 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0) ) {
-                    alt20=1;
+                if ( LA18_0 == 38 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0) ) {
+                    alt18=1;
                 }
-                else if ( LA20_0 == 41 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 1) ) {
-                    alt20=2;
+                else if ( LA18_0 == 40 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 1) ) {
+                    alt18=2;
                 }
 
 
-                switch (alt20) {
+                switch (alt18) {
             	case 1 :
-            	    // InternalTableDSL.g:1444:4: ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) )
+            	    // InternalTableDSL.g:1080:4: ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) )
             	    {
-            	    // InternalTableDSL.g:1444:4: ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) )
-            	    // InternalTableDSL.g:1445:5: {...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) )
+            	    // InternalTableDSL.g:1080:4: ({...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) ) )
+            	    // InternalTableDSL.g:1081:5: {...}? => ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableValue", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0)");
             	    }
-            	    // InternalTableDSL.g:1445:107: ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) )
-            	    // InternalTableDSL.g:1446:6: ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) )
+            	    // InternalTableDSL.g:1081:107: ( ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) ) )
+            	    // InternalTableDSL.g:1082:6: ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 0);
-            	    // InternalTableDSL.g:1449:9: ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) )
-            	    // InternalTableDSL.g:1449:10: {...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' )
+            	    // InternalTableDSL.g:1085:9: ({...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' ) )
+            	    // InternalTableDSL.g:1085:10: {...}? => (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableValue", "true");
             	    }
-            	    // InternalTableDSL.g:1449:19: (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' )
-            	    // InternalTableDSL.g:1449:20: otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}'
+            	    // InternalTableDSL.g:1085:19: (otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}' )
+            	    // InternalTableDSL.g:1085:20: otherlv_12= 'intervals' ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )? otherlv_14= '{' ( (lv_intervals_15_0= ruleTableInterval ) )* otherlv_16= '}'
             	    {
-            	    otherlv_12=(Token)match(input,39,FOLLOW_21); if (state.failed) return current;
+            	    otherlv_12=(Token)match(input,38,FOLLOW_20); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      									newLeafNode(otherlv_12, grammarAccess.getTableValueAccess().getIntervalsKeyword_4_0_0());
             	      								
             	    }
-            	    // InternalTableDSL.g:1453:9: ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )?
-            	    int alt16=2;
-            	    int LA16_0 = input.LA(1);
+            	    // InternalTableDSL.g:1089:9: ( (lv_hideLabelInterval_13_0= 'hidelabel' ) )?
+            	    int alt14=2;
+            	    int LA14_0 = input.LA(1);
 
-            	    if ( (LA16_0==40) ) {
-            	        alt16=1;
+            	    if ( (LA14_0==39) ) {
+            	        alt14=1;
             	    }
-            	    switch (alt16) {
+            	    switch (alt14) {
             	        case 1 :
-            	            // InternalTableDSL.g:1454:10: (lv_hideLabelInterval_13_0= 'hidelabel' )
+            	            // InternalTableDSL.g:1090:10: (lv_hideLabelInterval_13_0= 'hidelabel' )
             	            {
-            	            // InternalTableDSL.g:1454:10: (lv_hideLabelInterval_13_0= 'hidelabel' )
-            	            // InternalTableDSL.g:1455:11: lv_hideLabelInterval_13_0= 'hidelabel'
+            	            // InternalTableDSL.g:1090:10: (lv_hideLabelInterval_13_0= 'hidelabel' )
+            	            // InternalTableDSL.g:1091:11: lv_hideLabelInterval_13_0= 'hidelabel'
             	            {
-            	            lv_hideLabelInterval_13_0=(Token)match(input,40,FOLLOW_22); if (state.failed) return current;
+            	            lv_hideLabelInterval_13_0=(Token)match(input,39,FOLLOW_21); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              											newLeafNode(lv_hideLabelInterval_13_0, grammarAccess.getTableValueAccess().getHideLabelIntervalHidelabelKeyword_4_0_1_0());
@@ -4110,36 +3156,36 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    otherlv_14=(Token)match(input,16,FOLLOW_23); if (state.failed) return current;
+            	    otherlv_14=(Token)match(input,16,FOLLOW_22); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      									newLeafNode(otherlv_14, grammarAccess.getTableValueAccess().getLeftCurlyBracketKeyword_4_0_2());
             	      								
             	    }
-            	    // InternalTableDSL.g:1471:9: ( (lv_intervals_15_0= ruleTableInterval ) )*
-            	    loop17:
+            	    // InternalTableDSL.g:1107:9: ( (lv_intervals_15_0= ruleTableInterval ) )*
+            	    loop15:
             	    do {
-            	        int alt17=2;
-            	        int LA17_0 = input.LA(1);
+            	        int alt15=2;
+            	        int LA15_0 = input.LA(1);
 
-            	        if ( ((LA17_0>=56 && LA17_0<=58)) ) {
-            	            alt17=1;
+            	        if ( ((LA15_0>=55 && LA15_0<=57)) ) {
+            	            alt15=1;
             	        }
 
 
-            	        switch (alt17) {
+            	        switch (alt15) {
             	    	case 1 :
-            	    	    // InternalTableDSL.g:1472:10: (lv_intervals_15_0= ruleTableInterval )
+            	    	    // InternalTableDSL.g:1108:10: (lv_intervals_15_0= ruleTableInterval )
             	    	    {
-            	    	    // InternalTableDSL.g:1472:10: (lv_intervals_15_0= ruleTableInterval )
-            	    	    // InternalTableDSL.g:1473:11: lv_intervals_15_0= ruleTableInterval
+            	    	    // InternalTableDSL.g:1108:10: (lv_intervals_15_0= ruleTableInterval )
+            	    	    // InternalTableDSL.g:1109:11: lv_intervals_15_0= ruleTableInterval
             	    	    {
             	    	    if ( state.backtracking==0 ) {
 
             	    	      											newCompositeNode(grammarAccess.getTableValueAccess().getIntervalsTableIntervalParserRuleCall_4_0_3_0());
             	    	      										
             	    	    }
-            	    	    pushFollow(FOLLOW_23);
+            	    	    pushFollow(FOLLOW_22);
             	    	    lv_intervals_15_0=ruleTableInterval();
 
             	    	    state._fsp--;
@@ -4165,11 +3211,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    	    break;
 
             	    	default :
-            	    	    break loop17;
+            	    	    break loop15;
             	        }
             	    } while (true);
 
-            	    otherlv_16=(Token)match(input,17,FOLLOW_24); if (state.failed) return current;
+            	    otherlv_16=(Token)match(input,17,FOLLOW_23); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      									newLeafNode(otherlv_16, grammarAccess.getTableValueAccess().getRightCurlyBracketKeyword_4_0_4());
@@ -4192,50 +3238,50 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // InternalTableDSL.g:1500:4: ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) )
+            	    // InternalTableDSL.g:1136:4: ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) )
             	    {
-            	    // InternalTableDSL.g:1500:4: ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) )
-            	    // InternalTableDSL.g:1501:5: {...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) )
+            	    // InternalTableDSL.g:1136:4: ({...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) ) )
+            	    // InternalTableDSL.g:1137:5: {...}? => ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 1) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableValue", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 1)");
             	    }
-            	    // InternalTableDSL.g:1501:107: ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) )
-            	    // InternalTableDSL.g:1502:6: ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) )
+            	    // InternalTableDSL.g:1137:107: ( ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) ) )
+            	    // InternalTableDSL.g:1138:6: ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableValueAccess().getUnorderedGroup_4(), 1);
-            	    // InternalTableDSL.g:1505:9: ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) )
-            	    // InternalTableDSL.g:1505:10: {...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' )
+            	    // InternalTableDSL.g:1141:9: ({...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' ) )
+            	    // InternalTableDSL.g:1141:10: {...}? => (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableValue", "true");
             	    }
-            	    // InternalTableDSL.g:1505:19: (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' )
-            	    // InternalTableDSL.g:1505:20: otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}'
+            	    // InternalTableDSL.g:1141:19: (otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}' )
+            	    // InternalTableDSL.g:1141:20: otherlv_17= 'lookups' ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )? otherlv_19= '{' ( (lv_lookups_20_0= ruleTableLookup ) )* otherlv_21= '}'
             	    {
-            	    otherlv_17=(Token)match(input,41,FOLLOW_21); if (state.failed) return current;
+            	    otherlv_17=(Token)match(input,40,FOLLOW_20); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      									newLeafNode(otherlv_17, grammarAccess.getTableValueAccess().getLookupsKeyword_4_1_0());
             	      								
             	    }
-            	    // InternalTableDSL.g:1509:9: ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )?
-            	    int alt18=2;
-            	    int LA18_0 = input.LA(1);
+            	    // InternalTableDSL.g:1145:9: ( (lv_hideLabelLookup_18_0= 'hidelabel' ) )?
+            	    int alt16=2;
+            	    int LA16_0 = input.LA(1);
 
-            	    if ( (LA18_0==40) ) {
-            	        alt18=1;
+            	    if ( (LA16_0==39) ) {
+            	        alt16=1;
             	    }
-            	    switch (alt18) {
+            	    switch (alt16) {
             	        case 1 :
-            	            // InternalTableDSL.g:1510:10: (lv_hideLabelLookup_18_0= 'hidelabel' )
+            	            // InternalTableDSL.g:1146:10: (lv_hideLabelLookup_18_0= 'hidelabel' )
             	            {
-            	            // InternalTableDSL.g:1510:10: (lv_hideLabelLookup_18_0= 'hidelabel' )
-            	            // InternalTableDSL.g:1511:11: lv_hideLabelLookup_18_0= 'hidelabel'
+            	            // InternalTableDSL.g:1146:10: (lv_hideLabelLookup_18_0= 'hidelabel' )
+            	            // InternalTableDSL.g:1147:11: lv_hideLabelLookup_18_0= 'hidelabel'
             	            {
-            	            lv_hideLabelLookup_18_0=(Token)match(input,40,FOLLOW_22); if (state.failed) return current;
+            	            lv_hideLabelLookup_18_0=(Token)match(input,39,FOLLOW_21); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              											newLeafNode(lv_hideLabelLookup_18_0, grammarAccess.getTableValueAccess().getHideLabelLookupHidelabelKeyword_4_1_1_0());
@@ -4258,36 +3304,36 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    otherlv_19=(Token)match(input,16,FOLLOW_25); if (state.failed) return current;
+            	    otherlv_19=(Token)match(input,16,FOLLOW_24); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      									newLeafNode(otherlv_19, grammarAccess.getTableValueAccess().getLeftCurlyBracketKeyword_4_1_2());
             	      								
             	    }
-            	    // InternalTableDSL.g:1527:9: ( (lv_lookups_20_0= ruleTableLookup ) )*
-            	    loop19:
+            	    // InternalTableDSL.g:1163:9: ( (lv_lookups_20_0= ruleTableLookup ) )*
+            	    loop17:
             	    do {
-            	        int alt19=2;
-            	        int LA19_0 = input.LA(1);
+            	        int alt17=2;
+            	        int LA17_0 = input.LA(1);
 
-            	        if ( ((LA19_0>=58 && LA19_0<=61)) ) {
-            	            alt19=1;
+            	        if ( ((LA17_0>=57 && LA17_0<=60)) ) {
+            	            alt17=1;
             	        }
 
 
-            	        switch (alt19) {
+            	        switch (alt17) {
             	    	case 1 :
-            	    	    // InternalTableDSL.g:1528:10: (lv_lookups_20_0= ruleTableLookup )
+            	    	    // InternalTableDSL.g:1164:10: (lv_lookups_20_0= ruleTableLookup )
             	    	    {
-            	    	    // InternalTableDSL.g:1528:10: (lv_lookups_20_0= ruleTableLookup )
-            	    	    // InternalTableDSL.g:1529:11: lv_lookups_20_0= ruleTableLookup
+            	    	    // InternalTableDSL.g:1164:10: (lv_lookups_20_0= ruleTableLookup )
+            	    	    // InternalTableDSL.g:1165:11: lv_lookups_20_0= ruleTableLookup
             	    	    {
             	    	    if ( state.backtracking==0 ) {
 
             	    	      											newCompositeNode(grammarAccess.getTableValueAccess().getLookupsTableLookupParserRuleCall_4_1_3_0());
             	    	      										
             	    	    }
-            	    	    pushFollow(FOLLOW_25);
+            	    	    pushFollow(FOLLOW_24);
             	    	    lv_lookups_20_0=ruleTableLookup();
 
             	    	    state._fsp--;
@@ -4313,11 +3359,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    	    break;
 
             	    	default :
-            	    	    break loop19;
+            	    	    break loop17;
             	        }
             	    } while (true);
 
-            	    otherlv_21=(Token)match(input,17,FOLLOW_24); if (state.failed) return current;
+            	    otherlv_21=(Token)match(input,17,FOLLOW_23); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      									newLeafNode(otherlv_21, grammarAccess.getTableValueAccess().getRightCurlyBracketKeyword_4_1_4());
@@ -4341,7 +3387,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop20;
+            	    break loop18;
                 }
             } while (true);
 
@@ -4380,7 +3426,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableFormatter"
-    // InternalTableDSL.g:1567:1: entryRuleTableFormatter returns [EObject current=null] : iv_ruleTableFormatter= ruleTableFormatter EOF ;
+    // InternalTableDSL.g:1203:1: entryRuleTableFormatter returns [EObject current=null] : iv_ruleTableFormatter= ruleTableFormatter EOF ;
     public final EObject entryRuleTableFormatter() throws RecognitionException {
         EObject current = null;
 
@@ -4388,8 +3434,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:1567:55: (iv_ruleTableFormatter= ruleTableFormatter EOF )
-            // InternalTableDSL.g:1568:2: iv_ruleTableFormatter= ruleTableFormatter EOF
+            // InternalTableDSL.g:1203:55: (iv_ruleTableFormatter= ruleTableFormatter EOF )
+            // InternalTableDSL.g:1204:2: iv_ruleTableFormatter= ruleTableFormatter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableFormatterRule()); 
@@ -4420,7 +3466,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableFormatter"
-    // InternalTableDSL.g:1574:1: ruleTableFormatter returns [EObject current=null] : ( () otherlv_1= 'formatter' ( (lv_format_2_0= RULE_STRING ) ) ) ;
+    // InternalTableDSL.g:1210:1: ruleTableFormatter returns [EObject current=null] : ( () otherlv_1= 'formatter' ( (lv_format_2_0= RULE_STRING ) ) ) ;
     public final EObject ruleTableFormatter() throws RecognitionException {
         EObject current = null;
 
@@ -4431,14 +3477,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:1580:2: ( ( () otherlv_1= 'formatter' ( (lv_format_2_0= RULE_STRING ) ) ) )
-            // InternalTableDSL.g:1581:2: ( () otherlv_1= 'formatter' ( (lv_format_2_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:1216:2: ( ( () otherlv_1= 'formatter' ( (lv_format_2_0= RULE_STRING ) ) ) )
+            // InternalTableDSL.g:1217:2: ( () otherlv_1= 'formatter' ( (lv_format_2_0= RULE_STRING ) ) )
             {
-            // InternalTableDSL.g:1581:2: ( () otherlv_1= 'formatter' ( (lv_format_2_0= RULE_STRING ) ) )
-            // InternalTableDSL.g:1582:3: () otherlv_1= 'formatter' ( (lv_format_2_0= RULE_STRING ) )
+            // InternalTableDSL.g:1217:2: ( () otherlv_1= 'formatter' ( (lv_format_2_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:1218:3: () otherlv_1= 'formatter' ( (lv_format_2_0= RULE_STRING ) )
             {
-            // InternalTableDSL.g:1582:3: ()
-            // InternalTableDSL.g:1583:4: 
+            // InternalTableDSL.g:1218:3: ()
+            // InternalTableDSL.g:1219:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -4450,17 +3496,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,42,FOLLOW_8); if (state.failed) return current;
+            otherlv_1=(Token)match(input,41,FOLLOW_8); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getTableFormatterAccess().getFormatterKeyword_1());
               		
             }
-            // InternalTableDSL.g:1593:3: ( (lv_format_2_0= RULE_STRING ) )
-            // InternalTableDSL.g:1594:4: (lv_format_2_0= RULE_STRING )
+            // InternalTableDSL.g:1229:3: ( (lv_format_2_0= RULE_STRING ) )
+            // InternalTableDSL.g:1230:4: (lv_format_2_0= RULE_STRING )
             {
-            // InternalTableDSL.g:1594:4: (lv_format_2_0= RULE_STRING )
-            // InternalTableDSL.g:1595:5: lv_format_2_0= RULE_STRING
+            // InternalTableDSL.g:1230:4: (lv_format_2_0= RULE_STRING )
+            // InternalTableDSL.g:1231:5: lv_format_2_0= RULE_STRING
             {
             lv_format_2_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
@@ -4511,7 +3557,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableImage"
-    // InternalTableDSL.g:1615:1: entryRuleTableImage returns [EObject current=null] : iv_ruleTableImage= ruleTableImage EOF ;
+    // InternalTableDSL.g:1251:1: entryRuleTableImage returns [EObject current=null] : iv_ruleTableImage= ruleTableImage EOF ;
     public final EObject entryRuleTableImage() throws RecognitionException {
         EObject current = null;
 
@@ -4519,8 +3565,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:1615:51: (iv_ruleTableImage= ruleTableImage EOF )
-            // InternalTableDSL.g:1616:2: iv_ruleTableImage= ruleTableImage EOF
+            // InternalTableDSL.g:1251:51: (iv_ruleTableImage= ruleTableImage EOF )
+            // InternalTableDSL.g:1252:2: iv_ruleTableImage= ruleTableImage EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableImageRule()); 
@@ -4551,7 +3597,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableImage"
-    // InternalTableDSL.g:1622:1: ruleTableImage returns [EObject current=null] : ( () otherlv_1= 'path' ( (lv_imagePathPattern_2_0= RULE_STRING ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) ) ) ) ;
+    // InternalTableDSL.g:1258:1: ruleTableImage returns [EObject current=null] : ( () otherlv_1= 'path' ( (lv_imagePathPattern_2_0= RULE_STRING ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) ) ) ) ;
     public final EObject ruleTableImage() throws RecognitionException {
         EObject current = null;
 
@@ -4566,14 +3612,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:1628:2: ( ( () otherlv_1= 'path' ( (lv_imagePathPattern_2_0= RULE_STRING ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) ) ) ) )
-            // InternalTableDSL.g:1629:2: ( () otherlv_1= 'path' ( (lv_imagePathPattern_2_0= RULE_STRING ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) ) ) )
+            // InternalTableDSL.g:1264:2: ( ( () otherlv_1= 'path' ( (lv_imagePathPattern_2_0= RULE_STRING ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) ) ) ) )
+            // InternalTableDSL.g:1265:2: ( () otherlv_1= 'path' ( (lv_imagePathPattern_2_0= RULE_STRING ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) ) ) )
             {
-            // InternalTableDSL.g:1629:2: ( () otherlv_1= 'path' ( (lv_imagePathPattern_2_0= RULE_STRING ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) ) ) )
-            // InternalTableDSL.g:1630:3: () otherlv_1= 'path' ( (lv_imagePathPattern_2_0= RULE_STRING ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) ) )
+            // InternalTableDSL.g:1265:2: ( () otherlv_1= 'path' ( (lv_imagePathPattern_2_0= RULE_STRING ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) ) ) )
+            // InternalTableDSL.g:1266:3: () otherlv_1= 'path' ( (lv_imagePathPattern_2_0= RULE_STRING ) ) ( ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) ) )
             {
-            // InternalTableDSL.g:1630:3: ()
-            // InternalTableDSL.g:1631:4: 
+            // InternalTableDSL.g:1266:3: ()
+            // InternalTableDSL.g:1267:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -4585,19 +3631,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,43,FOLLOW_8); if (state.failed) return current;
+            otherlv_1=(Token)match(input,42,FOLLOW_8); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getTableImageAccess().getPathKeyword_1());
               		
             }
-            // InternalTableDSL.g:1641:3: ( (lv_imagePathPattern_2_0= RULE_STRING ) )
-            // InternalTableDSL.g:1642:4: (lv_imagePathPattern_2_0= RULE_STRING )
+            // InternalTableDSL.g:1277:3: ( (lv_imagePathPattern_2_0= RULE_STRING ) )
+            // InternalTableDSL.g:1278:4: (lv_imagePathPattern_2_0= RULE_STRING )
             {
-            // InternalTableDSL.g:1642:4: (lv_imagePathPattern_2_0= RULE_STRING )
-            // InternalTableDSL.g:1643:5: lv_imagePathPattern_2_0= RULE_STRING
+            // InternalTableDSL.g:1278:4: (lv_imagePathPattern_2_0= RULE_STRING )
+            // InternalTableDSL.g:1279:5: lv_imagePathPattern_2_0= RULE_STRING
             {
-            lv_imagePathPattern_2_0=(Token)match(input,RULE_STRING,FOLLOW_26); if (state.failed) return current;
+            lv_imagePathPattern_2_0=(Token)match(input,RULE_STRING,FOLLOW_25); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(lv_imagePathPattern_2_0, grammarAccess.getTableImageAccess().getImagePathPatternSTRINGTerminalRuleCall_2_0());
@@ -4621,62 +3667,62 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:1659:3: ( ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) ) )
-            // InternalTableDSL.g:1660:4: ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) )
+            // InternalTableDSL.g:1295:3: ( ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) ) )
+            // InternalTableDSL.g:1296:4: ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) )
             {
-            // InternalTableDSL.g:1660:4: ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) )
-            // InternalTableDSL.g:1661:5: ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* )
+            // InternalTableDSL.g:1296:4: ( ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* ) )
+            // InternalTableDSL.g:1297:5: ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* )
             {
             getUnorderedGroupHelper().enter(grammarAccess.getTableImageAccess().getUnorderedGroup_3());
-            // InternalTableDSL.g:1664:5: ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* )
-            // InternalTableDSL.g:1665:6: ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )*
+            // InternalTableDSL.g:1300:5: ( ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )* )
+            // InternalTableDSL.g:1301:6: ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )*
             {
-            // InternalTableDSL.g:1665:6: ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )*
-            loop21:
+            // InternalTableDSL.g:1301:6: ( ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) ) | ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) ) )*
+            loop19:
             do {
-                int alt21=4;
-                int LA21_0 = input.LA(1);
+                int alt19=4;
+                int LA19_0 = input.LA(1);
 
-                if ( LA21_0 == 44 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0) ) {
-                    alt21=1;
+                if ( LA19_0 == 43 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0) ) {
+                    alt19=1;
                 }
-                else if ( LA21_0 == 40 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1) ) {
-                    alt21=2;
+                else if ( LA19_0 == 39 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1) ) {
+                    alt19=2;
                 }
-                else if ( LA21_0 == 45 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2) ) {
-                    alt21=3;
+                else if ( LA19_0 == 44 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2) ) {
+                    alt19=3;
                 }
 
 
-                switch (alt21) {
+                switch (alt19) {
             	case 1 :
-            	    // InternalTableDSL.g:1666:4: ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) )
+            	    // InternalTableDSL.g:1302:4: ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:1666:4: ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) )
-            	    // InternalTableDSL.g:1667:5: {...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) )
+            	    // InternalTableDSL.g:1302:4: ({...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) ) )
+            	    // InternalTableDSL.g:1303:5: {...}? => ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableImage", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0)");
             	    }
-            	    // InternalTableDSL.g:1667:107: ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) )
-            	    // InternalTableDSL.g:1668:6: ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) )
+            	    // InternalTableDSL.g:1303:107: ( ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) ) )
+            	    // InternalTableDSL.g:1304:6: ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 0);
-            	    // InternalTableDSL.g:1671:9: ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) )
-            	    // InternalTableDSL.g:1671:10: {...}? => ( (lv_hasParameter_4_0= 'dynamic' ) )
+            	    // InternalTableDSL.g:1307:9: ({...}? => ( (lv_hasParameter_4_0= 'dynamic' ) ) )
+            	    // InternalTableDSL.g:1307:10: {...}? => ( (lv_hasParameter_4_0= 'dynamic' ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableImage", "true");
             	    }
-            	    // InternalTableDSL.g:1671:19: ( (lv_hasParameter_4_0= 'dynamic' ) )
-            	    // InternalTableDSL.g:1671:20: (lv_hasParameter_4_0= 'dynamic' )
+            	    // InternalTableDSL.g:1307:19: ( (lv_hasParameter_4_0= 'dynamic' ) )
+            	    // InternalTableDSL.g:1307:20: (lv_hasParameter_4_0= 'dynamic' )
             	    {
-            	    // InternalTableDSL.g:1671:20: (lv_hasParameter_4_0= 'dynamic' )
-            	    // InternalTableDSL.g:1672:10: lv_hasParameter_4_0= 'dynamic'
+            	    // InternalTableDSL.g:1307:20: (lv_hasParameter_4_0= 'dynamic' )
+            	    // InternalTableDSL.g:1308:10: lv_hasParameter_4_0= 'dynamic'
             	    {
-            	    lv_hasParameter_4_0=(Token)match(input,44,FOLLOW_26); if (state.failed) return current;
+            	    lv_hasParameter_4_0=(Token)match(input,43,FOLLOW_25); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      										newLeafNode(lv_hasParameter_4_0, grammarAccess.getTableImageAccess().getHasParameterDynamicKeyword_3_0_0());
@@ -4710,33 +3756,33 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // InternalTableDSL.g:1689:4: ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) )
+            	    // InternalTableDSL.g:1325:4: ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:1689:4: ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) )
-            	    // InternalTableDSL.g:1690:5: {...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) )
+            	    // InternalTableDSL.g:1325:4: ({...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) ) )
+            	    // InternalTableDSL.g:1326:5: {...}? => ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableImage", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1)");
             	    }
-            	    // InternalTableDSL.g:1690:107: ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) )
-            	    // InternalTableDSL.g:1691:6: ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) )
+            	    // InternalTableDSL.g:1326:107: ( ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) ) )
+            	    // InternalTableDSL.g:1327:6: ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 1);
-            	    // InternalTableDSL.g:1694:9: ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) )
-            	    // InternalTableDSL.g:1694:10: {...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) )
+            	    // InternalTableDSL.g:1330:9: ({...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) ) )
+            	    // InternalTableDSL.g:1330:10: {...}? => ( (lv_hideImageLabel_5_0= 'hidelabel' ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableImage", "true");
             	    }
-            	    // InternalTableDSL.g:1694:19: ( (lv_hideImageLabel_5_0= 'hidelabel' ) )
-            	    // InternalTableDSL.g:1694:20: (lv_hideImageLabel_5_0= 'hidelabel' )
+            	    // InternalTableDSL.g:1330:19: ( (lv_hideImageLabel_5_0= 'hidelabel' ) )
+            	    // InternalTableDSL.g:1330:20: (lv_hideImageLabel_5_0= 'hidelabel' )
             	    {
-            	    // InternalTableDSL.g:1694:20: (lv_hideImageLabel_5_0= 'hidelabel' )
-            	    // InternalTableDSL.g:1695:10: lv_hideImageLabel_5_0= 'hidelabel'
+            	    // InternalTableDSL.g:1330:20: (lv_hideImageLabel_5_0= 'hidelabel' )
+            	    // InternalTableDSL.g:1331:10: lv_hideImageLabel_5_0= 'hidelabel'
             	    {
-            	    lv_hideImageLabel_5_0=(Token)match(input,40,FOLLOW_26); if (state.failed) return current;
+            	    lv_hideImageLabel_5_0=(Token)match(input,39,FOLLOW_25); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      										newLeafNode(lv_hideImageLabel_5_0, grammarAccess.getTableImageAccess().getHideImageLabelHidelabelKeyword_3_1_0());
@@ -4770,36 +3816,36 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 3 :
-            	    // InternalTableDSL.g:1712:4: ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) )
+            	    // InternalTableDSL.g:1348:4: ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:1712:4: ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) )
-            	    // InternalTableDSL.g:1713:5: {...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) )
+            	    // InternalTableDSL.g:1348:4: ({...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) ) )
+            	    // InternalTableDSL.g:1349:5: {...}? => ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableImage", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2)");
             	    }
-            	    // InternalTableDSL.g:1713:107: ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) )
-            	    // InternalTableDSL.g:1714:6: ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) )
+            	    // InternalTableDSL.g:1349:107: ( ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) ) )
+            	    // InternalTableDSL.g:1350:6: ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableImageAccess().getUnorderedGroup_3(), 2);
-            	    // InternalTableDSL.g:1717:9: ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) )
-            	    // InternalTableDSL.g:1717:10: {...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) )
+            	    // InternalTableDSL.g:1353:9: ({...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) ) )
+            	    // InternalTableDSL.g:1353:10: {...}? => ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableImage", "true");
             	    }
-            	    // InternalTableDSL.g:1717:19: ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) )
-            	    // InternalTableDSL.g:1717:20: ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) )
+            	    // InternalTableDSL.g:1353:19: ( ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) ) )
+            	    // InternalTableDSL.g:1353:20: ( (lv_resize_6_0= 'resize' ) ) ( (lv_resizeString_7_0= RULE_STRING ) )
             	    {
-            	    // InternalTableDSL.g:1717:20: ( (lv_resize_6_0= 'resize' ) )
-            	    // InternalTableDSL.g:1718:10: (lv_resize_6_0= 'resize' )
+            	    // InternalTableDSL.g:1353:20: ( (lv_resize_6_0= 'resize' ) )
+            	    // InternalTableDSL.g:1354:10: (lv_resize_6_0= 'resize' )
             	    {
-            	    // InternalTableDSL.g:1718:10: (lv_resize_6_0= 'resize' )
-            	    // InternalTableDSL.g:1719:11: lv_resize_6_0= 'resize'
+            	    // InternalTableDSL.g:1354:10: (lv_resize_6_0= 'resize' )
+            	    // InternalTableDSL.g:1355:11: lv_resize_6_0= 'resize'
             	    {
-            	    lv_resize_6_0=(Token)match(input,45,FOLLOW_8); if (state.failed) return current;
+            	    lv_resize_6_0=(Token)match(input,44,FOLLOW_8); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      											newLeafNode(lv_resize_6_0, grammarAccess.getTableImageAccess().getResizeResizeKeyword_3_2_0_0());
@@ -4819,13 +3865,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:1731:9: ( (lv_resizeString_7_0= RULE_STRING ) )
-            	    // InternalTableDSL.g:1732:10: (lv_resizeString_7_0= RULE_STRING )
+            	    // InternalTableDSL.g:1367:9: ( (lv_resizeString_7_0= RULE_STRING ) )
+            	    // InternalTableDSL.g:1368:10: (lv_resizeString_7_0= RULE_STRING )
             	    {
-            	    // InternalTableDSL.g:1732:10: (lv_resizeString_7_0= RULE_STRING )
-            	    // InternalTableDSL.g:1733:11: lv_resizeString_7_0= RULE_STRING
+            	    // InternalTableDSL.g:1368:10: (lv_resizeString_7_0= RULE_STRING )
+            	    // InternalTableDSL.g:1369:11: lv_resizeString_7_0= RULE_STRING
             	    {
-            	    lv_resizeString_7_0=(Token)match(input,RULE_STRING,FOLLOW_26); if (state.failed) return current;
+            	    lv_resizeString_7_0=(Token)match(input,RULE_STRING,FOLLOW_25); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      											newLeafNode(lv_resizeString_7_0, grammarAccess.getTableImageAccess().getResizeStringSTRINGTerminalRuleCall_3_2_1_0());
@@ -4867,7 +3913,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop21;
+            	    break loop19;
                 }
             } while (true);
 
@@ -4906,7 +3952,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableTooltipPattern"
-    // InternalTableDSL.g:1766:1: entryRuleTableTooltipPattern returns [EObject current=null] : iv_ruleTableTooltipPattern= ruleTableTooltipPattern EOF ;
+    // InternalTableDSL.g:1402:1: entryRuleTableTooltipPattern returns [EObject current=null] : iv_ruleTableTooltipPattern= ruleTableTooltipPattern EOF ;
     public final EObject entryRuleTableTooltipPattern() throws RecognitionException {
         EObject current = null;
 
@@ -4914,8 +3960,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:1766:60: (iv_ruleTableTooltipPattern= ruleTableTooltipPattern EOF )
-            // InternalTableDSL.g:1767:2: iv_ruleTableTooltipPattern= ruleTableTooltipPattern EOF
+            // InternalTableDSL.g:1402:60: (iv_ruleTableTooltipPattern= ruleTableTooltipPattern EOF )
+            // InternalTableDSL.g:1403:2: iv_ruleTableTooltipPattern= ruleTableTooltipPattern EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableTooltipPatternRule()); 
@@ -4946,7 +3992,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableTooltipPattern"
-    // InternalTableDSL.g:1773:1: ruleTableTooltipPattern returns [EObject current=null] : ( () otherlv_1= 'tooltipPattern' ( (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING ) ) ) ;
+    // InternalTableDSL.g:1409:1: ruleTableTooltipPattern returns [EObject current=null] : ( () otherlv_1= 'tooltipPattern' ( (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING ) ) ) ;
     public final EObject ruleTableTooltipPattern() throws RecognitionException {
         EObject current = null;
 
@@ -4958,14 +4004,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:1779:2: ( ( () otherlv_1= 'tooltipPattern' ( (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING ) ) ) )
-            // InternalTableDSL.g:1780:2: ( () otherlv_1= 'tooltipPattern' ( (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING ) ) )
+            // InternalTableDSL.g:1415:2: ( ( () otherlv_1= 'tooltipPattern' ( (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING ) ) ) )
+            // InternalTableDSL.g:1416:2: ( () otherlv_1= 'tooltipPattern' ( (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING ) ) )
             {
-            // InternalTableDSL.g:1780:2: ( () otherlv_1= 'tooltipPattern' ( (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING ) ) )
-            // InternalTableDSL.g:1781:3: () otherlv_1= 'tooltipPattern' ( (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING ) )
+            // InternalTableDSL.g:1416:2: ( () otherlv_1= 'tooltipPattern' ( (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING ) ) )
+            // InternalTableDSL.g:1417:3: () otherlv_1= 'tooltipPattern' ( (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING ) )
             {
-            // InternalTableDSL.g:1781:3: ()
-            // InternalTableDSL.g:1782:4: 
+            // InternalTableDSL.g:1417:3: ()
+            // InternalTableDSL.g:1418:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -4977,17 +4023,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,46,FOLLOW_8); if (state.failed) return current;
+            otherlv_1=(Token)match(input,45,FOLLOW_8); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getTableTooltipPatternAccess().getTooltipPatternKeyword_1());
               		
             }
-            // InternalTableDSL.g:1792:3: ( (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING ) )
-            // InternalTableDSL.g:1793:4: (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING )
+            // InternalTableDSL.g:1428:3: ( (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING ) )
+            // InternalTableDSL.g:1429:4: (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING )
             {
-            // InternalTableDSL.g:1793:4: (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING )
-            // InternalTableDSL.g:1794:5: lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING
+            // InternalTableDSL.g:1429:4: (lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING )
+            // InternalTableDSL.g:1430:5: lv_tooltipPattern_2_0= ruleTRANSLATABLESTRING
             {
             if ( state.backtracking==0 ) {
 
@@ -5043,7 +4089,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableValueElement"
-    // InternalTableDSL.g:1815:1: entryRuleTableValueElement returns [EObject current=null] : iv_ruleTableValueElement= ruleTableValueElement EOF ;
+    // InternalTableDSL.g:1451:1: entryRuleTableValueElement returns [EObject current=null] : iv_ruleTableValueElement= ruleTableValueElement EOF ;
     public final EObject entryRuleTableValueElement() throws RecognitionException {
         EObject current = null;
 
@@ -5051,8 +4097,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:1815:58: (iv_ruleTableValueElement= ruleTableValueElement EOF )
-            // InternalTableDSL.g:1816:2: iv_ruleTableValueElement= ruleTableValueElement EOF
+            // InternalTableDSL.g:1451:58: (iv_ruleTableValueElement= ruleTableValueElement EOF )
+            // InternalTableDSL.g:1452:2: iv_ruleTableValueElement= ruleTableValueElement EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableValueElementRule()); 
@@ -5083,7 +4129,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableValueElement"
-    // InternalTableDSL.g:1822:1: ruleTableValueElement returns [EObject current=null] : (this_TableMeasure_0= ruleTableMeasure | this_TableDerived_1= ruleTableDerived | this_TableHierarchy_2= ruleTableHierarchy | this_TableAttribute_3= ruleTableAttribute | this_TableAggregation_4= ruleTableAggregation | this_TableOrdinal_5= ruleTableOrdinal | this_TableColumn_6= ruleTableColumn | this_TableTask_7= ruleTableTask | this_TableAllColumns_8= ruleTableAllColumns ) ;
+    // InternalTableDSL.g:1458:1: ruleTableValueElement returns [EObject current=null] : (this_TableMeasure_0= ruleTableMeasure | this_TableDerived_1= ruleTableDerived | this_TableHierarchy_2= ruleTableHierarchy | this_TableAttribute_3= ruleTableAttribute | this_TableAggregation_4= ruleTableAggregation | this_TableOrdinal_5= ruleTableOrdinal | this_TableColumn_6= ruleTableColumn | this_TableTask_7= ruleTableTask | this_TableAllColumns_8= ruleTableAllColumns ) ;
     public final EObject ruleTableValueElement() throws RecognitionException {
         EObject current = null;
 
@@ -5110,68 +4156,68 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:1828:2: ( (this_TableMeasure_0= ruleTableMeasure | this_TableDerived_1= ruleTableDerived | this_TableHierarchy_2= ruleTableHierarchy | this_TableAttribute_3= ruleTableAttribute | this_TableAggregation_4= ruleTableAggregation | this_TableOrdinal_5= ruleTableOrdinal | this_TableColumn_6= ruleTableColumn | this_TableTask_7= ruleTableTask | this_TableAllColumns_8= ruleTableAllColumns ) )
-            // InternalTableDSL.g:1829:2: (this_TableMeasure_0= ruleTableMeasure | this_TableDerived_1= ruleTableDerived | this_TableHierarchy_2= ruleTableHierarchy | this_TableAttribute_3= ruleTableAttribute | this_TableAggregation_4= ruleTableAggregation | this_TableOrdinal_5= ruleTableOrdinal | this_TableColumn_6= ruleTableColumn | this_TableTask_7= ruleTableTask | this_TableAllColumns_8= ruleTableAllColumns )
+            // InternalTableDSL.g:1464:2: ( (this_TableMeasure_0= ruleTableMeasure | this_TableDerived_1= ruleTableDerived | this_TableHierarchy_2= ruleTableHierarchy | this_TableAttribute_3= ruleTableAttribute | this_TableAggregation_4= ruleTableAggregation | this_TableOrdinal_5= ruleTableOrdinal | this_TableColumn_6= ruleTableColumn | this_TableTask_7= ruleTableTask | this_TableAllColumns_8= ruleTableAllColumns ) )
+            // InternalTableDSL.g:1465:2: (this_TableMeasure_0= ruleTableMeasure | this_TableDerived_1= ruleTableDerived | this_TableHierarchy_2= ruleTableHierarchy | this_TableAttribute_3= ruleTableAttribute | this_TableAggregation_4= ruleTableAggregation | this_TableOrdinal_5= ruleTableOrdinal | this_TableColumn_6= ruleTableColumn | this_TableTask_7= ruleTableTask | this_TableAllColumns_8= ruleTableAllColumns )
             {
-            // InternalTableDSL.g:1829:2: (this_TableMeasure_0= ruleTableMeasure | this_TableDerived_1= ruleTableDerived | this_TableHierarchy_2= ruleTableHierarchy | this_TableAttribute_3= ruleTableAttribute | this_TableAggregation_4= ruleTableAggregation | this_TableOrdinal_5= ruleTableOrdinal | this_TableColumn_6= ruleTableColumn | this_TableTask_7= ruleTableTask | this_TableAllColumns_8= ruleTableAllColumns )
-            int alt22=9;
+            // InternalTableDSL.g:1465:2: (this_TableMeasure_0= ruleTableMeasure | this_TableDerived_1= ruleTableDerived | this_TableHierarchy_2= ruleTableHierarchy | this_TableAttribute_3= ruleTableAttribute | this_TableAggregation_4= ruleTableAggregation | this_TableOrdinal_5= ruleTableOrdinal | this_TableColumn_6= ruleTableColumn | this_TableTask_7= ruleTableTask | this_TableAllColumns_8= ruleTableAllColumns )
+            int alt20=9;
             switch ( input.LA(1) ) {
+            case 50:
+                {
+                alt20=1;
+                }
+                break;
             case 51:
                 {
-                alt22=1;
+                alt20=2;
                 }
                 break;
             case 52:
                 {
-                alt22=2;
+                alt20=3;
                 }
                 break;
             case 53:
                 {
-                alt22=3;
+                alt20=4;
                 }
                 break;
             case 54:
                 {
-                alt22=4;
+                alt20=5;
                 }
                 break;
-            case 55:
+            case 48:
                 {
-                alt22=5;
+                alt20=6;
                 }
                 break;
             case 49:
                 {
-                alt22=6;
+                alt20=7;
                 }
                 break;
-            case 50:
+            case 46:
                 {
-                alt22=7;
+                alt20=8;
                 }
                 break;
             case 47:
                 {
-                alt22=8;
-                }
-                break;
-            case 48:
-                {
-                alt22=9;
+                alt20=9;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 22, 0, input);
+                    new NoViableAltException("", 20, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt22) {
+            switch (alt20) {
                 case 1 :
-                    // InternalTableDSL.g:1830:3: this_TableMeasure_0= ruleTableMeasure
+                    // InternalTableDSL.g:1466:3: this_TableMeasure_0= ruleTableMeasure
                     {
                     if ( state.backtracking==0 ) {
 
@@ -5193,7 +4239,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:1839:3: this_TableDerived_1= ruleTableDerived
+                    // InternalTableDSL.g:1475:3: this_TableDerived_1= ruleTableDerived
                     {
                     if ( state.backtracking==0 ) {
 
@@ -5215,7 +4261,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:1848:3: this_TableHierarchy_2= ruleTableHierarchy
+                    // InternalTableDSL.g:1484:3: this_TableHierarchy_2= ruleTableHierarchy
                     {
                     if ( state.backtracking==0 ) {
 
@@ -5237,7 +4283,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:1857:3: this_TableAttribute_3= ruleTableAttribute
+                    // InternalTableDSL.g:1493:3: this_TableAttribute_3= ruleTableAttribute
                     {
                     if ( state.backtracking==0 ) {
 
@@ -5259,7 +4305,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:1866:3: this_TableAggregation_4= ruleTableAggregation
+                    // InternalTableDSL.g:1502:3: this_TableAggregation_4= ruleTableAggregation
                     {
                     if ( state.backtracking==0 ) {
 
@@ -5281,7 +4327,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 6 :
-                    // InternalTableDSL.g:1875:3: this_TableOrdinal_5= ruleTableOrdinal
+                    // InternalTableDSL.g:1511:3: this_TableOrdinal_5= ruleTableOrdinal
                     {
                     if ( state.backtracking==0 ) {
 
@@ -5303,7 +4349,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 7 :
-                    // InternalTableDSL.g:1884:3: this_TableColumn_6= ruleTableColumn
+                    // InternalTableDSL.g:1520:3: this_TableColumn_6= ruleTableColumn
                     {
                     if ( state.backtracking==0 ) {
 
@@ -5325,7 +4371,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 8 :
-                    // InternalTableDSL.g:1893:3: this_TableTask_7= ruleTableTask
+                    // InternalTableDSL.g:1529:3: this_TableTask_7= ruleTableTask
                     {
                     if ( state.backtracking==0 ) {
 
@@ -5347,7 +4393,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 9 :
-                    // InternalTableDSL.g:1902:3: this_TableAllColumns_8= ruleTableAllColumns
+                    // InternalTableDSL.g:1538:3: this_TableAllColumns_8= ruleTableAllColumns
                     {
                     if ( state.backtracking==0 ) {
 
@@ -5393,7 +4439,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableTask"
-    // InternalTableDSL.g:1914:1: entryRuleTableTask returns [EObject current=null] : iv_ruleTableTask= ruleTableTask EOF ;
+    // InternalTableDSL.g:1550:1: entryRuleTableTask returns [EObject current=null] : iv_ruleTableTask= ruleTableTask EOF ;
     public final EObject entryRuleTableTask() throws RecognitionException {
         EObject current = null;
 
@@ -5401,8 +4447,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:1914:50: (iv_ruleTableTask= ruleTableTask EOF )
-            // InternalTableDSL.g:1915:2: iv_ruleTableTask= ruleTableTask EOF
+            // InternalTableDSL.g:1550:50: (iv_ruleTableTask= ruleTableTask EOF )
+            // InternalTableDSL.g:1551:2: iv_ruleTableTask= ruleTableTask EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableTaskRule()); 
@@ -5433,7 +4479,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableTask"
-    // InternalTableDSL.g:1921:1: ruleTableTask returns [EObject current=null] : ( () otherlv_1= 'taskId' ) ;
+    // InternalTableDSL.g:1557:1: ruleTableTask returns [EObject current=null] : ( () otherlv_1= 'taskId' ) ;
     public final EObject ruleTableTask() throws RecognitionException {
         EObject current = null;
 
@@ -5443,14 +4489,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:1927:2: ( ( () otherlv_1= 'taskId' ) )
-            // InternalTableDSL.g:1928:2: ( () otherlv_1= 'taskId' )
+            // InternalTableDSL.g:1563:2: ( ( () otherlv_1= 'taskId' ) )
+            // InternalTableDSL.g:1564:2: ( () otherlv_1= 'taskId' )
             {
-            // InternalTableDSL.g:1928:2: ( () otherlv_1= 'taskId' )
-            // InternalTableDSL.g:1929:3: () otherlv_1= 'taskId'
+            // InternalTableDSL.g:1564:2: ( () otherlv_1= 'taskId' )
+            // InternalTableDSL.g:1565:3: () otherlv_1= 'taskId'
             {
-            // InternalTableDSL.g:1929:3: ()
-            // InternalTableDSL.g:1930:4: 
+            // InternalTableDSL.g:1565:3: ()
+            // InternalTableDSL.g:1566:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -5462,7 +4508,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,47,FOLLOW_2); if (state.failed) return current;
+            otherlv_1=(Token)match(input,46,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getTableTaskAccess().getTaskIdKeyword_1());
@@ -5493,7 +4539,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableAllColumns"
-    // InternalTableDSL.g:1944:1: entryRuleTableAllColumns returns [EObject current=null] : iv_ruleTableAllColumns= ruleTableAllColumns EOF ;
+    // InternalTableDSL.g:1580:1: entryRuleTableAllColumns returns [EObject current=null] : iv_ruleTableAllColumns= ruleTableAllColumns EOF ;
     public final EObject entryRuleTableAllColumns() throws RecognitionException {
         EObject current = null;
 
@@ -5501,8 +4547,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:1944:56: (iv_ruleTableAllColumns= ruleTableAllColumns EOF )
-            // InternalTableDSL.g:1945:2: iv_ruleTableAllColumns= ruleTableAllColumns EOF
+            // InternalTableDSL.g:1580:56: (iv_ruleTableAllColumns= ruleTableAllColumns EOF )
+            // InternalTableDSL.g:1581:2: iv_ruleTableAllColumns= ruleTableAllColumns EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableAllColumnsRule()); 
@@ -5533,7 +4579,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableAllColumns"
-    // InternalTableDSL.g:1951:1: ruleTableAllColumns returns [EObject current=null] : ( () otherlv_1= 'allColumns' ) ;
+    // InternalTableDSL.g:1587:1: ruleTableAllColumns returns [EObject current=null] : ( () otherlv_1= 'allColumns' ) ;
     public final EObject ruleTableAllColumns() throws RecognitionException {
         EObject current = null;
 
@@ -5543,14 +4589,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:1957:2: ( ( () otherlv_1= 'allColumns' ) )
-            // InternalTableDSL.g:1958:2: ( () otherlv_1= 'allColumns' )
+            // InternalTableDSL.g:1593:2: ( ( () otherlv_1= 'allColumns' ) )
+            // InternalTableDSL.g:1594:2: ( () otherlv_1= 'allColumns' )
             {
-            // InternalTableDSL.g:1958:2: ( () otherlv_1= 'allColumns' )
-            // InternalTableDSL.g:1959:3: () otherlv_1= 'allColumns'
+            // InternalTableDSL.g:1594:2: ( () otherlv_1= 'allColumns' )
+            // InternalTableDSL.g:1595:3: () otherlv_1= 'allColumns'
             {
-            // InternalTableDSL.g:1959:3: ()
-            // InternalTableDSL.g:1960:4: 
+            // InternalTableDSL.g:1595:3: ()
+            // InternalTableDSL.g:1596:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -5562,7 +4608,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,48,FOLLOW_2); if (state.failed) return current;
+            otherlv_1=(Token)match(input,47,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getTableAllColumnsAccess().getAllColumnsKeyword_1());
@@ -5593,7 +4639,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableOrdinal"
-    // InternalTableDSL.g:1974:1: entryRuleTableOrdinal returns [EObject current=null] : iv_ruleTableOrdinal= ruleTableOrdinal EOF ;
+    // InternalTableDSL.g:1610:1: entryRuleTableOrdinal returns [EObject current=null] : iv_ruleTableOrdinal= ruleTableOrdinal EOF ;
     public final EObject entryRuleTableOrdinal() throws RecognitionException {
         EObject current = null;
 
@@ -5601,8 +4647,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:1974:53: (iv_ruleTableOrdinal= ruleTableOrdinal EOF )
-            // InternalTableDSL.g:1975:2: iv_ruleTableOrdinal= ruleTableOrdinal EOF
+            // InternalTableDSL.g:1610:53: (iv_ruleTableOrdinal= ruleTableOrdinal EOF )
+            // InternalTableDSL.g:1611:2: iv_ruleTableOrdinal= ruleTableOrdinal EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableOrdinalRule()); 
@@ -5633,7 +4679,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableOrdinal"
-    // InternalTableDSL.g:1981:1: ruleTableOrdinal returns [EObject current=null] : (otherlv_0= 'ordinal' ( (lv_valueRef_1_0= ruleNumber ) ) ) ;
+    // InternalTableDSL.g:1617:1: ruleTableOrdinal returns [EObject current=null] : (otherlv_0= 'ordinal' ( (lv_valueRef_1_0= ruleNumber ) ) ) ;
     public final EObject ruleTableOrdinal() throws RecognitionException {
         EObject current = null;
 
@@ -5645,23 +4691,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:1987:2: ( (otherlv_0= 'ordinal' ( (lv_valueRef_1_0= ruleNumber ) ) ) )
-            // InternalTableDSL.g:1988:2: (otherlv_0= 'ordinal' ( (lv_valueRef_1_0= ruleNumber ) ) )
+            // InternalTableDSL.g:1623:2: ( (otherlv_0= 'ordinal' ( (lv_valueRef_1_0= ruleNumber ) ) ) )
+            // InternalTableDSL.g:1624:2: (otherlv_0= 'ordinal' ( (lv_valueRef_1_0= ruleNumber ) ) )
             {
-            // InternalTableDSL.g:1988:2: (otherlv_0= 'ordinal' ( (lv_valueRef_1_0= ruleNumber ) ) )
-            // InternalTableDSL.g:1989:3: otherlv_0= 'ordinal' ( (lv_valueRef_1_0= ruleNumber ) )
+            // InternalTableDSL.g:1624:2: (otherlv_0= 'ordinal' ( (lv_valueRef_1_0= ruleNumber ) ) )
+            // InternalTableDSL.g:1625:3: otherlv_0= 'ordinal' ( (lv_valueRef_1_0= ruleNumber ) )
             {
-            otherlv_0=(Token)match(input,49,FOLLOW_14); if (state.failed) return current;
+            otherlv_0=(Token)match(input,48,FOLLOW_26); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getTableOrdinalAccess().getOrdinalKeyword_0());
               		
             }
-            // InternalTableDSL.g:1993:3: ( (lv_valueRef_1_0= ruleNumber ) )
-            // InternalTableDSL.g:1994:4: (lv_valueRef_1_0= ruleNumber )
+            // InternalTableDSL.g:1629:3: ( (lv_valueRef_1_0= ruleNumber ) )
+            // InternalTableDSL.g:1630:4: (lv_valueRef_1_0= ruleNumber )
             {
-            // InternalTableDSL.g:1994:4: (lv_valueRef_1_0= ruleNumber )
-            // InternalTableDSL.g:1995:5: lv_valueRef_1_0= ruleNumber
+            // InternalTableDSL.g:1630:4: (lv_valueRef_1_0= ruleNumber )
+            // InternalTableDSL.g:1631:5: lv_valueRef_1_0= ruleNumber
             {
             if ( state.backtracking==0 ) {
 
@@ -5717,7 +4763,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableColumn"
-    // InternalTableDSL.g:2016:1: entryRuleTableColumn returns [EObject current=null] : iv_ruleTableColumn= ruleTableColumn EOF ;
+    // InternalTableDSL.g:1652:1: entryRuleTableColumn returns [EObject current=null] : iv_ruleTableColumn= ruleTableColumn EOF ;
     public final EObject entryRuleTableColumn() throws RecognitionException {
         EObject current = null;
 
@@ -5725,8 +4771,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2016:52: (iv_ruleTableColumn= ruleTableColumn EOF )
-            // InternalTableDSL.g:2017:2: iv_ruleTableColumn= ruleTableColumn EOF
+            // InternalTableDSL.g:1652:52: (iv_ruleTableColumn= ruleTableColumn EOF )
+            // InternalTableDSL.g:1653:2: iv_ruleTableColumn= ruleTableColumn EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableColumnRule()); 
@@ -5757,7 +4803,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableColumn"
-    // InternalTableDSL.g:2023:1: ruleTableColumn returns [EObject current=null] : (otherlv_0= 'column' ( (otherlv_1= RULE_ID ) ) ) ;
+    // InternalTableDSL.g:1659:1: ruleTableColumn returns [EObject current=null] : (otherlv_0= 'column' ( (otherlv_1= RULE_ID ) ) ) ;
     public final EObject ruleTableColumn() throws RecognitionException {
         EObject current = null;
 
@@ -5768,23 +4814,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2029:2: ( (otherlv_0= 'column' ( (otherlv_1= RULE_ID ) ) ) )
-            // InternalTableDSL.g:2030:2: (otherlv_0= 'column' ( (otherlv_1= RULE_ID ) ) )
+            // InternalTableDSL.g:1665:2: ( (otherlv_0= 'column' ( (otherlv_1= RULE_ID ) ) ) )
+            // InternalTableDSL.g:1666:2: (otherlv_0= 'column' ( (otherlv_1= RULE_ID ) ) )
             {
-            // InternalTableDSL.g:2030:2: (otherlv_0= 'column' ( (otherlv_1= RULE_ID ) ) )
-            // InternalTableDSL.g:2031:3: otherlv_0= 'column' ( (otherlv_1= RULE_ID ) )
+            // InternalTableDSL.g:1666:2: (otherlv_0= 'column' ( (otherlv_1= RULE_ID ) ) )
+            // InternalTableDSL.g:1667:3: otherlv_0= 'column' ( (otherlv_1= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,50,FOLLOW_4); if (state.failed) return current;
+            otherlv_0=(Token)match(input,49,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getTableColumnAccess().getColumnKeyword_0());
               		
             }
-            // InternalTableDSL.g:2035:3: ( (otherlv_1= RULE_ID ) )
-            // InternalTableDSL.g:2036:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:1671:3: ( (otherlv_1= RULE_ID ) )
+            // InternalTableDSL.g:1672:4: (otherlv_1= RULE_ID )
             {
-            // InternalTableDSL.g:2036:4: (otherlv_1= RULE_ID )
-            // InternalTableDSL.g:2037:5: otherlv_1= RULE_ID
+            // InternalTableDSL.g:1672:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:1673:5: otherlv_1= RULE_ID
             {
             if ( state.backtracking==0 ) {
 
@@ -5830,7 +4876,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableMeasure"
-    // InternalTableDSL.g:2052:1: entryRuleTableMeasure returns [EObject current=null] : iv_ruleTableMeasure= ruleTableMeasure EOF ;
+    // InternalTableDSL.g:1688:1: entryRuleTableMeasure returns [EObject current=null] : iv_ruleTableMeasure= ruleTableMeasure EOF ;
     public final EObject entryRuleTableMeasure() throws RecognitionException {
         EObject current = null;
 
@@ -5838,8 +4884,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2052:53: (iv_ruleTableMeasure= ruleTableMeasure EOF )
-            // InternalTableDSL.g:2053:2: iv_ruleTableMeasure= ruleTableMeasure EOF
+            // InternalTableDSL.g:1688:53: (iv_ruleTableMeasure= ruleTableMeasure EOF )
+            // InternalTableDSL.g:1689:2: iv_ruleTableMeasure= ruleTableMeasure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableMeasureRule()); 
@@ -5870,7 +4916,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableMeasure"
-    // InternalTableDSL.g:2059:1: ruleTableMeasure returns [EObject current=null] : (otherlv_0= 'measure' ( (otherlv_1= RULE_ID ) ) ) ;
+    // InternalTableDSL.g:1695:1: ruleTableMeasure returns [EObject current=null] : (otherlv_0= 'measure' ( (otherlv_1= RULE_ID ) ) ) ;
     public final EObject ruleTableMeasure() throws RecognitionException {
         EObject current = null;
 
@@ -5881,23 +4927,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2065:2: ( (otherlv_0= 'measure' ( (otherlv_1= RULE_ID ) ) ) )
-            // InternalTableDSL.g:2066:2: (otherlv_0= 'measure' ( (otherlv_1= RULE_ID ) ) )
+            // InternalTableDSL.g:1701:2: ( (otherlv_0= 'measure' ( (otherlv_1= RULE_ID ) ) ) )
+            // InternalTableDSL.g:1702:2: (otherlv_0= 'measure' ( (otherlv_1= RULE_ID ) ) )
             {
-            // InternalTableDSL.g:2066:2: (otherlv_0= 'measure' ( (otherlv_1= RULE_ID ) ) )
-            // InternalTableDSL.g:2067:3: otherlv_0= 'measure' ( (otherlv_1= RULE_ID ) )
+            // InternalTableDSL.g:1702:2: (otherlv_0= 'measure' ( (otherlv_1= RULE_ID ) ) )
+            // InternalTableDSL.g:1703:3: otherlv_0= 'measure' ( (otherlv_1= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,51,FOLLOW_4); if (state.failed) return current;
+            otherlv_0=(Token)match(input,50,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getTableMeasureAccess().getMeasureKeyword_0());
               		
             }
-            // InternalTableDSL.g:2071:3: ( (otherlv_1= RULE_ID ) )
-            // InternalTableDSL.g:2072:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:1707:3: ( (otherlv_1= RULE_ID ) )
+            // InternalTableDSL.g:1708:4: (otherlv_1= RULE_ID )
             {
-            // InternalTableDSL.g:2072:4: (otherlv_1= RULE_ID )
-            // InternalTableDSL.g:2073:5: otherlv_1= RULE_ID
+            // InternalTableDSL.g:1708:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:1709:5: otherlv_1= RULE_ID
             {
             if ( state.backtracking==0 ) {
 
@@ -5943,7 +4989,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableDerived"
-    // InternalTableDSL.g:2088:1: entryRuleTableDerived returns [EObject current=null] : iv_ruleTableDerived= ruleTableDerived EOF ;
+    // InternalTableDSL.g:1724:1: entryRuleTableDerived returns [EObject current=null] : iv_ruleTableDerived= ruleTableDerived EOF ;
     public final EObject entryRuleTableDerived() throws RecognitionException {
         EObject current = null;
 
@@ -5951,8 +4997,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2088:53: (iv_ruleTableDerived= ruleTableDerived EOF )
-            // InternalTableDSL.g:2089:2: iv_ruleTableDerived= ruleTableDerived EOF
+            // InternalTableDSL.g:1724:53: (iv_ruleTableDerived= ruleTableDerived EOF )
+            // InternalTableDSL.g:1725:2: iv_ruleTableDerived= ruleTableDerived EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableDerivedRule()); 
@@ -5983,7 +5029,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableDerived"
-    // InternalTableDSL.g:2095:1: ruleTableDerived returns [EObject current=null] : (otherlv_0= 'derived' ( (otherlv_1= RULE_ID ) ) ) ;
+    // InternalTableDSL.g:1731:1: ruleTableDerived returns [EObject current=null] : (otherlv_0= 'derived' ( (otherlv_1= RULE_ID ) ) ) ;
     public final EObject ruleTableDerived() throws RecognitionException {
         EObject current = null;
 
@@ -5994,23 +5040,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2101:2: ( (otherlv_0= 'derived' ( (otherlv_1= RULE_ID ) ) ) )
-            // InternalTableDSL.g:2102:2: (otherlv_0= 'derived' ( (otherlv_1= RULE_ID ) ) )
+            // InternalTableDSL.g:1737:2: ( (otherlv_0= 'derived' ( (otherlv_1= RULE_ID ) ) ) )
+            // InternalTableDSL.g:1738:2: (otherlv_0= 'derived' ( (otherlv_1= RULE_ID ) ) )
             {
-            // InternalTableDSL.g:2102:2: (otherlv_0= 'derived' ( (otherlv_1= RULE_ID ) ) )
-            // InternalTableDSL.g:2103:3: otherlv_0= 'derived' ( (otherlv_1= RULE_ID ) )
+            // InternalTableDSL.g:1738:2: (otherlv_0= 'derived' ( (otherlv_1= RULE_ID ) ) )
+            // InternalTableDSL.g:1739:3: otherlv_0= 'derived' ( (otherlv_1= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,52,FOLLOW_4); if (state.failed) return current;
+            otherlv_0=(Token)match(input,51,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getTableDerivedAccess().getDerivedKeyword_0());
               		
             }
-            // InternalTableDSL.g:2107:3: ( (otherlv_1= RULE_ID ) )
-            // InternalTableDSL.g:2108:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:1743:3: ( (otherlv_1= RULE_ID ) )
+            // InternalTableDSL.g:1744:4: (otherlv_1= RULE_ID )
             {
-            // InternalTableDSL.g:2108:4: (otherlv_1= RULE_ID )
-            // InternalTableDSL.g:2109:5: otherlv_1= RULE_ID
+            // InternalTableDSL.g:1744:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:1745:5: otherlv_1= RULE_ID
             {
             if ( state.backtracking==0 ) {
 
@@ -6056,7 +5102,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableHierarchy"
-    // InternalTableDSL.g:2124:1: entryRuleTableHierarchy returns [EObject current=null] : iv_ruleTableHierarchy= ruleTableHierarchy EOF ;
+    // InternalTableDSL.g:1760:1: entryRuleTableHierarchy returns [EObject current=null] : iv_ruleTableHierarchy= ruleTableHierarchy EOF ;
     public final EObject entryRuleTableHierarchy() throws RecognitionException {
         EObject current = null;
 
@@ -6064,8 +5110,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2124:55: (iv_ruleTableHierarchy= ruleTableHierarchy EOF )
-            // InternalTableDSL.g:2125:2: iv_ruleTableHierarchy= ruleTableHierarchy EOF
+            // InternalTableDSL.g:1760:55: (iv_ruleTableHierarchy= ruleTableHierarchy EOF )
+            // InternalTableDSL.g:1761:2: iv_ruleTableHierarchy= ruleTableHierarchy EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableHierarchyRule()); 
@@ -6096,7 +5142,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableHierarchy"
-    // InternalTableDSL.g:2131:1: ruleTableHierarchy returns [EObject current=null] : (otherlv_0= 'level' ( (otherlv_1= RULE_ID ) ) ) ;
+    // InternalTableDSL.g:1767:1: ruleTableHierarchy returns [EObject current=null] : (otherlv_0= 'level' ( (otherlv_1= RULE_ID ) ) ) ;
     public final EObject ruleTableHierarchy() throws RecognitionException {
         EObject current = null;
 
@@ -6107,23 +5153,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2137:2: ( (otherlv_0= 'level' ( (otherlv_1= RULE_ID ) ) ) )
-            // InternalTableDSL.g:2138:2: (otherlv_0= 'level' ( (otherlv_1= RULE_ID ) ) )
+            // InternalTableDSL.g:1773:2: ( (otherlv_0= 'level' ( (otherlv_1= RULE_ID ) ) ) )
+            // InternalTableDSL.g:1774:2: (otherlv_0= 'level' ( (otherlv_1= RULE_ID ) ) )
             {
-            // InternalTableDSL.g:2138:2: (otherlv_0= 'level' ( (otherlv_1= RULE_ID ) ) )
-            // InternalTableDSL.g:2139:3: otherlv_0= 'level' ( (otherlv_1= RULE_ID ) )
+            // InternalTableDSL.g:1774:2: (otherlv_0= 'level' ( (otherlv_1= RULE_ID ) ) )
+            // InternalTableDSL.g:1775:3: otherlv_0= 'level' ( (otherlv_1= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,53,FOLLOW_4); if (state.failed) return current;
+            otherlv_0=(Token)match(input,52,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getTableHierarchyAccess().getLevelKeyword_0());
               		
             }
-            // InternalTableDSL.g:2143:3: ( (otherlv_1= RULE_ID ) )
-            // InternalTableDSL.g:2144:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:1779:3: ( (otherlv_1= RULE_ID ) )
+            // InternalTableDSL.g:1780:4: (otherlv_1= RULE_ID )
             {
-            // InternalTableDSL.g:2144:4: (otherlv_1= RULE_ID )
-            // InternalTableDSL.g:2145:5: otherlv_1= RULE_ID
+            // InternalTableDSL.g:1780:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:1781:5: otherlv_1= RULE_ID
             {
             if ( state.backtracking==0 ) {
 
@@ -6169,7 +5215,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableAttribute"
-    // InternalTableDSL.g:2160:1: entryRuleTableAttribute returns [EObject current=null] : iv_ruleTableAttribute= ruleTableAttribute EOF ;
+    // InternalTableDSL.g:1796:1: entryRuleTableAttribute returns [EObject current=null] : iv_ruleTableAttribute= ruleTableAttribute EOF ;
     public final EObject entryRuleTableAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -6177,8 +5223,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2160:55: (iv_ruleTableAttribute= ruleTableAttribute EOF )
-            // InternalTableDSL.g:2161:2: iv_ruleTableAttribute= ruleTableAttribute EOF
+            // InternalTableDSL.g:1796:55: (iv_ruleTableAttribute= ruleTableAttribute EOF )
+            // InternalTableDSL.g:1797:2: iv_ruleTableAttribute= ruleTableAttribute EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableAttributeRule()); 
@@ -6209,7 +5255,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableAttribute"
-    // InternalTableDSL.g:2167:1: ruleTableAttribute returns [EObject current=null] : ( () otherlv_1= 'property' ( (otherlv_2= RULE_ID ) ) ) ;
+    // InternalTableDSL.g:1803:1: ruleTableAttribute returns [EObject current=null] : ( () otherlv_1= 'property' ( (otherlv_2= RULE_ID ) ) ) ;
     public final EObject ruleTableAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -6220,14 +5266,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2173:2: ( ( () otherlv_1= 'property' ( (otherlv_2= RULE_ID ) ) ) )
-            // InternalTableDSL.g:2174:2: ( () otherlv_1= 'property' ( (otherlv_2= RULE_ID ) ) )
+            // InternalTableDSL.g:1809:2: ( ( () otherlv_1= 'property' ( (otherlv_2= RULE_ID ) ) ) )
+            // InternalTableDSL.g:1810:2: ( () otherlv_1= 'property' ( (otherlv_2= RULE_ID ) ) )
             {
-            // InternalTableDSL.g:2174:2: ( () otherlv_1= 'property' ( (otherlv_2= RULE_ID ) ) )
-            // InternalTableDSL.g:2175:3: () otherlv_1= 'property' ( (otherlv_2= RULE_ID ) )
+            // InternalTableDSL.g:1810:2: ( () otherlv_1= 'property' ( (otherlv_2= RULE_ID ) ) )
+            // InternalTableDSL.g:1811:3: () otherlv_1= 'property' ( (otherlv_2= RULE_ID ) )
             {
-            // InternalTableDSL.g:2175:3: ()
-            // InternalTableDSL.g:2176:4: 
+            // InternalTableDSL.g:1811:3: ()
+            // InternalTableDSL.g:1812:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -6239,17 +5285,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,54,FOLLOW_4); if (state.failed) return current;
+            otherlv_1=(Token)match(input,53,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getTableAttributeAccess().getPropertyKeyword_1());
               		
             }
-            // InternalTableDSL.g:2186:3: ( (otherlv_2= RULE_ID ) )
-            // InternalTableDSL.g:2187:4: (otherlv_2= RULE_ID )
+            // InternalTableDSL.g:1822:3: ( (otherlv_2= RULE_ID ) )
+            // InternalTableDSL.g:1823:4: (otherlv_2= RULE_ID )
             {
-            // InternalTableDSL.g:2187:4: (otherlv_2= RULE_ID )
-            // InternalTableDSL.g:2188:5: otherlv_2= RULE_ID
+            // InternalTableDSL.g:1823:4: (otherlv_2= RULE_ID )
+            // InternalTableDSL.g:1824:5: otherlv_2= RULE_ID
             {
             if ( state.backtracking==0 ) {
 
@@ -6295,7 +5341,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableAggregation"
-    // InternalTableDSL.g:2203:1: entryRuleTableAggregation returns [EObject current=null] : iv_ruleTableAggregation= ruleTableAggregation EOF ;
+    // InternalTableDSL.g:1839:1: entryRuleTableAggregation returns [EObject current=null] : iv_ruleTableAggregation= ruleTableAggregation EOF ;
     public final EObject entryRuleTableAggregation() throws RecognitionException {
         EObject current = null;
 
@@ -6303,8 +5349,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2203:57: (iv_ruleTableAggregation= ruleTableAggregation EOF )
-            // InternalTableDSL.g:2204:2: iv_ruleTableAggregation= ruleTableAggregation EOF
+            // InternalTableDSL.g:1839:57: (iv_ruleTableAggregation= ruleTableAggregation EOF )
+            // InternalTableDSL.g:1840:2: iv_ruleTableAggregation= ruleTableAggregation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableAggregationRule()); 
@@ -6335,7 +5381,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableAggregation"
-    // InternalTableDSL.g:2210:1: ruleTableAggregation returns [EObject current=null] : (otherlv_0= 'aggregation' ( (otherlv_1= RULE_ID ) ) ) ;
+    // InternalTableDSL.g:1846:1: ruleTableAggregation returns [EObject current=null] : (otherlv_0= 'aggregation' ( (otherlv_1= RULE_ID ) ) ) ;
     public final EObject ruleTableAggregation() throws RecognitionException {
         EObject current = null;
 
@@ -6346,23 +5392,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2216:2: ( (otherlv_0= 'aggregation' ( (otherlv_1= RULE_ID ) ) ) )
-            // InternalTableDSL.g:2217:2: (otherlv_0= 'aggregation' ( (otherlv_1= RULE_ID ) ) )
+            // InternalTableDSL.g:1852:2: ( (otherlv_0= 'aggregation' ( (otherlv_1= RULE_ID ) ) ) )
+            // InternalTableDSL.g:1853:2: (otherlv_0= 'aggregation' ( (otherlv_1= RULE_ID ) ) )
             {
-            // InternalTableDSL.g:2217:2: (otherlv_0= 'aggregation' ( (otherlv_1= RULE_ID ) ) )
-            // InternalTableDSL.g:2218:3: otherlv_0= 'aggregation' ( (otherlv_1= RULE_ID ) )
+            // InternalTableDSL.g:1853:2: (otherlv_0= 'aggregation' ( (otherlv_1= RULE_ID ) ) )
+            // InternalTableDSL.g:1854:3: otherlv_0= 'aggregation' ( (otherlv_1= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,55,FOLLOW_4); if (state.failed) return current;
+            otherlv_0=(Token)match(input,54,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getTableAggregationAccess().getAggregationKeyword_0());
               		
             }
-            // InternalTableDSL.g:2222:3: ( (otherlv_1= RULE_ID ) )
-            // InternalTableDSL.g:2223:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:1858:3: ( (otherlv_1= RULE_ID ) )
+            // InternalTableDSL.g:1859:4: (otherlv_1= RULE_ID )
             {
-            // InternalTableDSL.g:2223:4: (otherlv_1= RULE_ID )
-            // InternalTableDSL.g:2224:5: otherlv_1= RULE_ID
+            // InternalTableDSL.g:1859:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:1860:5: otherlv_1= RULE_ID
             {
             if ( state.backtracking==0 ) {
 
@@ -6408,7 +5454,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableInterval"
-    // InternalTableDSL.g:2239:1: entryRuleTableInterval returns [EObject current=null] : iv_ruleTableInterval= ruleTableInterval EOF ;
+    // InternalTableDSL.g:1875:1: entryRuleTableInterval returns [EObject current=null] : iv_ruleTableInterval= ruleTableInterval EOF ;
     public final EObject entryRuleTableInterval() throws RecognitionException {
         EObject current = null;
 
@@ -6416,8 +5462,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2239:54: (iv_ruleTableInterval= ruleTableInterval EOF )
-            // InternalTableDSL.g:2240:2: iv_ruleTableInterval= ruleTableInterval EOF
+            // InternalTableDSL.g:1875:54: (iv_ruleTableInterval= ruleTableInterval EOF )
+            // InternalTableDSL.g:1876:2: iv_ruleTableInterval= ruleTableInterval EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableIntervalRule()); 
@@ -6448,7 +5494,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableInterval"
-    // InternalTableDSL.g:2246:1: ruleTableInterval returns [EObject current=null] : (this_TableNumberInterval_0= ruleTableNumberInterval | this_TableIntInterval_1= ruleTableIntInterval | this_TableDateDayInterval_2= ruleTableDateDayInterval ) ;
+    // InternalTableDSL.g:1882:1: ruleTableInterval returns [EObject current=null] : (this_TableNumberInterval_0= ruleTableNumberInterval | this_TableIntInterval_1= ruleTableIntInterval | this_TableDateDayInterval_2= ruleTableDateDayInterval ) ;
     public final EObject ruleTableInterval() throws RecognitionException {
         EObject current = null;
 
@@ -6463,38 +5509,38 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2252:2: ( (this_TableNumberInterval_0= ruleTableNumberInterval | this_TableIntInterval_1= ruleTableIntInterval | this_TableDateDayInterval_2= ruleTableDateDayInterval ) )
-            // InternalTableDSL.g:2253:2: (this_TableNumberInterval_0= ruleTableNumberInterval | this_TableIntInterval_1= ruleTableIntInterval | this_TableDateDayInterval_2= ruleTableDateDayInterval )
+            // InternalTableDSL.g:1888:2: ( (this_TableNumberInterval_0= ruleTableNumberInterval | this_TableIntInterval_1= ruleTableIntInterval | this_TableDateDayInterval_2= ruleTableDateDayInterval ) )
+            // InternalTableDSL.g:1889:2: (this_TableNumberInterval_0= ruleTableNumberInterval | this_TableIntInterval_1= ruleTableIntInterval | this_TableDateDayInterval_2= ruleTableDateDayInterval )
             {
-            // InternalTableDSL.g:2253:2: (this_TableNumberInterval_0= ruleTableNumberInterval | this_TableIntInterval_1= ruleTableIntInterval | this_TableDateDayInterval_2= ruleTableDateDayInterval )
-            int alt23=3;
+            // InternalTableDSL.g:1889:2: (this_TableNumberInterval_0= ruleTableNumberInterval | this_TableIntInterval_1= ruleTableIntInterval | this_TableDateDayInterval_2= ruleTableDateDayInterval )
+            int alt21=3;
             switch ( input.LA(1) ) {
-            case 56:
+            case 55:
                 {
-                alt23=1;
+                alt21=1;
                 }
                 break;
-            case 57:
+            case 56:
                 {
-                alt23=2;
+                alt21=2;
                 }
                 break;
-            case 58:
+            case 57:
                 {
-                alt23=3;
+                alt21=3;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 23, 0, input);
+                    new NoViableAltException("", 21, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt23) {
+            switch (alt21) {
                 case 1 :
-                    // InternalTableDSL.g:2254:3: this_TableNumberInterval_0= ruleTableNumberInterval
+                    // InternalTableDSL.g:1890:3: this_TableNumberInterval_0= ruleTableNumberInterval
                     {
                     if ( state.backtracking==0 ) {
 
@@ -6516,7 +5562,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:2263:3: this_TableIntInterval_1= ruleTableIntInterval
+                    // InternalTableDSL.g:1899:3: this_TableIntInterval_1= ruleTableIntInterval
                     {
                     if ( state.backtracking==0 ) {
 
@@ -6538,7 +5584,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:2272:3: this_TableDateDayInterval_2= ruleTableDateDayInterval
+                    // InternalTableDSL.g:1908:3: this_TableDateDayInterval_2= ruleTableDateDayInterval
                     {
                     if ( state.backtracking==0 ) {
 
@@ -6584,7 +5630,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableNumberInterval"
-    // InternalTableDSL.g:2284:1: entryRuleTableNumberInterval returns [EObject current=null] : iv_ruleTableNumberInterval= ruleTableNumberInterval EOF ;
+    // InternalTableDSL.g:1920:1: entryRuleTableNumberInterval returns [EObject current=null] : iv_ruleTableNumberInterval= ruleTableNumberInterval EOF ;
     public final EObject entryRuleTableNumberInterval() throws RecognitionException {
         EObject current = null;
 
@@ -6592,8 +5638,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2284:60: (iv_ruleTableNumberInterval= ruleTableNumberInterval EOF )
-            // InternalTableDSL.g:2285:2: iv_ruleTableNumberInterval= ruleTableNumberInterval EOF
+            // InternalTableDSL.g:1920:60: (iv_ruleTableNumberInterval= ruleTableNumberInterval EOF )
+            // InternalTableDSL.g:1921:2: iv_ruleTableNumberInterval= ruleTableNumberInterval EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableNumberIntervalRule()); 
@@ -6624,7 +5670,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableNumberInterval"
-    // InternalTableDSL.g:2291:1: ruleTableNumberInterval returns [EObject current=null] : ( () otherlv_1= 'upToNumber' ( (lv_numberIntervalValue_2_0= ruleSignedNumber ) ) ( (lv_numberRange_3_0= ruleTableRangeElement ) ) ) ;
+    // InternalTableDSL.g:1927:1: ruleTableNumberInterval returns [EObject current=null] : ( () otherlv_1= 'upToNumber' ( (lv_numberIntervalValue_2_0= ruleSignedNumber ) ) ( (lv_numberRange_3_0= ruleTableRangeElement ) ) ) ;
     public final EObject ruleTableNumberInterval() throws RecognitionException {
         EObject current = null;
 
@@ -6638,14 +5684,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2297:2: ( ( () otherlv_1= 'upToNumber' ( (lv_numberIntervalValue_2_0= ruleSignedNumber ) ) ( (lv_numberRange_3_0= ruleTableRangeElement ) ) ) )
-            // InternalTableDSL.g:2298:2: ( () otherlv_1= 'upToNumber' ( (lv_numberIntervalValue_2_0= ruleSignedNumber ) ) ( (lv_numberRange_3_0= ruleTableRangeElement ) ) )
+            // InternalTableDSL.g:1933:2: ( ( () otherlv_1= 'upToNumber' ( (lv_numberIntervalValue_2_0= ruleSignedNumber ) ) ( (lv_numberRange_3_0= ruleTableRangeElement ) ) ) )
+            // InternalTableDSL.g:1934:2: ( () otherlv_1= 'upToNumber' ( (lv_numberIntervalValue_2_0= ruleSignedNumber ) ) ( (lv_numberRange_3_0= ruleTableRangeElement ) ) )
             {
-            // InternalTableDSL.g:2298:2: ( () otherlv_1= 'upToNumber' ( (lv_numberIntervalValue_2_0= ruleSignedNumber ) ) ( (lv_numberRange_3_0= ruleTableRangeElement ) ) )
-            // InternalTableDSL.g:2299:3: () otherlv_1= 'upToNumber' ( (lv_numberIntervalValue_2_0= ruleSignedNumber ) ) ( (lv_numberRange_3_0= ruleTableRangeElement ) )
+            // InternalTableDSL.g:1934:2: ( () otherlv_1= 'upToNumber' ( (lv_numberIntervalValue_2_0= ruleSignedNumber ) ) ( (lv_numberRange_3_0= ruleTableRangeElement ) ) )
+            // InternalTableDSL.g:1935:3: () otherlv_1= 'upToNumber' ( (lv_numberIntervalValue_2_0= ruleSignedNumber ) ) ( (lv_numberRange_3_0= ruleTableRangeElement ) )
             {
-            // InternalTableDSL.g:2299:3: ()
-            // InternalTableDSL.g:2300:4: 
+            // InternalTableDSL.g:1935:3: ()
+            // InternalTableDSL.g:1936:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -6657,17 +5703,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,56,FOLLOW_27); if (state.failed) return current;
+            otherlv_1=(Token)match(input,55,FOLLOW_27); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getTableNumberIntervalAccess().getUpToNumberKeyword_1());
               		
             }
-            // InternalTableDSL.g:2310:3: ( (lv_numberIntervalValue_2_0= ruleSignedNumber ) )
-            // InternalTableDSL.g:2311:4: (lv_numberIntervalValue_2_0= ruleSignedNumber )
+            // InternalTableDSL.g:1946:3: ( (lv_numberIntervalValue_2_0= ruleSignedNumber ) )
+            // InternalTableDSL.g:1947:4: (lv_numberIntervalValue_2_0= ruleSignedNumber )
             {
-            // InternalTableDSL.g:2311:4: (lv_numberIntervalValue_2_0= ruleSignedNumber )
-            // InternalTableDSL.g:2312:5: lv_numberIntervalValue_2_0= ruleSignedNumber
+            // InternalTableDSL.g:1947:4: (lv_numberIntervalValue_2_0= ruleSignedNumber )
+            // InternalTableDSL.g:1948:5: lv_numberIntervalValue_2_0= ruleSignedNumber
             {
             if ( state.backtracking==0 ) {
 
@@ -6698,11 +5744,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:2329:3: ( (lv_numberRange_3_0= ruleTableRangeElement ) )
-            // InternalTableDSL.g:2330:4: (lv_numberRange_3_0= ruleTableRangeElement )
+            // InternalTableDSL.g:1965:3: ( (lv_numberRange_3_0= ruleTableRangeElement ) )
+            // InternalTableDSL.g:1966:4: (lv_numberRange_3_0= ruleTableRangeElement )
             {
-            // InternalTableDSL.g:2330:4: (lv_numberRange_3_0= ruleTableRangeElement )
-            // InternalTableDSL.g:2331:5: lv_numberRange_3_0= ruleTableRangeElement
+            // InternalTableDSL.g:1966:4: (lv_numberRange_3_0= ruleTableRangeElement )
+            // InternalTableDSL.g:1967:5: lv_numberRange_3_0= ruleTableRangeElement
             {
             if ( state.backtracking==0 ) {
 
@@ -6758,7 +5804,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableIntInterval"
-    // InternalTableDSL.g:2352:1: entryRuleTableIntInterval returns [EObject current=null] : iv_ruleTableIntInterval= ruleTableIntInterval EOF ;
+    // InternalTableDSL.g:1988:1: entryRuleTableIntInterval returns [EObject current=null] : iv_ruleTableIntInterval= ruleTableIntInterval EOF ;
     public final EObject entryRuleTableIntInterval() throws RecognitionException {
         EObject current = null;
 
@@ -6766,8 +5812,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2352:57: (iv_ruleTableIntInterval= ruleTableIntInterval EOF )
-            // InternalTableDSL.g:2353:2: iv_ruleTableIntInterval= ruleTableIntInterval EOF
+            // InternalTableDSL.g:1988:57: (iv_ruleTableIntInterval= ruleTableIntInterval EOF )
+            // InternalTableDSL.g:1989:2: iv_ruleTableIntInterval= ruleTableIntInterval EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableIntIntervalRule()); 
@@ -6798,7 +5844,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableIntInterval"
-    // InternalTableDSL.g:2359:1: ruleTableIntInterval returns [EObject current=null] : ( () otherlv_1= 'upToInteger' ( (lv_intIntervalValue_2_0= ruleSignedInt ) ) ( (lv_intRange_3_0= ruleTableRangeElement ) ) ) ;
+    // InternalTableDSL.g:1995:1: ruleTableIntInterval returns [EObject current=null] : ( () otherlv_1= 'upToInteger' ( (lv_intIntervalValue_2_0= ruleSignedInt ) ) ( (lv_intRange_3_0= ruleTableRangeElement ) ) ) ;
     public final EObject ruleTableIntInterval() throws RecognitionException {
         EObject current = null;
 
@@ -6812,14 +5858,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2365:2: ( ( () otherlv_1= 'upToInteger' ( (lv_intIntervalValue_2_0= ruleSignedInt ) ) ( (lv_intRange_3_0= ruleTableRangeElement ) ) ) )
-            // InternalTableDSL.g:2366:2: ( () otherlv_1= 'upToInteger' ( (lv_intIntervalValue_2_0= ruleSignedInt ) ) ( (lv_intRange_3_0= ruleTableRangeElement ) ) )
+            // InternalTableDSL.g:2001:2: ( ( () otherlv_1= 'upToInteger' ( (lv_intIntervalValue_2_0= ruleSignedInt ) ) ( (lv_intRange_3_0= ruleTableRangeElement ) ) ) )
+            // InternalTableDSL.g:2002:2: ( () otherlv_1= 'upToInteger' ( (lv_intIntervalValue_2_0= ruleSignedInt ) ) ( (lv_intRange_3_0= ruleTableRangeElement ) ) )
             {
-            // InternalTableDSL.g:2366:2: ( () otherlv_1= 'upToInteger' ( (lv_intIntervalValue_2_0= ruleSignedInt ) ) ( (lv_intRange_3_0= ruleTableRangeElement ) ) )
-            // InternalTableDSL.g:2367:3: () otherlv_1= 'upToInteger' ( (lv_intIntervalValue_2_0= ruleSignedInt ) ) ( (lv_intRange_3_0= ruleTableRangeElement ) )
+            // InternalTableDSL.g:2002:2: ( () otherlv_1= 'upToInteger' ( (lv_intIntervalValue_2_0= ruleSignedInt ) ) ( (lv_intRange_3_0= ruleTableRangeElement ) ) )
+            // InternalTableDSL.g:2003:3: () otherlv_1= 'upToInteger' ( (lv_intIntervalValue_2_0= ruleSignedInt ) ) ( (lv_intRange_3_0= ruleTableRangeElement ) )
             {
-            // InternalTableDSL.g:2367:3: ()
-            // InternalTableDSL.g:2368:4: 
+            // InternalTableDSL.g:2003:3: ()
+            // InternalTableDSL.g:2004:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -6831,17 +5877,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,57,FOLLOW_29); if (state.failed) return current;
+            otherlv_1=(Token)match(input,56,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getTableIntIntervalAccess().getUpToIntegerKeyword_1());
               		
             }
-            // InternalTableDSL.g:2378:3: ( (lv_intIntervalValue_2_0= ruleSignedInt ) )
-            // InternalTableDSL.g:2379:4: (lv_intIntervalValue_2_0= ruleSignedInt )
+            // InternalTableDSL.g:2014:3: ( (lv_intIntervalValue_2_0= ruleSignedInt ) )
+            // InternalTableDSL.g:2015:4: (lv_intIntervalValue_2_0= ruleSignedInt )
             {
-            // InternalTableDSL.g:2379:4: (lv_intIntervalValue_2_0= ruleSignedInt )
-            // InternalTableDSL.g:2380:5: lv_intIntervalValue_2_0= ruleSignedInt
+            // InternalTableDSL.g:2015:4: (lv_intIntervalValue_2_0= ruleSignedInt )
+            // InternalTableDSL.g:2016:5: lv_intIntervalValue_2_0= ruleSignedInt
             {
             if ( state.backtracking==0 ) {
 
@@ -6872,11 +5918,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:2397:3: ( (lv_intRange_3_0= ruleTableRangeElement ) )
-            // InternalTableDSL.g:2398:4: (lv_intRange_3_0= ruleTableRangeElement )
+            // InternalTableDSL.g:2033:3: ( (lv_intRange_3_0= ruleTableRangeElement ) )
+            // InternalTableDSL.g:2034:4: (lv_intRange_3_0= ruleTableRangeElement )
             {
-            // InternalTableDSL.g:2398:4: (lv_intRange_3_0= ruleTableRangeElement )
-            // InternalTableDSL.g:2399:5: lv_intRange_3_0= ruleTableRangeElement
+            // InternalTableDSL.g:2034:4: (lv_intRange_3_0= ruleTableRangeElement )
+            // InternalTableDSL.g:2035:5: lv_intRange_3_0= ruleTableRangeElement
             {
             if ( state.backtracking==0 ) {
 
@@ -6932,7 +5978,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableDateDayInterval"
-    // InternalTableDSL.g:2420:1: entryRuleTableDateDayInterval returns [EObject current=null] : iv_ruleTableDateDayInterval= ruleTableDateDayInterval EOF ;
+    // InternalTableDSL.g:2056:1: entryRuleTableDateDayInterval returns [EObject current=null] : iv_ruleTableDateDayInterval= ruleTableDateDayInterval EOF ;
     public final EObject entryRuleTableDateDayInterval() throws RecognitionException {
         EObject current = null;
 
@@ -6940,8 +5986,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2420:61: (iv_ruleTableDateDayInterval= ruleTableDateDayInterval EOF )
-            // InternalTableDSL.g:2421:2: iv_ruleTableDateDayInterval= ruleTableDateDayInterval EOF
+            // InternalTableDSL.g:2056:61: (iv_ruleTableDateDayInterval= ruleTableDateDayInterval EOF )
+            // InternalTableDSL.g:2057:2: iv_ruleTableDateDayInterval= ruleTableDateDayInterval EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableDateDayIntervalRule()); 
@@ -6972,7 +6018,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableDateDayInterval"
-    // InternalTableDSL.g:2427:1: ruleTableDateDayInterval returns [EObject current=null] : ( () otherlv_1= 'daysInPast' ( (lv_dateIntervalValue_2_0= ruleSignedInt ) ) ( (lv_dateRange_3_0= ruleTableRangeElement ) ) ) ;
+    // InternalTableDSL.g:2063:1: ruleTableDateDayInterval returns [EObject current=null] : ( () otherlv_1= 'daysInPast' ( (lv_dateIntervalValue_2_0= ruleSignedInt ) ) ( (lv_dateRange_3_0= ruleTableRangeElement ) ) ) ;
     public final EObject ruleTableDateDayInterval() throws RecognitionException {
         EObject current = null;
 
@@ -6986,14 +6032,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2433:2: ( ( () otherlv_1= 'daysInPast' ( (lv_dateIntervalValue_2_0= ruleSignedInt ) ) ( (lv_dateRange_3_0= ruleTableRangeElement ) ) ) )
-            // InternalTableDSL.g:2434:2: ( () otherlv_1= 'daysInPast' ( (lv_dateIntervalValue_2_0= ruleSignedInt ) ) ( (lv_dateRange_3_0= ruleTableRangeElement ) ) )
+            // InternalTableDSL.g:2069:2: ( ( () otherlv_1= 'daysInPast' ( (lv_dateIntervalValue_2_0= ruleSignedInt ) ) ( (lv_dateRange_3_0= ruleTableRangeElement ) ) ) )
+            // InternalTableDSL.g:2070:2: ( () otherlv_1= 'daysInPast' ( (lv_dateIntervalValue_2_0= ruleSignedInt ) ) ( (lv_dateRange_3_0= ruleTableRangeElement ) ) )
             {
-            // InternalTableDSL.g:2434:2: ( () otherlv_1= 'daysInPast' ( (lv_dateIntervalValue_2_0= ruleSignedInt ) ) ( (lv_dateRange_3_0= ruleTableRangeElement ) ) )
-            // InternalTableDSL.g:2435:3: () otherlv_1= 'daysInPast' ( (lv_dateIntervalValue_2_0= ruleSignedInt ) ) ( (lv_dateRange_3_0= ruleTableRangeElement ) )
+            // InternalTableDSL.g:2070:2: ( () otherlv_1= 'daysInPast' ( (lv_dateIntervalValue_2_0= ruleSignedInt ) ) ( (lv_dateRange_3_0= ruleTableRangeElement ) ) )
+            // InternalTableDSL.g:2071:3: () otherlv_1= 'daysInPast' ( (lv_dateIntervalValue_2_0= ruleSignedInt ) ) ( (lv_dateRange_3_0= ruleTableRangeElement ) )
             {
-            // InternalTableDSL.g:2435:3: ()
-            // InternalTableDSL.g:2436:4: 
+            // InternalTableDSL.g:2071:3: ()
+            // InternalTableDSL.g:2072:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -7005,17 +6051,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,58,FOLLOW_29); if (state.failed) return current;
+            otherlv_1=(Token)match(input,57,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getTableDateDayIntervalAccess().getDaysInPastKeyword_1());
               		
             }
-            // InternalTableDSL.g:2446:3: ( (lv_dateIntervalValue_2_0= ruleSignedInt ) )
-            // InternalTableDSL.g:2447:4: (lv_dateIntervalValue_2_0= ruleSignedInt )
+            // InternalTableDSL.g:2082:3: ( (lv_dateIntervalValue_2_0= ruleSignedInt ) )
+            // InternalTableDSL.g:2083:4: (lv_dateIntervalValue_2_0= ruleSignedInt )
             {
-            // InternalTableDSL.g:2447:4: (lv_dateIntervalValue_2_0= ruleSignedInt )
-            // InternalTableDSL.g:2448:5: lv_dateIntervalValue_2_0= ruleSignedInt
+            // InternalTableDSL.g:2083:4: (lv_dateIntervalValue_2_0= ruleSignedInt )
+            // InternalTableDSL.g:2084:5: lv_dateIntervalValue_2_0= ruleSignedInt
             {
             if ( state.backtracking==0 ) {
 
@@ -7046,11 +6092,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:2465:3: ( (lv_dateRange_3_0= ruleTableRangeElement ) )
-            // InternalTableDSL.g:2466:4: (lv_dateRange_3_0= ruleTableRangeElement )
+            // InternalTableDSL.g:2101:3: ( (lv_dateRange_3_0= ruleTableRangeElement ) )
+            // InternalTableDSL.g:2102:4: (lv_dateRange_3_0= ruleTableRangeElement )
             {
-            // InternalTableDSL.g:2466:4: (lv_dateRange_3_0= ruleTableRangeElement )
-            // InternalTableDSL.g:2467:5: lv_dateRange_3_0= ruleTableRangeElement
+            // InternalTableDSL.g:2102:4: (lv_dateRange_3_0= ruleTableRangeElement )
+            // InternalTableDSL.g:2103:5: lv_dateRange_3_0= ruleTableRangeElement
             {
             if ( state.backtracking==0 ) {
 
@@ -7106,7 +6152,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableLookup"
-    // InternalTableDSL.g:2488:1: entryRuleTableLookup returns [EObject current=null] : iv_ruleTableLookup= ruleTableLookup EOF ;
+    // InternalTableDSL.g:2124:1: entryRuleTableLookup returns [EObject current=null] : iv_ruleTableLookup= ruleTableLookup EOF ;
     public final EObject entryRuleTableLookup() throws RecognitionException {
         EObject current = null;
 
@@ -7114,8 +6160,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2488:52: (iv_ruleTableLookup= ruleTableLookup EOF )
-            // InternalTableDSL.g:2489:2: iv_ruleTableLookup= ruleTableLookup EOF
+            // InternalTableDSL.g:2124:52: (iv_ruleTableLookup= ruleTableLookup EOF )
+            // InternalTableDSL.g:2125:2: iv_ruleTableLookup= ruleTableLookup EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableLookupRule()); 
@@ -7146,7 +6192,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableLookup"
-    // InternalTableDSL.g:2495:1: ruleTableLookup returns [EObject current=null] : (this_TableNumberLookup_0= ruleTableNumberLookup | this_TableIntLookup_1= ruleTableIntLookup | this_TableStringLookup_2= ruleTableStringLookup | this_TableDateDayLookup_3= ruleTableDateDayLookup ) ;
+    // InternalTableDSL.g:2131:1: ruleTableLookup returns [EObject current=null] : (this_TableNumberLookup_0= ruleTableNumberLookup | this_TableIntLookup_1= ruleTableIntLookup | this_TableStringLookup_2= ruleTableStringLookup | this_TableDateDayLookup_3= ruleTableDateDayLookup ) ;
     public final EObject ruleTableLookup() throws RecognitionException {
         EObject current = null;
 
@@ -7163,43 +6209,43 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2501:2: ( (this_TableNumberLookup_0= ruleTableNumberLookup | this_TableIntLookup_1= ruleTableIntLookup | this_TableStringLookup_2= ruleTableStringLookup | this_TableDateDayLookup_3= ruleTableDateDayLookup ) )
-            // InternalTableDSL.g:2502:2: (this_TableNumberLookup_0= ruleTableNumberLookup | this_TableIntLookup_1= ruleTableIntLookup | this_TableStringLookup_2= ruleTableStringLookup | this_TableDateDayLookup_3= ruleTableDateDayLookup )
+            // InternalTableDSL.g:2137:2: ( (this_TableNumberLookup_0= ruleTableNumberLookup | this_TableIntLookup_1= ruleTableIntLookup | this_TableStringLookup_2= ruleTableStringLookup | this_TableDateDayLookup_3= ruleTableDateDayLookup ) )
+            // InternalTableDSL.g:2138:2: (this_TableNumberLookup_0= ruleTableNumberLookup | this_TableIntLookup_1= ruleTableIntLookup | this_TableStringLookup_2= ruleTableStringLookup | this_TableDateDayLookup_3= ruleTableDateDayLookup )
             {
-            // InternalTableDSL.g:2502:2: (this_TableNumberLookup_0= ruleTableNumberLookup | this_TableIntLookup_1= ruleTableIntLookup | this_TableStringLookup_2= ruleTableStringLookup | this_TableDateDayLookup_3= ruleTableDateDayLookup )
-            int alt24=4;
+            // InternalTableDSL.g:2138:2: (this_TableNumberLookup_0= ruleTableNumberLookup | this_TableIntLookup_1= ruleTableIntLookup | this_TableStringLookup_2= ruleTableStringLookup | this_TableDateDayLookup_3= ruleTableDateDayLookup )
+            int alt22=4;
             switch ( input.LA(1) ) {
-            case 60:
+            case 59:
                 {
-                alt24=1;
+                alt22=1;
                 }
                 break;
-            case 59:
+            case 58:
                 {
-                alt24=2;
+                alt22=2;
                 }
                 break;
-            case 61:
+            case 60:
                 {
-                alt24=3;
+                alt22=3;
                 }
                 break;
-            case 58:
+            case 57:
                 {
-                alt24=4;
+                alt22=4;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 24, 0, input);
+                    new NoViableAltException("", 22, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt24) {
+            switch (alt22) {
                 case 1 :
-                    // InternalTableDSL.g:2503:3: this_TableNumberLookup_0= ruleTableNumberLookup
+                    // InternalTableDSL.g:2139:3: this_TableNumberLookup_0= ruleTableNumberLookup
                     {
                     if ( state.backtracking==0 ) {
 
@@ -7221,7 +6267,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:2512:3: this_TableIntLookup_1= ruleTableIntLookup
+                    // InternalTableDSL.g:2148:3: this_TableIntLookup_1= ruleTableIntLookup
                     {
                     if ( state.backtracking==0 ) {
 
@@ -7243,7 +6289,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:2521:3: this_TableStringLookup_2= ruleTableStringLookup
+                    // InternalTableDSL.g:2157:3: this_TableStringLookup_2= ruleTableStringLookup
                     {
                     if ( state.backtracking==0 ) {
 
@@ -7265,7 +6311,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:2530:3: this_TableDateDayLookup_3= ruleTableDateDayLookup
+                    // InternalTableDSL.g:2166:3: this_TableDateDayLookup_3= ruleTableDateDayLookup
                     {
                     if ( state.backtracking==0 ) {
 
@@ -7311,7 +6357,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableIntLookup"
-    // InternalTableDSL.g:2542:1: entryRuleTableIntLookup returns [EObject current=null] : iv_ruleTableIntLookup= ruleTableIntLookup EOF ;
+    // InternalTableDSL.g:2178:1: entryRuleTableIntLookup returns [EObject current=null] : iv_ruleTableIntLookup= ruleTableIntLookup EOF ;
     public final EObject entryRuleTableIntLookup() throws RecognitionException {
         EObject current = null;
 
@@ -7319,8 +6365,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2542:55: (iv_ruleTableIntLookup= ruleTableIntLookup EOF )
-            // InternalTableDSL.g:2543:2: iv_ruleTableIntLookup= ruleTableIntLookup EOF
+            // InternalTableDSL.g:2178:55: (iv_ruleTableIntLookup= ruleTableIntLookup EOF )
+            // InternalTableDSL.g:2179:2: iv_ruleTableIntLookup= ruleTableIntLookup EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableIntLookupRule()); 
@@ -7351,7 +6397,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableIntLookup"
-    // InternalTableDSL.g:2549:1: ruleTableIntLookup returns [EObject current=null] : ( () otherlv_1= 'integer' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) ;
+    // InternalTableDSL.g:2185:1: ruleTableIntLookup returns [EObject current=null] : ( () otherlv_1= 'integer' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) ;
     public final EObject ruleTableIntLookup() throws RecognitionException {
         EObject current = null;
 
@@ -7365,14 +6411,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2555:2: ( ( () otherlv_1= 'integer' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) )
-            // InternalTableDSL.g:2556:2: ( () otherlv_1= 'integer' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
+            // InternalTableDSL.g:2191:2: ( ( () otherlv_1= 'integer' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) )
+            // InternalTableDSL.g:2192:2: ( () otherlv_1= 'integer' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
             {
-            // InternalTableDSL.g:2556:2: ( () otherlv_1= 'integer' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
-            // InternalTableDSL.g:2557:3: () otherlv_1= 'integer' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) )
+            // InternalTableDSL.g:2192:2: ( () otherlv_1= 'integer' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
+            // InternalTableDSL.g:2193:3: () otherlv_1= 'integer' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) )
             {
-            // InternalTableDSL.g:2557:3: ()
-            // InternalTableDSL.g:2558:4: 
+            // InternalTableDSL.g:2193:3: ()
+            // InternalTableDSL.g:2194:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -7384,17 +6430,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,59,FOLLOW_29); if (state.failed) return current;
+            otherlv_1=(Token)match(input,58,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getTableIntLookupAccess().getIntegerKeyword_1());
               		
             }
-            // InternalTableDSL.g:2568:3: ( (lv_lookupValue_2_0= ruleSignedInt ) )
-            // InternalTableDSL.g:2569:4: (lv_lookupValue_2_0= ruleSignedInt )
+            // InternalTableDSL.g:2204:3: ( (lv_lookupValue_2_0= ruleSignedInt ) )
+            // InternalTableDSL.g:2205:4: (lv_lookupValue_2_0= ruleSignedInt )
             {
-            // InternalTableDSL.g:2569:4: (lv_lookupValue_2_0= ruleSignedInt )
-            // InternalTableDSL.g:2570:5: lv_lookupValue_2_0= ruleSignedInt
+            // InternalTableDSL.g:2205:4: (lv_lookupValue_2_0= ruleSignedInt )
+            // InternalTableDSL.g:2206:5: lv_lookupValue_2_0= ruleSignedInt
             {
             if ( state.backtracking==0 ) {
 
@@ -7425,11 +6471,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:2587:3: ( (lv_discrete_3_0= ruleTableRangeElement ) )
-            // InternalTableDSL.g:2588:4: (lv_discrete_3_0= ruleTableRangeElement )
+            // InternalTableDSL.g:2223:3: ( (lv_discrete_3_0= ruleTableRangeElement ) )
+            // InternalTableDSL.g:2224:4: (lv_discrete_3_0= ruleTableRangeElement )
             {
-            // InternalTableDSL.g:2588:4: (lv_discrete_3_0= ruleTableRangeElement )
-            // InternalTableDSL.g:2589:5: lv_discrete_3_0= ruleTableRangeElement
+            // InternalTableDSL.g:2224:4: (lv_discrete_3_0= ruleTableRangeElement )
+            // InternalTableDSL.g:2225:5: lv_discrete_3_0= ruleTableRangeElement
             {
             if ( state.backtracking==0 ) {
 
@@ -7485,7 +6531,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableNumberLookup"
-    // InternalTableDSL.g:2610:1: entryRuleTableNumberLookup returns [EObject current=null] : iv_ruleTableNumberLookup= ruleTableNumberLookup EOF ;
+    // InternalTableDSL.g:2246:1: entryRuleTableNumberLookup returns [EObject current=null] : iv_ruleTableNumberLookup= ruleTableNumberLookup EOF ;
     public final EObject entryRuleTableNumberLookup() throws RecognitionException {
         EObject current = null;
 
@@ -7493,8 +6539,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2610:58: (iv_ruleTableNumberLookup= ruleTableNumberLookup EOF )
-            // InternalTableDSL.g:2611:2: iv_ruleTableNumberLookup= ruleTableNumberLookup EOF
+            // InternalTableDSL.g:2246:58: (iv_ruleTableNumberLookup= ruleTableNumberLookup EOF )
+            // InternalTableDSL.g:2247:2: iv_ruleTableNumberLookup= ruleTableNumberLookup EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableNumberLookupRule()); 
@@ -7525,7 +6571,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableNumberLookup"
-    // InternalTableDSL.g:2617:1: ruleTableNumberLookup returns [EObject current=null] : ( () otherlv_1= 'number' ( (lv_lookupValue_2_0= ruleSignedNumber ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) ;
+    // InternalTableDSL.g:2253:1: ruleTableNumberLookup returns [EObject current=null] : ( () otherlv_1= 'number' ( (lv_lookupValue_2_0= ruleSignedNumber ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) ;
     public final EObject ruleTableNumberLookup() throws RecognitionException {
         EObject current = null;
 
@@ -7539,14 +6585,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2623:2: ( ( () otherlv_1= 'number' ( (lv_lookupValue_2_0= ruleSignedNumber ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) )
-            // InternalTableDSL.g:2624:2: ( () otherlv_1= 'number' ( (lv_lookupValue_2_0= ruleSignedNumber ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
+            // InternalTableDSL.g:2259:2: ( ( () otherlv_1= 'number' ( (lv_lookupValue_2_0= ruleSignedNumber ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) )
+            // InternalTableDSL.g:2260:2: ( () otherlv_1= 'number' ( (lv_lookupValue_2_0= ruleSignedNumber ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
             {
-            // InternalTableDSL.g:2624:2: ( () otherlv_1= 'number' ( (lv_lookupValue_2_0= ruleSignedNumber ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
-            // InternalTableDSL.g:2625:3: () otherlv_1= 'number' ( (lv_lookupValue_2_0= ruleSignedNumber ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) )
+            // InternalTableDSL.g:2260:2: ( () otherlv_1= 'number' ( (lv_lookupValue_2_0= ruleSignedNumber ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
+            // InternalTableDSL.g:2261:3: () otherlv_1= 'number' ( (lv_lookupValue_2_0= ruleSignedNumber ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) )
             {
-            // InternalTableDSL.g:2625:3: ()
-            // InternalTableDSL.g:2626:4: 
+            // InternalTableDSL.g:2261:3: ()
+            // InternalTableDSL.g:2262:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -7558,17 +6604,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,60,FOLLOW_27); if (state.failed) return current;
+            otherlv_1=(Token)match(input,59,FOLLOW_27); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getTableNumberLookupAccess().getNumberKeyword_1());
               		
             }
-            // InternalTableDSL.g:2636:3: ( (lv_lookupValue_2_0= ruleSignedNumber ) )
-            // InternalTableDSL.g:2637:4: (lv_lookupValue_2_0= ruleSignedNumber )
+            // InternalTableDSL.g:2272:3: ( (lv_lookupValue_2_0= ruleSignedNumber ) )
+            // InternalTableDSL.g:2273:4: (lv_lookupValue_2_0= ruleSignedNumber )
             {
-            // InternalTableDSL.g:2637:4: (lv_lookupValue_2_0= ruleSignedNumber )
-            // InternalTableDSL.g:2638:5: lv_lookupValue_2_0= ruleSignedNumber
+            // InternalTableDSL.g:2273:4: (lv_lookupValue_2_0= ruleSignedNumber )
+            // InternalTableDSL.g:2274:5: lv_lookupValue_2_0= ruleSignedNumber
             {
             if ( state.backtracking==0 ) {
 
@@ -7599,11 +6645,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:2655:3: ( (lv_discrete_3_0= ruleTableRangeElement ) )
-            // InternalTableDSL.g:2656:4: (lv_discrete_3_0= ruleTableRangeElement )
+            // InternalTableDSL.g:2291:3: ( (lv_discrete_3_0= ruleTableRangeElement ) )
+            // InternalTableDSL.g:2292:4: (lv_discrete_3_0= ruleTableRangeElement )
             {
-            // InternalTableDSL.g:2656:4: (lv_discrete_3_0= ruleTableRangeElement )
-            // InternalTableDSL.g:2657:5: lv_discrete_3_0= ruleTableRangeElement
+            // InternalTableDSL.g:2292:4: (lv_discrete_3_0= ruleTableRangeElement )
+            // InternalTableDSL.g:2293:5: lv_discrete_3_0= ruleTableRangeElement
             {
             if ( state.backtracking==0 ) {
 
@@ -7659,7 +6705,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableStringLookup"
-    // InternalTableDSL.g:2678:1: entryRuleTableStringLookup returns [EObject current=null] : iv_ruleTableStringLookup= ruleTableStringLookup EOF ;
+    // InternalTableDSL.g:2314:1: entryRuleTableStringLookup returns [EObject current=null] : iv_ruleTableStringLookup= ruleTableStringLookup EOF ;
     public final EObject entryRuleTableStringLookup() throws RecognitionException {
         EObject current = null;
 
@@ -7667,8 +6713,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2678:58: (iv_ruleTableStringLookup= ruleTableStringLookup EOF )
-            // InternalTableDSL.g:2679:2: iv_ruleTableStringLookup= ruleTableStringLookup EOF
+            // InternalTableDSL.g:2314:58: (iv_ruleTableStringLookup= ruleTableStringLookup EOF )
+            // InternalTableDSL.g:2315:2: iv_ruleTableStringLookup= ruleTableStringLookup EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableStringLookupRule()); 
@@ -7699,7 +6745,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableStringLookup"
-    // InternalTableDSL.g:2685:1: ruleTableStringLookup returns [EObject current=null] : ( () otherlv_1= 'string' ( (lv_lookupValue_2_0= RULE_STRING ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) ;
+    // InternalTableDSL.g:2321:1: ruleTableStringLookup returns [EObject current=null] : ( () otherlv_1= 'string' ( (lv_lookupValue_2_0= RULE_STRING ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) ;
     public final EObject ruleTableStringLookup() throws RecognitionException {
         EObject current = null;
 
@@ -7712,14 +6758,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2691:2: ( ( () otherlv_1= 'string' ( (lv_lookupValue_2_0= RULE_STRING ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) )
-            // InternalTableDSL.g:2692:2: ( () otherlv_1= 'string' ( (lv_lookupValue_2_0= RULE_STRING ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
+            // InternalTableDSL.g:2327:2: ( ( () otherlv_1= 'string' ( (lv_lookupValue_2_0= RULE_STRING ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) )
+            // InternalTableDSL.g:2328:2: ( () otherlv_1= 'string' ( (lv_lookupValue_2_0= RULE_STRING ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
             {
-            // InternalTableDSL.g:2692:2: ( () otherlv_1= 'string' ( (lv_lookupValue_2_0= RULE_STRING ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
-            // InternalTableDSL.g:2693:3: () otherlv_1= 'string' ( (lv_lookupValue_2_0= RULE_STRING ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) )
+            // InternalTableDSL.g:2328:2: ( () otherlv_1= 'string' ( (lv_lookupValue_2_0= RULE_STRING ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
+            // InternalTableDSL.g:2329:3: () otherlv_1= 'string' ( (lv_lookupValue_2_0= RULE_STRING ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) )
             {
-            // InternalTableDSL.g:2693:3: ()
-            // InternalTableDSL.g:2694:4: 
+            // InternalTableDSL.g:2329:3: ()
+            // InternalTableDSL.g:2330:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -7731,17 +6777,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,61,FOLLOW_8); if (state.failed) return current;
+            otherlv_1=(Token)match(input,60,FOLLOW_8); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getTableStringLookupAccess().getStringKeyword_1());
               		
             }
-            // InternalTableDSL.g:2704:3: ( (lv_lookupValue_2_0= RULE_STRING ) )
-            // InternalTableDSL.g:2705:4: (lv_lookupValue_2_0= RULE_STRING )
+            // InternalTableDSL.g:2340:3: ( (lv_lookupValue_2_0= RULE_STRING ) )
+            // InternalTableDSL.g:2341:4: (lv_lookupValue_2_0= RULE_STRING )
             {
-            // InternalTableDSL.g:2705:4: (lv_lookupValue_2_0= RULE_STRING )
-            // InternalTableDSL.g:2706:5: lv_lookupValue_2_0= RULE_STRING
+            // InternalTableDSL.g:2341:4: (lv_lookupValue_2_0= RULE_STRING )
+            // InternalTableDSL.g:2342:5: lv_lookupValue_2_0= RULE_STRING
             {
             lv_lookupValue_2_0=(Token)match(input,RULE_STRING,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
@@ -7767,11 +6813,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:2722:3: ( (lv_discrete_3_0= ruleTableRangeElement ) )
-            // InternalTableDSL.g:2723:4: (lv_discrete_3_0= ruleTableRangeElement )
+            // InternalTableDSL.g:2358:3: ( (lv_discrete_3_0= ruleTableRangeElement ) )
+            // InternalTableDSL.g:2359:4: (lv_discrete_3_0= ruleTableRangeElement )
             {
-            // InternalTableDSL.g:2723:4: (lv_discrete_3_0= ruleTableRangeElement )
-            // InternalTableDSL.g:2724:5: lv_discrete_3_0= ruleTableRangeElement
+            // InternalTableDSL.g:2359:4: (lv_discrete_3_0= ruleTableRangeElement )
+            // InternalTableDSL.g:2360:5: lv_discrete_3_0= ruleTableRangeElement
             {
             if ( state.backtracking==0 ) {
 
@@ -7827,7 +6873,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableDateDayLookup"
-    // InternalTableDSL.g:2745:1: entryRuleTableDateDayLookup returns [EObject current=null] : iv_ruleTableDateDayLookup= ruleTableDateDayLookup EOF ;
+    // InternalTableDSL.g:2381:1: entryRuleTableDateDayLookup returns [EObject current=null] : iv_ruleTableDateDayLookup= ruleTableDateDayLookup EOF ;
     public final EObject entryRuleTableDateDayLookup() throws RecognitionException {
         EObject current = null;
 
@@ -7835,8 +6881,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2745:59: (iv_ruleTableDateDayLookup= ruleTableDateDayLookup EOF )
-            // InternalTableDSL.g:2746:2: iv_ruleTableDateDayLookup= ruleTableDateDayLookup EOF
+            // InternalTableDSL.g:2381:59: (iv_ruleTableDateDayLookup= ruleTableDateDayLookup EOF )
+            // InternalTableDSL.g:2382:2: iv_ruleTableDateDayLookup= ruleTableDateDayLookup EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableDateDayLookupRule()); 
@@ -7867,7 +6913,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableDateDayLookup"
-    // InternalTableDSL.g:2752:1: ruleTableDateDayLookup returns [EObject current=null] : ( () otherlv_1= 'daysInPast' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) ;
+    // InternalTableDSL.g:2388:1: ruleTableDateDayLookup returns [EObject current=null] : ( () otherlv_1= 'daysInPast' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) ;
     public final EObject ruleTableDateDayLookup() throws RecognitionException {
         EObject current = null;
 
@@ -7881,14 +6927,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2758:2: ( ( () otherlv_1= 'daysInPast' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) )
-            // InternalTableDSL.g:2759:2: ( () otherlv_1= 'daysInPast' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
+            // InternalTableDSL.g:2394:2: ( ( () otherlv_1= 'daysInPast' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) ) )
+            // InternalTableDSL.g:2395:2: ( () otherlv_1= 'daysInPast' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
             {
-            // InternalTableDSL.g:2759:2: ( () otherlv_1= 'daysInPast' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
-            // InternalTableDSL.g:2760:3: () otherlv_1= 'daysInPast' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) )
+            // InternalTableDSL.g:2395:2: ( () otherlv_1= 'daysInPast' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) ) )
+            // InternalTableDSL.g:2396:3: () otherlv_1= 'daysInPast' ( (lv_lookupValue_2_0= ruleSignedInt ) ) ( (lv_discrete_3_0= ruleTableRangeElement ) )
             {
-            // InternalTableDSL.g:2760:3: ()
-            // InternalTableDSL.g:2761:4: 
+            // InternalTableDSL.g:2396:3: ()
+            // InternalTableDSL.g:2397:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -7900,17 +6946,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,58,FOLLOW_29); if (state.failed) return current;
+            otherlv_1=(Token)match(input,57,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getTableDateDayLookupAccess().getDaysInPastKeyword_1());
               		
             }
-            // InternalTableDSL.g:2771:3: ( (lv_lookupValue_2_0= ruleSignedInt ) )
-            // InternalTableDSL.g:2772:4: (lv_lookupValue_2_0= ruleSignedInt )
+            // InternalTableDSL.g:2407:3: ( (lv_lookupValue_2_0= ruleSignedInt ) )
+            // InternalTableDSL.g:2408:4: (lv_lookupValue_2_0= ruleSignedInt )
             {
-            // InternalTableDSL.g:2772:4: (lv_lookupValue_2_0= ruleSignedInt )
-            // InternalTableDSL.g:2773:5: lv_lookupValue_2_0= ruleSignedInt
+            // InternalTableDSL.g:2408:4: (lv_lookupValue_2_0= ruleSignedInt )
+            // InternalTableDSL.g:2409:5: lv_lookupValue_2_0= ruleSignedInt
             {
             if ( state.backtracking==0 ) {
 
@@ -7941,11 +6987,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:2790:3: ( (lv_discrete_3_0= ruleTableRangeElement ) )
-            // InternalTableDSL.g:2791:4: (lv_discrete_3_0= ruleTableRangeElement )
+            // InternalTableDSL.g:2426:3: ( (lv_discrete_3_0= ruleTableRangeElement ) )
+            // InternalTableDSL.g:2427:4: (lv_discrete_3_0= ruleTableRangeElement )
             {
-            // InternalTableDSL.g:2791:4: (lv_discrete_3_0= ruleTableRangeElement )
-            // InternalTableDSL.g:2792:5: lv_discrete_3_0= ruleTableRangeElement
+            // InternalTableDSL.g:2427:4: (lv_discrete_3_0= ruleTableRangeElement )
+            // InternalTableDSL.g:2428:5: lv_discrete_3_0= ruleTableRangeElement
             {
             if ( state.backtracking==0 ) {
 
@@ -8001,7 +7047,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableDatamart"
-    // InternalTableDSL.g:2813:1: entryRuleTableDatamart returns [EObject current=null] : iv_ruleTableDatamart= ruleTableDatamart EOF ;
+    // InternalTableDSL.g:2449:1: entryRuleTableDatamart returns [EObject current=null] : iv_ruleTableDatamart= ruleTableDatamart EOF ;
     public final EObject entryRuleTableDatamart() throws RecognitionException {
         EObject current = null;
 
@@ -8009,8 +7055,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2813:54: (iv_ruleTableDatamart= ruleTableDatamart EOF )
-            // InternalTableDSL.g:2814:2: iv_ruleTableDatamart= ruleTableDatamart EOF
+            // InternalTableDSL.g:2449:54: (iv_ruleTableDatamart= ruleTableDatamart EOF )
+            // InternalTableDSL.g:2450:2: iv_ruleTableDatamart= ruleTableDatamart EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableDatamartRule()); 
@@ -8041,7 +7087,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableDatamart"
-    // InternalTableDSL.g:2820:1: ruleTableDatamart returns [EObject current=null] : (otherlv_0= 'datamart' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_elements_3_0= ruleTableElement ) )* otherlv_4= '}' )? ) ;
+    // InternalTableDSL.g:2456:1: ruleTableDatamart returns [EObject current=null] : (otherlv_0= 'datamart' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_elements_3_0= ruleTableElement ) )* otherlv_4= '}' )? ) ;
     public final EObject ruleTableDatamart() throws RecognitionException {
         EObject current = null;
 
@@ -8056,23 +7102,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2826:2: ( (otherlv_0= 'datamart' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_elements_3_0= ruleTableElement ) )* otherlv_4= '}' )? ) )
-            // InternalTableDSL.g:2827:2: (otherlv_0= 'datamart' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_elements_3_0= ruleTableElement ) )* otherlv_4= '}' )? )
+            // InternalTableDSL.g:2462:2: ( (otherlv_0= 'datamart' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_elements_3_0= ruleTableElement ) )* otherlv_4= '}' )? ) )
+            // InternalTableDSL.g:2463:2: (otherlv_0= 'datamart' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_elements_3_0= ruleTableElement ) )* otherlv_4= '}' )? )
             {
-            // InternalTableDSL.g:2827:2: (otherlv_0= 'datamart' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_elements_3_0= ruleTableElement ) )* otherlv_4= '}' )? )
-            // InternalTableDSL.g:2828:3: otherlv_0= 'datamart' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_elements_3_0= ruleTableElement ) )* otherlv_4= '}' )?
+            // InternalTableDSL.g:2463:2: (otherlv_0= 'datamart' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_elements_3_0= ruleTableElement ) )* otherlv_4= '}' )? )
+            // InternalTableDSL.g:2464:3: otherlv_0= 'datamart' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_elements_3_0= ruleTableElement ) )* otherlv_4= '}' )?
             {
-            otherlv_0=(Token)match(input,62,FOLLOW_4); if (state.failed) return current;
+            otherlv_0=(Token)match(input,61,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getTableDatamartAccess().getDatamartKeyword_0());
               		
             }
-            // InternalTableDSL.g:2832:3: ( (otherlv_1= RULE_ID ) )
-            // InternalTableDSL.g:2833:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:2468:3: ( (otherlv_1= RULE_ID ) )
+            // InternalTableDSL.g:2469:4: (otherlv_1= RULE_ID )
             {
-            // InternalTableDSL.g:2833:4: (otherlv_1= RULE_ID )
-            // InternalTableDSL.g:2834:5: otherlv_1= RULE_ID
+            // InternalTableDSL.g:2469:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:2470:5: otherlv_1= RULE_ID
             {
             if ( state.backtracking==0 ) {
 
@@ -8093,16 +7139,16 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:2845:3: (otherlv_2= '{' ( (lv_elements_3_0= ruleTableElement ) )* otherlv_4= '}' )?
-            int alt26=2;
-            int LA26_0 = input.LA(1);
+            // InternalTableDSL.g:2481:3: (otherlv_2= '{' ( (lv_elements_3_0= ruleTableElement ) )* otherlv_4= '}' )?
+            int alt24=2;
+            int LA24_0 = input.LA(1);
 
-            if ( (LA26_0==16) ) {
-                alt26=1;
+            if ( (LA24_0==16) ) {
+                alt24=1;
             }
-            switch (alt26) {
+            switch (alt24) {
                 case 1 :
-                    // InternalTableDSL.g:2846:4: otherlv_2= '{' ( (lv_elements_3_0= ruleTableElement ) )* otherlv_4= '}'
+                    // InternalTableDSL.g:2482:4: otherlv_2= '{' ( (lv_elements_3_0= ruleTableElement ) )* otherlv_4= '}'
                     {
                     otherlv_2=(Token)match(input,16,FOLLOW_30); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
@@ -8110,23 +7156,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       				newLeafNode(otherlv_2, grammarAccess.getTableDatamartAccess().getLeftCurlyBracketKeyword_2_0());
                       			
                     }
-                    // InternalTableDSL.g:2850:4: ( (lv_elements_3_0= ruleTableElement ) )*
-                    loop25:
+                    // InternalTableDSL.g:2486:4: ( (lv_elements_3_0= ruleTableElement ) )*
+                    loop23:
                     do {
-                        int alt25=2;
-                        int LA25_0 = input.LA(1);
+                        int alt23=2;
+                        int LA23_0 = input.LA(1);
 
-                        if ( (LA25_0==63) ) {
-                            alt25=1;
+                        if ( (LA23_0==62) ) {
+                            alt23=1;
                         }
 
 
-                        switch (alt25) {
+                        switch (alt23) {
                     	case 1 :
-                    	    // InternalTableDSL.g:2851:5: (lv_elements_3_0= ruleTableElement )
+                    	    // InternalTableDSL.g:2487:5: (lv_elements_3_0= ruleTableElement )
                     	    {
-                    	    // InternalTableDSL.g:2851:5: (lv_elements_3_0= ruleTableElement )
-                    	    // InternalTableDSL.g:2852:6: lv_elements_3_0= ruleTableElement
+                    	    // InternalTableDSL.g:2487:5: (lv_elements_3_0= ruleTableElement )
+                    	    // InternalTableDSL.g:2488:6: lv_elements_3_0= ruleTableElement
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -8159,7 +7205,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop25;
+                    	    break loop23;
                         }
                     } while (true);
 
@@ -8200,7 +7246,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableElement"
-    // InternalTableDSL.g:2878:1: entryRuleTableElement returns [EObject current=null] : iv_ruleTableElement= ruleTableElement EOF ;
+    // InternalTableDSL.g:2514:1: entryRuleTableElement returns [EObject current=null] : iv_ruleTableElement= ruleTableElement EOF ;
     public final EObject entryRuleTableElement() throws RecognitionException {
         EObject current = null;
 
@@ -8208,8 +7254,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2878:53: (iv_ruleTableElement= ruleTableElement EOF )
-            // InternalTableDSL.g:2879:2: iv_ruleTableElement= ruleTableElement EOF
+            // InternalTableDSL.g:2514:53: (iv_ruleTableElement= ruleTableElement EOF )
+            // InternalTableDSL.g:2515:2: iv_ruleTableElement= ruleTableElement EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableElementRule()); 
@@ -8240,7 +7286,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableElement"
-    // InternalTableDSL.g:2885:1: ruleTableElement returns [EObject current=null] : this_TableAxis_0= ruleTableAxis ;
+    // InternalTableDSL.g:2521:1: ruleTableElement returns [EObject current=null] : this_TableAxis_0= ruleTableAxis ;
     public final EObject ruleTableElement() throws RecognitionException {
         EObject current = null;
 
@@ -8251,8 +7297,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2891:2: (this_TableAxis_0= ruleTableAxis )
-            // InternalTableDSL.g:2892:2: this_TableAxis_0= ruleTableAxis
+            // InternalTableDSL.g:2527:2: (this_TableAxis_0= ruleTableAxis )
+            // InternalTableDSL.g:2528:2: this_TableAxis_0= ruleTableAxis
             {
             if ( state.backtracking==0 ) {
 
@@ -8292,7 +7338,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableEvent"
-    // InternalTableDSL.g:2903:1: entryRuleTableEvent returns [EObject current=null] : iv_ruleTableEvent= ruleTableEvent EOF ;
+    // InternalTableDSL.g:2539:1: entryRuleTableEvent returns [EObject current=null] : iv_ruleTableEvent= ruleTableEvent EOF ;
     public final EObject entryRuleTableEvent() throws RecognitionException {
         EObject current = null;
 
@@ -8300,8 +7346,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2903:51: (iv_ruleTableEvent= ruleTableEvent EOF )
-            // InternalTableDSL.g:2904:2: iv_ruleTableEvent= ruleTableEvent EOF
+            // InternalTableDSL.g:2539:51: (iv_ruleTableEvent= ruleTableEvent EOF )
+            // InternalTableDSL.g:2540:2: iv_ruleTableEvent= ruleTableEvent EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableEventRule()); 
@@ -8332,7 +7378,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableEvent"
-    // InternalTableDSL.g:2910:1: ruleTableEvent returns [EObject current=null] : ( (lv_source_0_0= ruleTableValueElement ) ) ;
+    // InternalTableDSL.g:2546:1: ruleTableEvent returns [EObject current=null] : ( (lv_source_0_0= ruleTableValueElement ) ) ;
     public final EObject ruleTableEvent() throws RecognitionException {
         EObject current = null;
 
@@ -8343,14 +7389,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2916:2: ( ( (lv_source_0_0= ruleTableValueElement ) ) )
-            // InternalTableDSL.g:2917:2: ( (lv_source_0_0= ruleTableValueElement ) )
+            // InternalTableDSL.g:2552:2: ( ( (lv_source_0_0= ruleTableValueElement ) ) )
+            // InternalTableDSL.g:2553:2: ( (lv_source_0_0= ruleTableValueElement ) )
             {
-            // InternalTableDSL.g:2917:2: ( (lv_source_0_0= ruleTableValueElement ) )
-            // InternalTableDSL.g:2918:3: (lv_source_0_0= ruleTableValueElement )
+            // InternalTableDSL.g:2553:2: ( (lv_source_0_0= ruleTableValueElement ) )
+            // InternalTableDSL.g:2554:3: (lv_source_0_0= ruleTableValueElement )
             {
-            // InternalTableDSL.g:2918:3: (lv_source_0_0= ruleTableValueElement )
-            // InternalTableDSL.g:2919:4: lv_source_0_0= ruleTableValueElement
+            // InternalTableDSL.g:2554:3: (lv_source_0_0= ruleTableValueElement )
+            // InternalTableDSL.g:2555:4: lv_source_0_0= ruleTableValueElement
             {
             if ( state.backtracking==0 ) {
 
@@ -8403,7 +7449,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableAxis"
-    // InternalTableDSL.g:2939:1: entryRuleTableAxis returns [EObject current=null] : iv_ruleTableAxis= ruleTableAxis EOF ;
+    // InternalTableDSL.g:2575:1: entryRuleTableAxis returns [EObject current=null] : iv_ruleTableAxis= ruleTableAxis EOF ;
     public final EObject entryRuleTableAxis() throws RecognitionException {
         EObject current = null;
 
@@ -8411,8 +7457,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:2939:50: (iv_ruleTableAxis= ruleTableAxis EOF )
-            // InternalTableDSL.g:2940:2: iv_ruleTableAxis= ruleTableAxis EOF
+            // InternalTableDSL.g:2575:50: (iv_ruleTableAxis= ruleTableAxis EOF )
+            // InternalTableDSL.g:2576:2: iv_ruleTableAxis= ruleTableAxis EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableAxisRule()); 
@@ -8443,7 +7489,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableAxis"
-    // InternalTableDSL.g:2946:1: ruleTableAxis returns [EObject current=null] : (otherlv_0= 'axis' ( (lv_axis_1_0= ruleAxisEnum ) ) ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) ) ) ( ( (lv_hasDetails_6_0= 'details' ) ) otherlv_7= '{' ( (lv_values_8_0= ruleTableValue ) )* otherlv_9= '}' )? ( ( (lv_hasEvents_10_0= 'notifyOnSelect' ) ) otherlv_11= '{' ( (lv_events_12_0= ruleTableEvent ) )* otherlv_13= '}' )? ) ;
+    // InternalTableDSL.g:2582:1: ruleTableAxis returns [EObject current=null] : (otherlv_0= 'axis' ( (lv_axis_1_0= ruleAxisEnum ) ) ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) ) ) ( ( (lv_hasDetails_6_0= 'details' ) ) otherlv_7= '{' ( (lv_values_8_0= ruleTableValue ) )* otherlv_9= '}' )? ( ( (lv_hasEvents_10_0= 'notifyOnSelect' ) ) otherlv_11= '{' ( (lv_events_12_0= ruleTableEvent ) )* otherlv_13= '}' )? ) ;
     public final EObject ruleTableAxis() throws RecognitionException {
         EObject current = null;
 
@@ -8470,23 +7516,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:2952:2: ( (otherlv_0= 'axis' ( (lv_axis_1_0= ruleAxisEnum ) ) ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) ) ) ( ( (lv_hasDetails_6_0= 'details' ) ) otherlv_7= '{' ( (lv_values_8_0= ruleTableValue ) )* otherlv_9= '}' )? ( ( (lv_hasEvents_10_0= 'notifyOnSelect' ) ) otherlv_11= '{' ( (lv_events_12_0= ruleTableEvent ) )* otherlv_13= '}' )? ) )
-            // InternalTableDSL.g:2953:2: (otherlv_0= 'axis' ( (lv_axis_1_0= ruleAxisEnum ) ) ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) ) ) ( ( (lv_hasDetails_6_0= 'details' ) ) otherlv_7= '{' ( (lv_values_8_0= ruleTableValue ) )* otherlv_9= '}' )? ( ( (lv_hasEvents_10_0= 'notifyOnSelect' ) ) otherlv_11= '{' ( (lv_events_12_0= ruleTableEvent ) )* otherlv_13= '}' )? )
+            // InternalTableDSL.g:2588:2: ( (otherlv_0= 'axis' ( (lv_axis_1_0= ruleAxisEnum ) ) ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) ) ) ( ( (lv_hasDetails_6_0= 'details' ) ) otherlv_7= '{' ( (lv_values_8_0= ruleTableValue ) )* otherlv_9= '}' )? ( ( (lv_hasEvents_10_0= 'notifyOnSelect' ) ) otherlv_11= '{' ( (lv_events_12_0= ruleTableEvent ) )* otherlv_13= '}' )? ) )
+            // InternalTableDSL.g:2589:2: (otherlv_0= 'axis' ( (lv_axis_1_0= ruleAxisEnum ) ) ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) ) ) ( ( (lv_hasDetails_6_0= 'details' ) ) otherlv_7= '{' ( (lv_values_8_0= ruleTableValue ) )* otherlv_9= '}' )? ( ( (lv_hasEvents_10_0= 'notifyOnSelect' ) ) otherlv_11= '{' ( (lv_events_12_0= ruleTableEvent ) )* otherlv_13= '}' )? )
             {
-            // InternalTableDSL.g:2953:2: (otherlv_0= 'axis' ( (lv_axis_1_0= ruleAxisEnum ) ) ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) ) ) ( ( (lv_hasDetails_6_0= 'details' ) ) otherlv_7= '{' ( (lv_values_8_0= ruleTableValue ) )* otherlv_9= '}' )? ( ( (lv_hasEvents_10_0= 'notifyOnSelect' ) ) otherlv_11= '{' ( (lv_events_12_0= ruleTableEvent ) )* otherlv_13= '}' )? )
-            // InternalTableDSL.g:2954:3: otherlv_0= 'axis' ( (lv_axis_1_0= ruleAxisEnum ) ) ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) ) ) ( ( (lv_hasDetails_6_0= 'details' ) ) otherlv_7= '{' ( (lv_values_8_0= ruleTableValue ) )* otherlv_9= '}' )? ( ( (lv_hasEvents_10_0= 'notifyOnSelect' ) ) otherlv_11= '{' ( (lv_events_12_0= ruleTableEvent ) )* otherlv_13= '}' )?
+            // InternalTableDSL.g:2589:2: (otherlv_0= 'axis' ( (lv_axis_1_0= ruleAxisEnum ) ) ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) ) ) ( ( (lv_hasDetails_6_0= 'details' ) ) otherlv_7= '{' ( (lv_values_8_0= ruleTableValue ) )* otherlv_9= '}' )? ( ( (lv_hasEvents_10_0= 'notifyOnSelect' ) ) otherlv_11= '{' ( (lv_events_12_0= ruleTableEvent ) )* otherlv_13= '}' )? )
+            // InternalTableDSL.g:2590:3: otherlv_0= 'axis' ( (lv_axis_1_0= ruleAxisEnum ) ) ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) ) ) ( ( (lv_hasDetails_6_0= 'details' ) ) otherlv_7= '{' ( (lv_values_8_0= ruleTableValue ) )* otherlv_9= '}' )? ( ( (lv_hasEvents_10_0= 'notifyOnSelect' ) ) otherlv_11= '{' ( (lv_events_12_0= ruleTableEvent ) )* otherlv_13= '}' )?
             {
-            otherlv_0=(Token)match(input,63,FOLLOW_31); if (state.failed) return current;
+            otherlv_0=(Token)match(input,62,FOLLOW_31); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getTableAxisAccess().getAxisKeyword_0());
               		
             }
-            // InternalTableDSL.g:2958:3: ( (lv_axis_1_0= ruleAxisEnum ) )
-            // InternalTableDSL.g:2959:4: (lv_axis_1_0= ruleAxisEnum )
+            // InternalTableDSL.g:2594:3: ( (lv_axis_1_0= ruleAxisEnum ) )
+            // InternalTableDSL.g:2595:4: (lv_axis_1_0= ruleAxisEnum )
             {
-            // InternalTableDSL.g:2959:4: (lv_axis_1_0= ruleAxisEnum )
-            // InternalTableDSL.g:2960:5: lv_axis_1_0= ruleAxisEnum
+            // InternalTableDSL.g:2595:4: (lv_axis_1_0= ruleAxisEnum )
+            // InternalTableDSL.g:2596:5: lv_axis_1_0= ruleAxisEnum
             {
             if ( state.backtracking==0 ) {
 
@@ -8517,62 +7563,62 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:2977:3: ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) ) )
-            // InternalTableDSL.g:2978:4: ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) )
+            // InternalTableDSL.g:2613:3: ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) ) )
+            // InternalTableDSL.g:2614:4: ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) )
             {
-            // InternalTableDSL.g:2978:4: ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) )
-            // InternalTableDSL.g:2979:5: ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* )
+            // InternalTableDSL.g:2614:4: ( ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* ) )
+            // InternalTableDSL.g:2615:5: ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* )
             {
             getUnorderedGroupHelper().enter(grammarAccess.getTableAxisAccess().getUnorderedGroup_2());
-            // InternalTableDSL.g:2982:5: ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* )
-            // InternalTableDSL.g:2983:6: ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )*
+            // InternalTableDSL.g:2618:5: ( ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )* )
+            // InternalTableDSL.g:2619:6: ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )*
             {
-            // InternalTableDSL.g:2983:6: ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )*
-            loop27:
+            // InternalTableDSL.g:2619:6: ( ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) ) )*
+            loop25:
             do {
-                int alt27=3;
-                int LA27_0 = input.LA(1);
+                int alt25=3;
+                int LA25_0 = input.LA(1);
 
-                if ( LA27_0 == 64 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0) ) {
-                    alt27=1;
+                if ( LA25_0 == 63 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0) ) {
+                    alt25=1;
                 }
-                else if ( LA27_0 == 33 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 1) ) {
-                    alt27=2;
+                else if ( LA25_0 == 32 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 1) ) {
+                    alt25=2;
                 }
 
 
-                switch (alt27) {
+                switch (alt25) {
             	case 1 :
-            	    // InternalTableDSL.g:2984:4: ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) )
+            	    // InternalTableDSL.g:2620:4: ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:2984:4: ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) )
-            	    // InternalTableDSL.g:2985:5: {...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) )
+            	    // InternalTableDSL.g:2620:4: ({...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) ) )
+            	    // InternalTableDSL.g:2621:5: {...}? => ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableAxis", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0)");
             	    }
-            	    // InternalTableDSL.g:2985:106: ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) )
-            	    // InternalTableDSL.g:2986:6: ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) )
+            	    // InternalTableDSL.g:2621:106: ( ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) ) )
+            	    // InternalTableDSL.g:2622:6: ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 0);
-            	    // InternalTableDSL.g:2989:9: ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) )
-            	    // InternalTableDSL.g:2989:10: {...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) )
+            	    // InternalTableDSL.g:2625:9: ({...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) ) )
+            	    // InternalTableDSL.g:2625:10: {...}? => ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableAxis", "true");
             	    }
-            	    // InternalTableDSL.g:2989:19: ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) )
-            	    // InternalTableDSL.g:2989:20: ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) )
+            	    // InternalTableDSL.g:2625:19: ( ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) ) )
+            	    // InternalTableDSL.g:2625:20: ( (lv_hasRowHeight_3_0= 'rowheight' ) ) ( (lv_rowHeight_4_0= ruleNumber ) )
             	    {
-            	    // InternalTableDSL.g:2989:20: ( (lv_hasRowHeight_3_0= 'rowheight' ) )
-            	    // InternalTableDSL.g:2990:10: (lv_hasRowHeight_3_0= 'rowheight' )
+            	    // InternalTableDSL.g:2625:20: ( (lv_hasRowHeight_3_0= 'rowheight' ) )
+            	    // InternalTableDSL.g:2626:10: (lv_hasRowHeight_3_0= 'rowheight' )
             	    {
-            	    // InternalTableDSL.g:2990:10: (lv_hasRowHeight_3_0= 'rowheight' )
-            	    // InternalTableDSL.g:2991:11: lv_hasRowHeight_3_0= 'rowheight'
+            	    // InternalTableDSL.g:2626:10: (lv_hasRowHeight_3_0= 'rowheight' )
+            	    // InternalTableDSL.g:2627:11: lv_hasRowHeight_3_0= 'rowheight'
             	    {
-            	    lv_hasRowHeight_3_0=(Token)match(input,64,FOLLOW_14); if (state.failed) return current;
+            	    lv_hasRowHeight_3_0=(Token)match(input,63,FOLLOW_26); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      											newLeafNode(lv_hasRowHeight_3_0, grammarAccess.getTableAxisAccess().getHasRowHeightRowheightKeyword_2_0_0_0());
@@ -8592,11 +7638,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:3003:9: ( (lv_rowHeight_4_0= ruleNumber ) )
-            	    // InternalTableDSL.g:3004:10: (lv_rowHeight_4_0= ruleNumber )
+            	    // InternalTableDSL.g:2639:9: ( (lv_rowHeight_4_0= ruleNumber ) )
+            	    // InternalTableDSL.g:2640:10: (lv_rowHeight_4_0= ruleNumber )
             	    {
-            	    // InternalTableDSL.g:3004:10: (lv_rowHeight_4_0= ruleNumber )
-            	    // InternalTableDSL.g:3005:11: lv_rowHeight_4_0= ruleNumber
+            	    // InternalTableDSL.g:2640:10: (lv_rowHeight_4_0= ruleNumber )
+            	    // InternalTableDSL.g:2641:11: lv_rowHeight_4_0= ruleNumber
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8644,31 +7690,31 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // InternalTableDSL.g:3028:4: ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) )
+            	    // InternalTableDSL.g:2664:4: ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) )
             	    {
-            	    // InternalTableDSL.g:3028:4: ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) )
-            	    // InternalTableDSL.g:3029:5: {...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) )
+            	    // InternalTableDSL.g:2664:4: ({...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) ) )
+            	    // InternalTableDSL.g:2665:5: {...}? => ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 1) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableAxis", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 1)");
             	    }
-            	    // InternalTableDSL.g:3029:106: ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) )
-            	    // InternalTableDSL.g:3030:6: ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) )
+            	    // InternalTableDSL.g:2665:106: ( ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) ) )
+            	    // InternalTableDSL.g:2666:6: ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) )
             	    {
             	    getUnorderedGroupHelper().select(grammarAccess.getTableAxisAccess().getUnorderedGroup_2(), 1);
-            	    // InternalTableDSL.g:3033:9: ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) )
-            	    // InternalTableDSL.g:3033:10: {...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) )
+            	    // InternalTableDSL.g:2669:9: ({...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) ) )
+            	    // InternalTableDSL.g:2669:10: {...}? => ( (lv_preOrder_5_0= ruleTablePreorder ) )
             	    {
             	    if ( !((true)) ) {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        throw new FailedPredicateException(input, "ruleTableAxis", "true");
             	    }
-            	    // InternalTableDSL.g:3033:19: ( (lv_preOrder_5_0= ruleTablePreorder ) )
-            	    // InternalTableDSL.g:3033:20: (lv_preOrder_5_0= ruleTablePreorder )
+            	    // InternalTableDSL.g:2669:19: ( (lv_preOrder_5_0= ruleTablePreorder ) )
+            	    // InternalTableDSL.g:2669:20: (lv_preOrder_5_0= ruleTablePreorder )
             	    {
-            	    // InternalTableDSL.g:3033:20: (lv_preOrder_5_0= ruleTablePreorder )
-            	    // InternalTableDSL.g:3034:10: lv_preOrder_5_0= ruleTablePreorder
+            	    // InternalTableDSL.g:2669:20: (lv_preOrder_5_0= ruleTablePreorder )
+            	    // InternalTableDSL.g:2670:10: lv_preOrder_5_0= ruleTablePreorder
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8714,7 +7760,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop27;
+            	    break loop25;
                 }
             } while (true);
 
@@ -8728,24 +7774,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:3063:3: ( ( (lv_hasDetails_6_0= 'details' ) ) otherlv_7= '{' ( (lv_values_8_0= ruleTableValue ) )* otherlv_9= '}' )?
-            int alt29=2;
-            int LA29_0 = input.LA(1);
+            // InternalTableDSL.g:2699:3: ( ( (lv_hasDetails_6_0= 'details' ) ) otherlv_7= '{' ( (lv_values_8_0= ruleTableValue ) )* otherlv_9= '}' )?
+            int alt27=2;
+            int LA27_0 = input.LA(1);
 
-            if ( (LA29_0==65) ) {
-                alt29=1;
+            if ( (LA27_0==64) ) {
+                alt27=1;
             }
-            switch (alt29) {
+            switch (alt27) {
                 case 1 :
-                    // InternalTableDSL.g:3064:4: ( (lv_hasDetails_6_0= 'details' ) ) otherlv_7= '{' ( (lv_values_8_0= ruleTableValue ) )* otherlv_9= '}'
+                    // InternalTableDSL.g:2700:4: ( (lv_hasDetails_6_0= 'details' ) ) otherlv_7= '{' ( (lv_values_8_0= ruleTableValue ) )* otherlv_9= '}'
                     {
-                    // InternalTableDSL.g:3064:4: ( (lv_hasDetails_6_0= 'details' ) )
-                    // InternalTableDSL.g:3065:5: (lv_hasDetails_6_0= 'details' )
+                    // InternalTableDSL.g:2700:4: ( (lv_hasDetails_6_0= 'details' ) )
+                    // InternalTableDSL.g:2701:5: (lv_hasDetails_6_0= 'details' )
                     {
-                    // InternalTableDSL.g:3065:5: (lv_hasDetails_6_0= 'details' )
-                    // InternalTableDSL.g:3066:6: lv_hasDetails_6_0= 'details'
+                    // InternalTableDSL.g:2701:5: (lv_hasDetails_6_0= 'details' )
+                    // InternalTableDSL.g:2702:6: lv_hasDetails_6_0= 'details'
                     {
-                    lv_hasDetails_6_0=(Token)match(input,65,FOLLOW_22); if (state.failed) return current;
+                    lv_hasDetails_6_0=(Token)match(input,64,FOLLOW_21); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(lv_hasDetails_6_0, grammarAccess.getTableAxisAccess().getHasDetailsDetailsKeyword_3_0_0());
@@ -8771,23 +7817,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       				newLeafNode(otherlv_7, grammarAccess.getTableAxisAccess().getLeftCurlyBracketKeyword_3_1());
                       			
                     }
-                    // InternalTableDSL.g:3082:4: ( (lv_values_8_0= ruleTableValue ) )*
-                    loop28:
+                    // InternalTableDSL.g:2718:4: ( (lv_values_8_0= ruleTableValue ) )*
+                    loop26:
                     do {
-                        int alt28=2;
-                        int LA28_0 = input.LA(1);
+                        int alt26=2;
+                        int LA26_0 = input.LA(1);
 
-                        if ( (LA28_0==35) ) {
-                            alt28=1;
+                        if ( (LA26_0==34) ) {
+                            alt26=1;
                         }
 
 
-                        switch (alt28) {
+                        switch (alt26) {
                     	case 1 :
-                    	    // InternalTableDSL.g:3083:5: (lv_values_8_0= ruleTableValue )
+                    	    // InternalTableDSL.g:2719:5: (lv_values_8_0= ruleTableValue )
                     	    {
-                    	    // InternalTableDSL.g:3083:5: (lv_values_8_0= ruleTableValue )
-                    	    // InternalTableDSL.g:3084:6: lv_values_8_0= ruleTableValue
+                    	    // InternalTableDSL.g:2719:5: (lv_values_8_0= ruleTableValue )
+                    	    // InternalTableDSL.g:2720:6: lv_values_8_0= ruleTableValue
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -8820,7 +7866,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop28;
+                    	    break loop26;
                         }
                     } while (true);
 
@@ -8836,24 +7882,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:3106:3: ( ( (lv_hasEvents_10_0= 'notifyOnSelect' ) ) otherlv_11= '{' ( (lv_events_12_0= ruleTableEvent ) )* otherlv_13= '}' )?
-            int alt31=2;
-            int LA31_0 = input.LA(1);
+            // InternalTableDSL.g:2742:3: ( ( (lv_hasEvents_10_0= 'notifyOnSelect' ) ) otherlv_11= '{' ( (lv_events_12_0= ruleTableEvent ) )* otherlv_13= '}' )?
+            int alt29=2;
+            int LA29_0 = input.LA(1);
 
-            if ( (LA31_0==66) ) {
-                alt31=1;
+            if ( (LA29_0==65) ) {
+                alt29=1;
             }
-            switch (alt31) {
+            switch (alt29) {
                 case 1 :
-                    // InternalTableDSL.g:3107:4: ( (lv_hasEvents_10_0= 'notifyOnSelect' ) ) otherlv_11= '{' ( (lv_events_12_0= ruleTableEvent ) )* otherlv_13= '}'
+                    // InternalTableDSL.g:2743:4: ( (lv_hasEvents_10_0= 'notifyOnSelect' ) ) otherlv_11= '{' ( (lv_events_12_0= ruleTableEvent ) )* otherlv_13= '}'
                     {
-                    // InternalTableDSL.g:3107:4: ( (lv_hasEvents_10_0= 'notifyOnSelect' ) )
-                    // InternalTableDSL.g:3108:5: (lv_hasEvents_10_0= 'notifyOnSelect' )
+                    // InternalTableDSL.g:2743:4: ( (lv_hasEvents_10_0= 'notifyOnSelect' ) )
+                    // InternalTableDSL.g:2744:5: (lv_hasEvents_10_0= 'notifyOnSelect' )
                     {
-                    // InternalTableDSL.g:3108:5: (lv_hasEvents_10_0= 'notifyOnSelect' )
-                    // InternalTableDSL.g:3109:6: lv_hasEvents_10_0= 'notifyOnSelect'
+                    // InternalTableDSL.g:2744:5: (lv_hasEvents_10_0= 'notifyOnSelect' )
+                    // InternalTableDSL.g:2745:6: lv_hasEvents_10_0= 'notifyOnSelect'
                     {
-                    lv_hasEvents_10_0=(Token)match(input,66,FOLLOW_22); if (state.failed) return current;
+                    lv_hasEvents_10_0=(Token)match(input,65,FOLLOW_21); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(lv_hasEvents_10_0, grammarAccess.getTableAxisAccess().getHasEventsNotifyOnSelectKeyword_4_0_0());
@@ -8879,23 +7925,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       				newLeafNode(otherlv_11, grammarAccess.getTableAxisAccess().getLeftCurlyBracketKeyword_4_1());
                       			
                     }
-                    // InternalTableDSL.g:3125:4: ( (lv_events_12_0= ruleTableEvent ) )*
-                    loop30:
+                    // InternalTableDSL.g:2761:4: ( (lv_events_12_0= ruleTableEvent ) )*
+                    loop28:
                     do {
-                        int alt30=2;
-                        int LA30_0 = input.LA(1);
+                        int alt28=2;
+                        int LA28_0 = input.LA(1);
 
-                        if ( ((LA30_0>=47 && LA30_0<=55)) ) {
-                            alt30=1;
+                        if ( ((LA28_0>=46 && LA28_0<=54)) ) {
+                            alt28=1;
                         }
 
 
-                        switch (alt30) {
+                        switch (alt28) {
                     	case 1 :
-                    	    // InternalTableDSL.g:3126:5: (lv_events_12_0= ruleTableEvent )
+                    	    // InternalTableDSL.g:2762:5: (lv_events_12_0= ruleTableEvent )
                     	    {
-                    	    // InternalTableDSL.g:3126:5: (lv_events_12_0= ruleTableEvent )
-                    	    // InternalTableDSL.g:3127:6: lv_events_12_0= ruleTableEvent
+                    	    // InternalTableDSL.g:2762:5: (lv_events_12_0= ruleTableEvent )
+                    	    // InternalTableDSL.g:2763:6: lv_events_12_0= ruleTableEvent
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -8928,7 +7974,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop30;
+                    	    break loop28;
                         }
                     } while (true);
 
@@ -8969,7 +8015,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableRangeElement"
-    // InternalTableDSL.g:3153:1: entryRuleTableRangeElement returns [EObject current=null] : iv_ruleTableRangeElement= ruleTableRangeElement EOF ;
+    // InternalTableDSL.g:2789:1: entryRuleTableRangeElement returns [EObject current=null] : iv_ruleTableRangeElement= ruleTableRangeElement EOF ;
     public final EObject entryRuleTableRangeElement() throws RecognitionException {
         EObject current = null;
 
@@ -8977,8 +8023,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:3153:58: (iv_ruleTableRangeElement= ruleTableRangeElement EOF )
-            // InternalTableDSL.g:3154:2: iv_ruleTableRangeElement= ruleTableRangeElement EOF
+            // InternalTableDSL.g:2789:58: (iv_ruleTableRangeElement= ruleTableRangeElement EOF )
+            // InternalTableDSL.g:2790:2: iv_ruleTableRangeElement= ruleTableRangeElement EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableRangeElementRule()); 
@@ -9009,7 +8055,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableRangeElement"
-    // InternalTableDSL.g:3160:1: ruleTableRangeElement returns [EObject current=null] : (this_TableTextColor_0= ruleTableTextColor | this_TableCellColor_1= ruleTableCellColor | this_TableIcon_2= ruleTableIcon | this_TableTrend_3= ruleTableTrend | this_TableTooltip_4= ruleTableTooltip ) ;
+    // InternalTableDSL.g:2796:1: ruleTableRangeElement returns [EObject current=null] : (this_TableTextColor_0= ruleTableTextColor | this_TableCellColor_1= ruleTableCellColor | this_TableIcon_2= ruleTableIcon | this_TableTrend_3= ruleTableTrend | this_TableTooltip_4= ruleTableTooltip ) ;
     public final EObject ruleTableRangeElement() throws RecognitionException {
         EObject current = null;
 
@@ -9028,48 +8074,48 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:3166:2: ( (this_TableTextColor_0= ruleTableTextColor | this_TableCellColor_1= ruleTableCellColor | this_TableIcon_2= ruleTableIcon | this_TableTrend_3= ruleTableTrend | this_TableTooltip_4= ruleTableTooltip ) )
-            // InternalTableDSL.g:3167:2: (this_TableTextColor_0= ruleTableTextColor | this_TableCellColor_1= ruleTableCellColor | this_TableIcon_2= ruleTableIcon | this_TableTrend_3= ruleTableTrend | this_TableTooltip_4= ruleTableTooltip )
+            // InternalTableDSL.g:2802:2: ( (this_TableTextColor_0= ruleTableTextColor | this_TableCellColor_1= ruleTableCellColor | this_TableIcon_2= ruleTableIcon | this_TableTrend_3= ruleTableTrend | this_TableTooltip_4= ruleTableTooltip ) )
+            // InternalTableDSL.g:2803:2: (this_TableTextColor_0= ruleTableTextColor | this_TableCellColor_1= ruleTableCellColor | this_TableIcon_2= ruleTableIcon | this_TableTrend_3= ruleTableTrend | this_TableTooltip_4= ruleTableTooltip )
             {
-            // InternalTableDSL.g:3167:2: (this_TableTextColor_0= ruleTableTextColor | this_TableCellColor_1= ruleTableCellColor | this_TableIcon_2= ruleTableIcon | this_TableTrend_3= ruleTableTrend | this_TableTooltip_4= ruleTableTooltip )
-            int alt32=5;
+            // InternalTableDSL.g:2803:2: (this_TableTextColor_0= ruleTableTextColor | this_TableCellColor_1= ruleTableCellColor | this_TableIcon_2= ruleTableIcon | this_TableTrend_3= ruleTableTrend | this_TableTooltip_4= ruleTableTooltip )
+            int alt30=5;
             switch ( input.LA(1) ) {
-            case 67:
+            case 66:
                 {
-                alt32=1;
+                alt30=1;
                 }
                 break;
-            case 68:
+            case 67:
                 {
-                alt32=2;
+                alt30=2;
                 }
                 break;
-            case 37:
+            case 36:
                 {
-                alt32=3;
+                alt30=3;
                 }
                 break;
-            case 69:
+            case 68:
                 {
-                alt32=4;
+                alt30=4;
                 }
                 break;
-            case 70:
+            case 69:
                 {
-                alt32=5;
+                alt30=5;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 32, 0, input);
+                    new NoViableAltException("", 30, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt32) {
+            switch (alt30) {
                 case 1 :
-                    // InternalTableDSL.g:3168:3: this_TableTextColor_0= ruleTableTextColor
+                    // InternalTableDSL.g:2804:3: this_TableTextColor_0= ruleTableTextColor
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9091,7 +8137,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:3177:3: this_TableCellColor_1= ruleTableCellColor
+                    // InternalTableDSL.g:2813:3: this_TableCellColor_1= ruleTableCellColor
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9113,7 +8159,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:3186:3: this_TableIcon_2= ruleTableIcon
+                    // InternalTableDSL.g:2822:3: this_TableIcon_2= ruleTableIcon
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9135,7 +8181,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:3195:3: this_TableTrend_3= ruleTableTrend
+                    // InternalTableDSL.g:2831:3: this_TableTrend_3= ruleTableTrend
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9157,7 +8203,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:3204:3: this_TableTooltip_4= ruleTableTooltip
+                    // InternalTableDSL.g:2840:3: this_TableTooltip_4= ruleTableTooltip
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9203,7 +8249,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableTextColor"
-    // InternalTableDSL.g:3216:1: entryRuleTableTextColor returns [EObject current=null] : iv_ruleTableTextColor= ruleTableTextColor EOF ;
+    // InternalTableDSL.g:2852:1: entryRuleTableTextColor returns [EObject current=null] : iv_ruleTableTextColor= ruleTableTextColor EOF ;
     public final EObject entryRuleTableTextColor() throws RecognitionException {
         EObject current = null;
 
@@ -9211,8 +8257,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:3216:55: (iv_ruleTableTextColor= ruleTableTextColor EOF )
-            // InternalTableDSL.g:3217:2: iv_ruleTableTextColor= ruleTableTextColor EOF
+            // InternalTableDSL.g:2852:55: (iv_ruleTableTextColor= ruleTableTextColor EOF )
+            // InternalTableDSL.g:2853:2: iv_ruleTableTextColor= ruleTableTextColor EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableTextColorRule()); 
@@ -9243,7 +8289,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableTextColor"
-    // InternalTableDSL.g:3223:1: ruleTableTextColor returns [EObject current=null] : (otherlv_0= 'textcolor' ( (lv_rgb_1_0= RULE_STRING ) ) ) ;
+    // InternalTableDSL.g:2859:1: ruleTableTextColor returns [EObject current=null] : (otherlv_0= 'textcolor' ( (lv_rgb_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleTableTextColor() throws RecognitionException {
         EObject current = null;
 
@@ -9254,23 +8300,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:3229:2: ( (otherlv_0= 'textcolor' ( (lv_rgb_1_0= RULE_STRING ) ) ) )
-            // InternalTableDSL.g:3230:2: (otherlv_0= 'textcolor' ( (lv_rgb_1_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:2865:2: ( (otherlv_0= 'textcolor' ( (lv_rgb_1_0= RULE_STRING ) ) ) )
+            // InternalTableDSL.g:2866:2: (otherlv_0= 'textcolor' ( (lv_rgb_1_0= RULE_STRING ) ) )
             {
-            // InternalTableDSL.g:3230:2: (otherlv_0= 'textcolor' ( (lv_rgb_1_0= RULE_STRING ) ) )
-            // InternalTableDSL.g:3231:3: otherlv_0= 'textcolor' ( (lv_rgb_1_0= RULE_STRING ) )
+            // InternalTableDSL.g:2866:2: (otherlv_0= 'textcolor' ( (lv_rgb_1_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:2867:3: otherlv_0= 'textcolor' ( (lv_rgb_1_0= RULE_STRING ) )
             {
-            otherlv_0=(Token)match(input,67,FOLLOW_8); if (state.failed) return current;
+            otherlv_0=(Token)match(input,66,FOLLOW_8); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getTableTextColorAccess().getTextcolorKeyword_0());
               		
             }
-            // InternalTableDSL.g:3235:3: ( (lv_rgb_1_0= RULE_STRING ) )
-            // InternalTableDSL.g:3236:4: (lv_rgb_1_0= RULE_STRING )
+            // InternalTableDSL.g:2871:3: ( (lv_rgb_1_0= RULE_STRING ) )
+            // InternalTableDSL.g:2872:4: (lv_rgb_1_0= RULE_STRING )
             {
-            // InternalTableDSL.g:3236:4: (lv_rgb_1_0= RULE_STRING )
-            // InternalTableDSL.g:3237:5: lv_rgb_1_0= RULE_STRING
+            // InternalTableDSL.g:2872:4: (lv_rgb_1_0= RULE_STRING )
+            // InternalTableDSL.g:2873:5: lv_rgb_1_0= RULE_STRING
             {
             lv_rgb_1_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
@@ -9321,7 +8367,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableCellColor"
-    // InternalTableDSL.g:3257:1: entryRuleTableCellColor returns [EObject current=null] : iv_ruleTableCellColor= ruleTableCellColor EOF ;
+    // InternalTableDSL.g:2893:1: entryRuleTableCellColor returns [EObject current=null] : iv_ruleTableCellColor= ruleTableCellColor EOF ;
     public final EObject entryRuleTableCellColor() throws RecognitionException {
         EObject current = null;
 
@@ -9329,8 +8375,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:3257:55: (iv_ruleTableCellColor= ruleTableCellColor EOF )
-            // InternalTableDSL.g:3258:2: iv_ruleTableCellColor= ruleTableCellColor EOF
+            // InternalTableDSL.g:2893:55: (iv_ruleTableCellColor= ruleTableCellColor EOF )
+            // InternalTableDSL.g:2894:2: iv_ruleTableCellColor= ruleTableCellColor EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableCellColorRule()); 
@@ -9361,7 +8407,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableCellColor"
-    // InternalTableDSL.g:3264:1: ruleTableCellColor returns [EObject current=null] : (otherlv_0= 'cellcolor' ( (lv_rgb_1_0= RULE_STRING ) ) ) ;
+    // InternalTableDSL.g:2900:1: ruleTableCellColor returns [EObject current=null] : (otherlv_0= 'cellcolor' ( (lv_rgb_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleTableCellColor() throws RecognitionException {
         EObject current = null;
 
@@ -9372,23 +8418,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:3270:2: ( (otherlv_0= 'cellcolor' ( (lv_rgb_1_0= RULE_STRING ) ) ) )
-            // InternalTableDSL.g:3271:2: (otherlv_0= 'cellcolor' ( (lv_rgb_1_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:2906:2: ( (otherlv_0= 'cellcolor' ( (lv_rgb_1_0= RULE_STRING ) ) ) )
+            // InternalTableDSL.g:2907:2: (otherlv_0= 'cellcolor' ( (lv_rgb_1_0= RULE_STRING ) ) )
             {
-            // InternalTableDSL.g:3271:2: (otherlv_0= 'cellcolor' ( (lv_rgb_1_0= RULE_STRING ) ) )
-            // InternalTableDSL.g:3272:3: otherlv_0= 'cellcolor' ( (lv_rgb_1_0= RULE_STRING ) )
+            // InternalTableDSL.g:2907:2: (otherlv_0= 'cellcolor' ( (lv_rgb_1_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:2908:3: otherlv_0= 'cellcolor' ( (lv_rgb_1_0= RULE_STRING ) )
             {
-            otherlv_0=(Token)match(input,68,FOLLOW_8); if (state.failed) return current;
+            otherlv_0=(Token)match(input,67,FOLLOW_8); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getTableCellColorAccess().getCellcolorKeyword_0());
               		
             }
-            // InternalTableDSL.g:3276:3: ( (lv_rgb_1_0= RULE_STRING ) )
-            // InternalTableDSL.g:3277:4: (lv_rgb_1_0= RULE_STRING )
+            // InternalTableDSL.g:2912:3: ( (lv_rgb_1_0= RULE_STRING ) )
+            // InternalTableDSL.g:2913:4: (lv_rgb_1_0= RULE_STRING )
             {
-            // InternalTableDSL.g:3277:4: (lv_rgb_1_0= RULE_STRING )
-            // InternalTableDSL.g:3278:5: lv_rgb_1_0= RULE_STRING
+            // InternalTableDSL.g:2913:4: (lv_rgb_1_0= RULE_STRING )
+            // InternalTableDSL.g:2914:5: lv_rgb_1_0= RULE_STRING
             {
             lv_rgb_1_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
@@ -9439,7 +8485,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableIcon"
-    // InternalTableDSL.g:3298:1: entryRuleTableIcon returns [EObject current=null] : iv_ruleTableIcon= ruleTableIcon EOF ;
+    // InternalTableDSL.g:2934:1: entryRuleTableIcon returns [EObject current=null] : iv_ruleTableIcon= ruleTableIcon EOF ;
     public final EObject entryRuleTableIcon() throws RecognitionException {
         EObject current = null;
 
@@ -9447,8 +8493,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:3298:50: (iv_ruleTableIcon= ruleTableIcon EOF )
-            // InternalTableDSL.g:3299:2: iv_ruleTableIcon= ruleTableIcon EOF
+            // InternalTableDSL.g:2934:50: (iv_ruleTableIcon= ruleTableIcon EOF )
+            // InternalTableDSL.g:2935:2: iv_ruleTableIcon= ruleTableIcon EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableIconRule()); 
@@ -9479,7 +8525,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableIcon"
-    // InternalTableDSL.g:3305:1: ruleTableIcon returns [EObject current=null] : (otherlv_0= 'icon' ( (lv_icon_1_0= RULE_STRING ) ) ) ;
+    // InternalTableDSL.g:2941:1: ruleTableIcon returns [EObject current=null] : (otherlv_0= 'icon' ( (lv_icon_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleTableIcon() throws RecognitionException {
         EObject current = null;
 
@@ -9490,23 +8536,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:3311:2: ( (otherlv_0= 'icon' ( (lv_icon_1_0= RULE_STRING ) ) ) )
-            // InternalTableDSL.g:3312:2: (otherlv_0= 'icon' ( (lv_icon_1_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:2947:2: ( (otherlv_0= 'icon' ( (lv_icon_1_0= RULE_STRING ) ) ) )
+            // InternalTableDSL.g:2948:2: (otherlv_0= 'icon' ( (lv_icon_1_0= RULE_STRING ) ) )
             {
-            // InternalTableDSL.g:3312:2: (otherlv_0= 'icon' ( (lv_icon_1_0= RULE_STRING ) ) )
-            // InternalTableDSL.g:3313:3: otherlv_0= 'icon' ( (lv_icon_1_0= RULE_STRING ) )
+            // InternalTableDSL.g:2948:2: (otherlv_0= 'icon' ( (lv_icon_1_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:2949:3: otherlv_0= 'icon' ( (lv_icon_1_0= RULE_STRING ) )
             {
-            otherlv_0=(Token)match(input,37,FOLLOW_8); if (state.failed) return current;
+            otherlv_0=(Token)match(input,36,FOLLOW_8); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getTableIconAccess().getIconKeyword_0());
               		
             }
-            // InternalTableDSL.g:3317:3: ( (lv_icon_1_0= RULE_STRING ) )
-            // InternalTableDSL.g:3318:4: (lv_icon_1_0= RULE_STRING )
+            // InternalTableDSL.g:2953:3: ( (lv_icon_1_0= RULE_STRING ) )
+            // InternalTableDSL.g:2954:4: (lv_icon_1_0= RULE_STRING )
             {
-            // InternalTableDSL.g:3318:4: (lv_icon_1_0= RULE_STRING )
-            // InternalTableDSL.g:3319:5: lv_icon_1_0= RULE_STRING
+            // InternalTableDSL.g:2954:4: (lv_icon_1_0= RULE_STRING )
+            // InternalTableDSL.g:2955:5: lv_icon_1_0= RULE_STRING
             {
             lv_icon_1_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
@@ -9557,7 +8603,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableTrend"
-    // InternalTableDSL.g:3339:1: entryRuleTableTrend returns [EObject current=null] : iv_ruleTableTrend= ruleTableTrend EOF ;
+    // InternalTableDSL.g:2975:1: entryRuleTableTrend returns [EObject current=null] : iv_ruleTableTrend= ruleTableTrend EOF ;
     public final EObject entryRuleTableTrend() throws RecognitionException {
         EObject current = null;
 
@@ -9565,8 +8611,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:3339:51: (iv_ruleTableTrend= ruleTableTrend EOF )
-            // InternalTableDSL.g:3340:2: iv_ruleTableTrend= ruleTableTrend EOF
+            // InternalTableDSL.g:2975:51: (iv_ruleTableTrend= ruleTableTrend EOF )
+            // InternalTableDSL.g:2976:2: iv_ruleTableTrend= ruleTableTrend EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableTrendRule()); 
@@ -9597,7 +8643,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableTrend"
-    // InternalTableDSL.g:3346:1: ruleTableTrend returns [EObject current=null] : (otherlv_0= 'trend' ( (lv_icon_1_0= ruleTrendIconEnum ) ) ) ;
+    // InternalTableDSL.g:2982:1: ruleTableTrend returns [EObject current=null] : (otherlv_0= 'trend' ( (lv_icon_1_0= ruleTrendIconEnum ) ) ) ;
     public final EObject ruleTableTrend() throws RecognitionException {
         EObject current = null;
 
@@ -9609,23 +8655,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:3352:2: ( (otherlv_0= 'trend' ( (lv_icon_1_0= ruleTrendIconEnum ) ) ) )
-            // InternalTableDSL.g:3353:2: (otherlv_0= 'trend' ( (lv_icon_1_0= ruleTrendIconEnum ) ) )
+            // InternalTableDSL.g:2988:2: ( (otherlv_0= 'trend' ( (lv_icon_1_0= ruleTrendIconEnum ) ) ) )
+            // InternalTableDSL.g:2989:2: (otherlv_0= 'trend' ( (lv_icon_1_0= ruleTrendIconEnum ) ) )
             {
-            // InternalTableDSL.g:3353:2: (otherlv_0= 'trend' ( (lv_icon_1_0= ruleTrendIconEnum ) ) )
-            // InternalTableDSL.g:3354:3: otherlv_0= 'trend' ( (lv_icon_1_0= ruleTrendIconEnum ) )
+            // InternalTableDSL.g:2989:2: (otherlv_0= 'trend' ( (lv_icon_1_0= ruleTrendIconEnum ) ) )
+            // InternalTableDSL.g:2990:3: otherlv_0= 'trend' ( (lv_icon_1_0= ruleTrendIconEnum ) )
             {
-            otherlv_0=(Token)match(input,69,FOLLOW_36); if (state.failed) return current;
+            otherlv_0=(Token)match(input,68,FOLLOW_36); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getTableTrendAccess().getTrendKeyword_0());
               		
             }
-            // InternalTableDSL.g:3358:3: ( (lv_icon_1_0= ruleTrendIconEnum ) )
-            // InternalTableDSL.g:3359:4: (lv_icon_1_0= ruleTrendIconEnum )
+            // InternalTableDSL.g:2994:3: ( (lv_icon_1_0= ruleTrendIconEnum ) )
+            // InternalTableDSL.g:2995:4: (lv_icon_1_0= ruleTrendIconEnum )
             {
-            // InternalTableDSL.g:3359:4: (lv_icon_1_0= ruleTrendIconEnum )
-            // InternalTableDSL.g:3360:5: lv_icon_1_0= ruleTrendIconEnum
+            // InternalTableDSL.g:2995:4: (lv_icon_1_0= ruleTrendIconEnum )
+            // InternalTableDSL.g:2996:5: lv_icon_1_0= ruleTrendIconEnum
             {
             if ( state.backtracking==0 ) {
 
@@ -9681,7 +8727,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableTooltip"
-    // InternalTableDSL.g:3381:1: entryRuleTableTooltip returns [EObject current=null] : iv_ruleTableTooltip= ruleTableTooltip EOF ;
+    // InternalTableDSL.g:3017:1: entryRuleTableTooltip returns [EObject current=null] : iv_ruleTableTooltip= ruleTableTooltip EOF ;
     public final EObject entryRuleTableTooltip() throws RecognitionException {
         EObject current = null;
 
@@ -9689,8 +8735,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:3381:53: (iv_ruleTableTooltip= ruleTableTooltip EOF )
-            // InternalTableDSL.g:3382:2: iv_ruleTableTooltip= ruleTableTooltip EOF
+            // InternalTableDSL.g:3017:53: (iv_ruleTableTooltip= ruleTableTooltip EOF )
+            // InternalTableDSL.g:3018:2: iv_ruleTableTooltip= ruleTableTooltip EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableTooltipRule()); 
@@ -9721,7 +8767,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableTooltip"
-    // InternalTableDSL.g:3388:1: ruleTableTooltip returns [EObject current=null] : (otherlv_0= 'tooltip' ( (lv_tooltip_1_0= ruleTRANSLATABLESTRING ) ) ) ;
+    // InternalTableDSL.g:3024:1: ruleTableTooltip returns [EObject current=null] : (otherlv_0= 'tooltip' ( (lv_tooltip_1_0= ruleTRANSLATABLESTRING ) ) ) ;
     public final EObject ruleTableTooltip() throws RecognitionException {
         EObject current = null;
 
@@ -9733,23 +8779,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:3394:2: ( (otherlv_0= 'tooltip' ( (lv_tooltip_1_0= ruleTRANSLATABLESTRING ) ) ) )
-            // InternalTableDSL.g:3395:2: (otherlv_0= 'tooltip' ( (lv_tooltip_1_0= ruleTRANSLATABLESTRING ) ) )
+            // InternalTableDSL.g:3030:2: ( (otherlv_0= 'tooltip' ( (lv_tooltip_1_0= ruleTRANSLATABLESTRING ) ) ) )
+            // InternalTableDSL.g:3031:2: (otherlv_0= 'tooltip' ( (lv_tooltip_1_0= ruleTRANSLATABLESTRING ) ) )
             {
-            // InternalTableDSL.g:3395:2: (otherlv_0= 'tooltip' ( (lv_tooltip_1_0= ruleTRANSLATABLESTRING ) ) )
-            // InternalTableDSL.g:3396:3: otherlv_0= 'tooltip' ( (lv_tooltip_1_0= ruleTRANSLATABLESTRING ) )
+            // InternalTableDSL.g:3031:2: (otherlv_0= 'tooltip' ( (lv_tooltip_1_0= ruleTRANSLATABLESTRING ) ) )
+            // InternalTableDSL.g:3032:3: otherlv_0= 'tooltip' ( (lv_tooltip_1_0= ruleTRANSLATABLESTRING ) )
             {
-            otherlv_0=(Token)match(input,70,FOLLOW_8); if (state.failed) return current;
+            otherlv_0=(Token)match(input,69,FOLLOW_8); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getTableTooltipAccess().getTooltipKeyword_0());
               		
             }
-            // InternalTableDSL.g:3400:3: ( (lv_tooltip_1_0= ruleTRANSLATABLESTRING ) )
-            // InternalTableDSL.g:3401:4: (lv_tooltip_1_0= ruleTRANSLATABLESTRING )
+            // InternalTableDSL.g:3036:3: ( (lv_tooltip_1_0= ruleTRANSLATABLESTRING ) )
+            // InternalTableDSL.g:3037:4: (lv_tooltip_1_0= ruleTRANSLATABLESTRING )
             {
-            // InternalTableDSL.g:3401:4: (lv_tooltip_1_0= ruleTRANSLATABLESTRING )
-            // InternalTableDSL.g:3402:5: lv_tooltip_1_0= ruleTRANSLATABLESTRING
+            // InternalTableDSL.g:3037:4: (lv_tooltip_1_0= ruleTRANSLATABLESTRING )
+            // InternalTableDSL.g:3038:5: lv_tooltip_1_0= ruleTRANSLATABLESTRING
             {
             if ( state.backtracking==0 ) {
 
@@ -9805,7 +8851,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableGrid"
-    // InternalTableDSL.g:3423:1: entryRuleTableGrid returns [EObject current=null] : iv_ruleTableGrid= ruleTableGrid EOF ;
+    // InternalTableDSL.g:3059:1: entryRuleTableGrid returns [EObject current=null] : iv_ruleTableGrid= ruleTableGrid EOF ;
     public final EObject entryRuleTableGrid() throws RecognitionException {
         EObject current = null;
 
@@ -9813,8 +8859,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:3423:50: (iv_ruleTableGrid= ruleTableGrid EOF )
-            // InternalTableDSL.g:3424:2: iv_ruleTableGrid= ruleTableGrid EOF
+            // InternalTableDSL.g:3059:50: (iv_ruleTableGrid= ruleTableGrid EOF )
+            // InternalTableDSL.g:3060:2: iv_ruleTableGrid= ruleTableGrid EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableGridRule()); 
@@ -9845,38 +8891,27 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableGrid"
-    // InternalTableDSL.g:3430:1: ruleTableGrid returns [EObject current=null] : ( () otherlv_1= 'grid' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) ) ) )* ) ) ) ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDtoDatasource ) ) )? ) ;
+    // InternalTableDSL.g:3066:1: ruleTableGrid returns [EObject current=null] : ( () otherlv_1= 'editable' otherlv_2= 'using' ( (lv_source_3_0= ruleTableDtoDatasource ) ) ) ;
     public final EObject ruleTableGrid() throws RecognitionException {
         EObject current = null;
 
         Token otherlv_1=null;
-        Token lv_selectalways_3_0=null;
-        Token otherlv_4=null;
-        Token lv_polling_7_0=null;
-        Token lv_filtering_9_0=null;
-        Token lv_embedded_10_0=null;
-        Token otherlv_11=null;
-        Token otherlv_12=null;
-        Token otherlv_13=null;
-        Enumerator lv_headerMode_5_0 = null;
-
-        AntlrDatatypeRuleToken lv_pollingTime_8_0 = null;
-
-        EObject lv_source_14_0 = null;
+        Token otherlv_2=null;
+        EObject lv_source_3_0 = null;
 
 
 
         	enterRule();
 
         try {
-            // InternalTableDSL.g:3436:2: ( ( () otherlv_1= 'grid' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) ) ) )* ) ) ) ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDtoDatasource ) ) )? ) )
-            // InternalTableDSL.g:3437:2: ( () otherlv_1= 'grid' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) ) ) )* ) ) ) ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDtoDatasource ) ) )? )
+            // InternalTableDSL.g:3072:2: ( ( () otherlv_1= 'editable' otherlv_2= 'using' ( (lv_source_3_0= ruleTableDtoDatasource ) ) ) )
+            // InternalTableDSL.g:3073:2: ( () otherlv_1= 'editable' otherlv_2= 'using' ( (lv_source_3_0= ruleTableDtoDatasource ) ) )
             {
-            // InternalTableDSL.g:3437:2: ( () otherlv_1= 'grid' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) ) ) )* ) ) ) ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDtoDatasource ) ) )? )
-            // InternalTableDSL.g:3438:3: () otherlv_1= 'grid' ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) ) ) )* ) ) ) ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) ) (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDtoDatasource ) ) )?
+            // InternalTableDSL.g:3073:2: ( () otherlv_1= 'editable' otherlv_2= 'using' ( (lv_source_3_0= ruleTableDtoDatasource ) ) )
+            // InternalTableDSL.g:3074:3: () otherlv_1= 'editable' otherlv_2= 'using' ( (lv_source_3_0= ruleTableDtoDatasource ) )
             {
-            // InternalTableDSL.g:3438:3: ()
-            // InternalTableDSL.g:3439:4: 
+            // InternalTableDSL.g:3074:3: ()
+            // InternalTableDSL.g:3075:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -9888,589 +8923,51 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,71,FOLLOW_37); if (state.failed) return current;
+            otherlv_1=(Token)match(input,70,FOLLOW_37); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
-              			newLeafNode(otherlv_1, grammarAccess.getTableGridAccess().getGridKeyword_1());
+              			newLeafNode(otherlv_1, grammarAccess.getTableGridAccess().getEditableKeyword_1());
               		
             }
-            // InternalTableDSL.g:3449:3: ( ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) ) ) )* ) ) )
-            // InternalTableDSL.g:3450:4: ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) ) ) )* ) )
-            {
-            // InternalTableDSL.g:3450:4: ( ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) ) ) )* ) )
-            // InternalTableDSL.g:3451:5: ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) ) ) )* )
-            {
-            getUnorderedGroupHelper().enter(grammarAccess.getTableGridAccess().getUnorderedGroup_2());
-            // InternalTableDSL.g:3454:5: ( ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) ) ) )* )
-            // InternalTableDSL.g:3455:6: ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) ) ) )*
-            {
-            // InternalTableDSL.g:3455:6: ( ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) ) ) )*
-            loop33:
-            do {
-                int alt33=3;
-                int LA33_0 = input.LA(1);
-
-                if ( LA33_0 == 72 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0) ) {
-                    alt33=1;
-                }
-                else if ( LA33_0 == 73 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 1) ) {
-                    alt33=2;
-                }
-
-
-                switch (alt33) {
-            	case 1 :
-            	    // InternalTableDSL.g:3456:4: ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) ) )
-            	    {
-            	    // InternalTableDSL.g:3456:4: ({...}? => ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) ) )
-            	    // InternalTableDSL.g:3457:5: {...}? => ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) )
-            	    {
-            	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableGrid", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0)");
-            	    }
-            	    // InternalTableDSL.g:3457:106: ( ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) ) )
-            	    // InternalTableDSL.g:3458:6: ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) )
-            	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 0);
-            	    // InternalTableDSL.g:3461:9: ({...}? => ( (lv_selectalways_3_0= 'selectalways' ) ) )
-            	    // InternalTableDSL.g:3461:10: {...}? => ( (lv_selectalways_3_0= 'selectalways' ) )
-            	    {
-            	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableGrid", "true");
-            	    }
-            	    // InternalTableDSL.g:3461:19: ( (lv_selectalways_3_0= 'selectalways' ) )
-            	    // InternalTableDSL.g:3461:20: (lv_selectalways_3_0= 'selectalways' )
-            	    {
-            	    // InternalTableDSL.g:3461:20: (lv_selectalways_3_0= 'selectalways' )
-            	    // InternalTableDSL.g:3462:10: lv_selectalways_3_0= 'selectalways'
-            	    {
-            	    lv_selectalways_3_0=(Token)match(input,72,FOLLOW_37); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      										newLeafNode(lv_selectalways_3_0, grammarAccess.getTableGridAccess().getSelectalwaysSelectalwaysKeyword_2_0_0());
-            	      									
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      										if (current==null) {
-            	      											current = createModelElement(grammarAccess.getTableGridRule());
-            	      										}
-            	      										setWithLastConsumed(current, "selectalways", true, "selectalways");
-            	      									
-            	    }
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_2());
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-            	case 2 :
-            	    // InternalTableDSL.g:3479:4: ({...}? => ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) ) )
-            	    {
-            	    // InternalTableDSL.g:3479:4: ({...}? => ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) ) )
-            	    // InternalTableDSL.g:3480:5: {...}? => ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) )
-            	    {
-            	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 1) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableGrid", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 1)");
-            	    }
-            	    // InternalTableDSL.g:3480:106: ( ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) ) )
-            	    // InternalTableDSL.g:3481:6: ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) )
-            	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_2(), 1);
-            	    // InternalTableDSL.g:3484:9: ({...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) ) )
-            	    // InternalTableDSL.g:3484:10: {...}? => (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) )
-            	    {
-            	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableGrid", "true");
-            	    }
-            	    // InternalTableDSL.g:3484:19: (otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) ) )
-            	    // InternalTableDSL.g:3484:20: otherlv_4= 'rowheader' ( (lv_headerMode_5_0= ruleRowHeaderMode ) )
-            	    {
-            	    otherlv_4=(Token)match(input,73,FOLLOW_13); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      									newLeafNode(otherlv_4, grammarAccess.getTableGridAccess().getRowheaderKeyword_2_1_0());
-            	      								
-            	    }
-            	    // InternalTableDSL.g:3488:9: ( (lv_headerMode_5_0= ruleRowHeaderMode ) )
-            	    // InternalTableDSL.g:3489:10: (lv_headerMode_5_0= ruleRowHeaderMode )
-            	    {
-            	    // InternalTableDSL.g:3489:10: (lv_headerMode_5_0= ruleRowHeaderMode )
-            	    // InternalTableDSL.g:3490:11: lv_headerMode_5_0= ruleRowHeaderMode
-            	    {
-            	    if ( state.backtracking==0 ) {
-
-            	      											newCompositeNode(grammarAccess.getTableGridAccess().getHeaderModeRowHeaderModeEnumRuleCall_2_1_1_0());
-            	      										
-            	    }
-            	    pushFollow(FOLLOW_37);
-            	    lv_headerMode_5_0=ruleRowHeaderMode();
-
-            	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      											if (current==null) {
-            	      												current = createModelElementForParent(grammarAccess.getTableGridRule());
-            	      											}
-            	      											set(
-            	      												current,
-            	      												"headerMode",
-            	      												lv_headerMode_5_0,
-            	      												"org.eclipse.osbp.xtext.table.TableDSL.RowHeaderMode");
-            	      											afterParserOrEnumRuleCall();
-            	      										
-            	    }
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_2());
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop33;
-                }
-            } while (true);
-
-
-            }
-
-
-            }
-
-            getUnorderedGroupHelper().leave(grammarAccess.getTableGridAccess().getUnorderedGroup_2());
+            otherlv_2=(Token)match(input,29,FOLLOW_38); if (state.failed) return current;
+            if ( state.backtracking==0 ) {
 
+              			newLeafNode(otherlv_2, grammarAccess.getTableGridAccess().getUsingKeyword_2());
+              		
             }
-
-            // InternalTableDSL.g:3520:3: ( ( ( ( ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) ) )
-            // InternalTableDSL.g:3521:4: ( ( ( ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) )
+            // InternalTableDSL.g:3089:3: ( (lv_source_3_0= ruleTableDtoDatasource ) )
+            // InternalTableDSL.g:3090:4: (lv_source_3_0= ruleTableDtoDatasource )
             {
-            // InternalTableDSL.g:3521:4: ( ( ( ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* ) )
-            // InternalTableDSL.g:3522:5: ( ( ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* )
+            // InternalTableDSL.g:3090:4: (lv_source_3_0= ruleTableDtoDatasource )
+            // InternalTableDSL.g:3091:5: lv_source_3_0= ruleTableDtoDatasource
             {
-            getUnorderedGroupHelper().enter(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-            // InternalTableDSL.g:3525:5: ( ( ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )* )
-            // InternalTableDSL.g:3526:6: ( ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )*
-            {
-            // InternalTableDSL.g:3526:6: ( ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) ) )*
-            loop34:
-            do {
-                int alt34=5;
-                int LA34_0 = input.LA(1);
-
-                if ( LA34_0 == 26 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0) ) {
-                    alt34=1;
-                }
-                else if ( LA34_0 == 27 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1) ) {
-                    alt34=2;
-                }
-                else if ( LA34_0 == 28 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2) ) {
-                    alt34=3;
-                }
-                else if ( LA34_0 == 29 && getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3) ) {
-                    alt34=4;
-                }
-
-
-                switch (alt34) {
-            	case 1 :
-            	    // InternalTableDSL.g:3527:4: ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) )
-            	    {
-            	    // InternalTableDSL.g:3527:4: ({...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) ) )
-            	    // InternalTableDSL.g:3528:5: {...}? => ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) )
-            	    {
-            	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableGrid", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0)");
-            	    }
-            	    // InternalTableDSL.g:3528:106: ( ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) ) )
-            	    // InternalTableDSL.g:3529:6: ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) )
-            	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 0);
-            	    // InternalTableDSL.g:3532:9: ({...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) ) )
-            	    // InternalTableDSL.g:3532:10: {...}? => ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) )
-            	    {
-            	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableGrid", "true");
-            	    }
-            	    // InternalTableDSL.g:3532:19: ( ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) ) )
-            	    // InternalTableDSL.g:3532:20: ( (lv_polling_7_0= 'polling' ) ) ( (lv_pollingTime_8_0= ruleNumber ) )
-            	    {
-            	    // InternalTableDSL.g:3532:20: ( (lv_polling_7_0= 'polling' ) )
-            	    // InternalTableDSL.g:3533:10: (lv_polling_7_0= 'polling' )
-            	    {
-            	    // InternalTableDSL.g:3533:10: (lv_polling_7_0= 'polling' )
-            	    // InternalTableDSL.g:3534:11: lv_polling_7_0= 'polling'
-            	    {
-            	    lv_polling_7_0=(Token)match(input,26,FOLLOW_14); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      											newLeafNode(lv_polling_7_0, grammarAccess.getTableGridAccess().getPollingPollingKeyword_3_0_0_0());
-            	      										
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      											if (current==null) {
-            	      												current = createModelElement(grammarAccess.getTableGridRule());
-            	      											}
-            	      											setWithLastConsumed(current, "polling", true, "polling");
-            	      										
-            	    }
-
-            	    }
-
-
-            	    }
-
-            	    // InternalTableDSL.g:3546:9: ( (lv_pollingTime_8_0= ruleNumber ) )
-            	    // InternalTableDSL.g:3547:10: (lv_pollingTime_8_0= ruleNumber )
-            	    {
-            	    // InternalTableDSL.g:3547:10: (lv_pollingTime_8_0= ruleNumber )
-            	    // InternalTableDSL.g:3548:11: lv_pollingTime_8_0= ruleNumber
-            	    {
-            	    if ( state.backtracking==0 ) {
-
-            	      											newCompositeNode(grammarAccess.getTableGridAccess().getPollingTimeNumberParserRuleCall_3_0_1_0());
-            	      										
-            	    }
-            	    pushFollow(FOLLOW_38);
-            	    lv_pollingTime_8_0=ruleNumber();
-
-            	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      											if (current==null) {
-            	      												current = createModelElementForParent(grammarAccess.getTableGridRule());
-            	      											}
-            	      											set(
-            	      												current,
-            	      												"pollingTime",
-            	      												lv_pollingTime_8_0,
-            	      												"org.eclipse.xtext.xbase.Xbase.Number");
-            	      											afterParserOrEnumRuleCall();
-            	      										
-            	    }
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-            	case 2 :
-            	    // InternalTableDSL.g:3571:4: ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) )
-            	    {
-            	    // InternalTableDSL.g:3571:4: ({...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) ) )
-            	    // InternalTableDSL.g:3572:5: {...}? => ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) )
-            	    {
-            	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableGrid", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1)");
-            	    }
-            	    // InternalTableDSL.g:3572:106: ( ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) ) )
-            	    // InternalTableDSL.g:3573:6: ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) )
-            	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 1);
-            	    // InternalTableDSL.g:3576:9: ({...}? => ( (lv_filtering_9_0= 'filtering' ) ) )
-            	    // InternalTableDSL.g:3576:10: {...}? => ( (lv_filtering_9_0= 'filtering' ) )
-            	    {
-            	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableGrid", "true");
-            	    }
-            	    // InternalTableDSL.g:3576:19: ( (lv_filtering_9_0= 'filtering' ) )
-            	    // InternalTableDSL.g:3576:20: (lv_filtering_9_0= 'filtering' )
-            	    {
-            	    // InternalTableDSL.g:3576:20: (lv_filtering_9_0= 'filtering' )
-            	    // InternalTableDSL.g:3577:10: lv_filtering_9_0= 'filtering'
-            	    {
-            	    lv_filtering_9_0=(Token)match(input,27,FOLLOW_38); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      										newLeafNode(lv_filtering_9_0, grammarAccess.getTableGridAccess().getFilteringFilteringKeyword_3_1_0());
-            	      									
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      										if (current==null) {
-            	      											current = createModelElement(grammarAccess.getTableGridRule());
-            	      										}
-            	      										setWithLastConsumed(current, "filtering", true, "filtering");
-            	      									
-            	    }
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-            	case 3 :
-            	    // InternalTableDSL.g:3594:4: ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) )
-            	    {
-            	    // InternalTableDSL.g:3594:4: ({...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) ) )
-            	    // InternalTableDSL.g:3595:5: {...}? => ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) )
-            	    {
-            	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableGrid", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2)");
-            	    }
-            	    // InternalTableDSL.g:3595:106: ( ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) ) )
-            	    // InternalTableDSL.g:3596:6: ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) )
-            	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 2);
-            	    // InternalTableDSL.g:3599:9: ({...}? => ( (lv_embedded_10_0= 'embedded' ) ) )
-            	    // InternalTableDSL.g:3599:10: {...}? => ( (lv_embedded_10_0= 'embedded' ) )
-            	    {
-            	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableGrid", "true");
-            	    }
-            	    // InternalTableDSL.g:3599:19: ( (lv_embedded_10_0= 'embedded' ) )
-            	    // InternalTableDSL.g:3599:20: (lv_embedded_10_0= 'embedded' )
-            	    {
-            	    // InternalTableDSL.g:3599:20: (lv_embedded_10_0= 'embedded' )
-            	    // InternalTableDSL.g:3600:10: lv_embedded_10_0= 'embedded'
-            	    {
-            	    lv_embedded_10_0=(Token)match(input,28,FOLLOW_38); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      										newLeafNode(lv_embedded_10_0, grammarAccess.getTableGridAccess().getEmbeddedEmbeddedKeyword_3_2_0());
-            	      									
-            	    }
-            	    if ( state.backtracking==0 ) {
-
-            	      										if (current==null) {
-            	      											current = createModelElement(grammarAccess.getTableGridRule());
-            	      										}
-            	      										setWithLastConsumed(current, "embedded", true, "embedded");
-            	      									
-            	    }
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-            	case 4 :
-            	    // InternalTableDSL.g:3617:4: ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) )
-            	    {
-            	    // InternalTableDSL.g:3617:4: ({...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) ) )
-            	    // InternalTableDSL.g:3618:5: {...}? => ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) )
-            	    {
-            	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableGrid", "getUnorderedGroupHelper().canSelect(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3)");
-            	    }
-            	    // InternalTableDSL.g:3618:106: ( ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) ) )
-            	    // InternalTableDSL.g:3619:6: ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) )
-            	    {
-            	    getUnorderedGroupHelper().select(grammarAccess.getTableGridAccess().getUnorderedGroup_3(), 3);
-            	    // InternalTableDSL.g:3622:9: ({...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) ) )
-            	    // InternalTableDSL.g:3622:10: {...}? => (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) )
-            	    {
-            	    if ( !((true)) ) {
-            	        if (state.backtracking>0) {state.failed=true; return current;}
-            	        throw new FailedPredicateException(input, "ruleTableGrid", "true");
-            	    }
-            	    // InternalTableDSL.g:3622:19: (otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) ) )
-            	    // InternalTableDSL.g:3622:20: otherlv_11= 'toolbar' ( (otherlv_12= RULE_ID ) )
-            	    {
-            	    otherlv_11=(Token)match(input,29,FOLLOW_4); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      									newLeafNode(otherlv_11, grammarAccess.getTableGridAccess().getToolbarKeyword_3_3_0());
-            	      								
-            	    }
-            	    // InternalTableDSL.g:3626:9: ( (otherlv_12= RULE_ID ) )
-            	    // InternalTableDSL.g:3627:10: (otherlv_12= RULE_ID )
-            	    {
-            	    // InternalTableDSL.g:3627:10: (otherlv_12= RULE_ID )
-            	    // InternalTableDSL.g:3628:11: otherlv_12= RULE_ID
-            	    {
-            	    if ( state.backtracking==0 ) {
-
-            	      											if (current==null) {
-            	      												current = createModelElement(grammarAccess.getTableGridRule());
-            	      											}
-            	      										
-            	    }
-            	    otherlv_12=(Token)match(input,RULE_ID,FOLLOW_38); if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
-
-            	      											newLeafNode(otherlv_12, grammarAccess.getTableGridAccess().getToolbarActionToolbarCrossReference_3_3_1_0());
-            	      										
-            	    }
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-
-            	    getUnorderedGroupHelper().returnFromSelection(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop34;
-                }
-            } while (true);
-
-
-            }
-
+            if ( state.backtracking==0 ) {
 
+              					newCompositeNode(grammarAccess.getTableGridAccess().getSourceTableDtoDatasourceParserRuleCall_3_0());
+              				
             }
+            pushFollow(FOLLOW_2);
+            lv_source_3_0=ruleTableDtoDatasource();
 
-            getUnorderedGroupHelper().leave(grammarAccess.getTableGridAccess().getUnorderedGroup_3());
+            state._fsp--;
+            if (state.failed) return current;
+            if ( state.backtracking==0 ) {
 
+              					if (current==null) {
+              						current = createModelElementForParent(grammarAccess.getTableGridRule());
+              					}
+              					set(
+              						current,
+              						"source",
+              						lv_source_3_0,
+              						"org.eclipse.osbp.xtext.table.TableDSL.TableDtoDatasource");
+              					afterParserOrEnumRuleCall();
+              				
             }
 
-            // InternalTableDSL.g:3652:3: (otherlv_13= 'using' ( (lv_source_14_0= ruleTableDtoDatasource ) ) )?
-            int alt35=2;
-            int LA35_0 = input.LA(1);
-
-            if ( (LA35_0==30) ) {
-                alt35=1;
             }
-            switch (alt35) {
-                case 1 :
-                    // InternalTableDSL.g:3653:4: otherlv_13= 'using' ( (lv_source_14_0= ruleTableDtoDatasource ) )
-                    {
-                    otherlv_13=(Token)match(input,30,FOLLOW_39); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      				newLeafNode(otherlv_13, grammarAccess.getTableGridAccess().getUsingKeyword_4_0());
-                      			
-                    }
-                    // InternalTableDSL.g:3657:4: ( (lv_source_14_0= ruleTableDtoDatasource ) )
-                    // InternalTableDSL.g:3658:5: (lv_source_14_0= ruleTableDtoDatasource )
-                    {
-                    // InternalTableDSL.g:3658:5: (lv_source_14_0= ruleTableDtoDatasource )
-                    // InternalTableDSL.g:3659:6: lv_source_14_0= ruleTableDtoDatasource
-                    {
-                    if ( state.backtracking==0 ) {
-
-                      						newCompositeNode(grammarAccess.getTableGridAccess().getSourceTableDtoDatasourceParserRuleCall_4_1_0());
-                      					
-                    }
-                    pushFollow(FOLLOW_2);
-                    lv_source_14_0=ruleTableDtoDatasource();
-
-                    state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      						if (current==null) {
-                      							current = createModelElementForParent(grammarAccess.getTableGridRule());
-                      						}
-                      						set(
-                      							current,
-                      							"source",
-                      							lv_source_14_0,
-                      							"org.eclipse.osbp.xtext.table.TableDSL.TableDtoDatasource");
-                      						afterParserOrEnumRuleCall();
-                      					
-                    }
-
-                    }
-
-
-                    }
 
 
-                    }
-                    break;
-
             }
 
 
@@ -10498,7 +8995,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleProperty"
-    // InternalTableDSL.g:3681:1: entryRuleProperty returns [EObject current=null] : iv_ruleProperty= ruleProperty EOF ;
+    // InternalTableDSL.g:3112:1: entryRuleProperty returns [EObject current=null] : iv_ruleProperty= ruleProperty EOF ;
     public final EObject entryRuleProperty() throws RecognitionException {
         EObject current = null;
 
@@ -10506,8 +9003,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:3681:49: (iv_ruleProperty= ruleProperty EOF )
-            // InternalTableDSL.g:3682:2: iv_ruleProperty= ruleProperty EOF
+            // InternalTableDSL.g:3112:49: (iv_ruleProperty= ruleProperty EOF )
+            // InternalTableDSL.g:3113:2: iv_ruleProperty= ruleProperty EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getPropertyRule()); 
@@ -10538,7 +9035,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleProperty"
-    // InternalTableDSL.g:3688:1: ruleProperty returns [EObject current=null] : ( ( (lv_editable_0_0= 'editable' ) )? otherlv_1= 'prop' ( (lv_path_2_0= ruleNestedField ) ) otherlv_3= 'style' ( (lv_style_4_0= rulePropertyStyle ) ) ) ;
+    // InternalTableDSL.g:3119:1: ruleProperty returns [EObject current=null] : ( ( (lv_editable_0_0= 'editable' ) )? otherlv_1= 'prop' ( (lv_path_2_0= ruleNestedField ) ) otherlv_3= 'style' ( (lv_style_4_0= rulePropertyStyle ) ) ) ;
     public final EObject ruleProperty() throws RecognitionException {
         EObject current = null;
 
@@ -10554,27 +9051,27 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:3694:2: ( ( ( (lv_editable_0_0= 'editable' ) )? otherlv_1= 'prop' ( (lv_path_2_0= ruleNestedField ) ) otherlv_3= 'style' ( (lv_style_4_0= rulePropertyStyle ) ) ) )
-            // InternalTableDSL.g:3695:2: ( ( (lv_editable_0_0= 'editable' ) )? otherlv_1= 'prop' ( (lv_path_2_0= ruleNestedField ) ) otherlv_3= 'style' ( (lv_style_4_0= rulePropertyStyle ) ) )
+            // InternalTableDSL.g:3125:2: ( ( ( (lv_editable_0_0= 'editable' ) )? otherlv_1= 'prop' ( (lv_path_2_0= ruleNestedField ) ) otherlv_3= 'style' ( (lv_style_4_0= rulePropertyStyle ) ) ) )
+            // InternalTableDSL.g:3126:2: ( ( (lv_editable_0_0= 'editable' ) )? otherlv_1= 'prop' ( (lv_path_2_0= ruleNestedField ) ) otherlv_3= 'style' ( (lv_style_4_0= rulePropertyStyle ) ) )
             {
-            // InternalTableDSL.g:3695:2: ( ( (lv_editable_0_0= 'editable' ) )? otherlv_1= 'prop' ( (lv_path_2_0= ruleNestedField ) ) otherlv_3= 'style' ( (lv_style_4_0= rulePropertyStyle ) ) )
-            // InternalTableDSL.g:3696:3: ( (lv_editable_0_0= 'editable' ) )? otherlv_1= 'prop' ( (lv_path_2_0= ruleNestedField ) ) otherlv_3= 'style' ( (lv_style_4_0= rulePropertyStyle ) )
+            // InternalTableDSL.g:3126:2: ( ( (lv_editable_0_0= 'editable' ) )? otherlv_1= 'prop' ( (lv_path_2_0= ruleNestedField ) ) otherlv_3= 'style' ( (lv_style_4_0= rulePropertyStyle ) ) )
+            // InternalTableDSL.g:3127:3: ( (lv_editable_0_0= 'editable' ) )? otherlv_1= 'prop' ( (lv_path_2_0= ruleNestedField ) ) otherlv_3= 'style' ( (lv_style_4_0= rulePropertyStyle ) )
             {
-            // InternalTableDSL.g:3696:3: ( (lv_editable_0_0= 'editable' ) )?
-            int alt36=2;
-            int LA36_0 = input.LA(1);
+            // InternalTableDSL.g:3127:3: ( (lv_editable_0_0= 'editable' ) )?
+            int alt31=2;
+            int LA31_0 = input.LA(1);
 
-            if ( (LA36_0==74) ) {
-                alt36=1;
+            if ( (LA31_0==70) ) {
+                alt31=1;
             }
-            switch (alt36) {
+            switch (alt31) {
                 case 1 :
-                    // InternalTableDSL.g:3697:4: (lv_editable_0_0= 'editable' )
+                    // InternalTableDSL.g:3128:4: (lv_editable_0_0= 'editable' )
                     {
-                    // InternalTableDSL.g:3697:4: (lv_editable_0_0= 'editable' )
-                    // InternalTableDSL.g:3698:5: lv_editable_0_0= 'editable'
+                    // InternalTableDSL.g:3128:4: (lv_editable_0_0= 'editable' )
+                    // InternalTableDSL.g:3129:5: lv_editable_0_0= 'editable'
                     {
-                    lv_editable_0_0=(Token)match(input,74,FOLLOW_40); if (state.failed) return current;
+                    lv_editable_0_0=(Token)match(input,70,FOLLOW_39); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(lv_editable_0_0, grammarAccess.getPropertyAccess().getEditableEditableKeyword_0_0());
@@ -10597,24 +9094,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,75,FOLLOW_4); if (state.failed) return current;
+            otherlv_1=(Token)match(input,71,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getPropertyAccess().getPropKeyword_1());
               		
             }
-            // InternalTableDSL.g:3714:3: ( (lv_path_2_0= ruleNestedField ) )
-            // InternalTableDSL.g:3715:4: (lv_path_2_0= ruleNestedField )
+            // InternalTableDSL.g:3145:3: ( (lv_path_2_0= ruleNestedField ) )
+            // InternalTableDSL.g:3146:4: (lv_path_2_0= ruleNestedField )
             {
-            // InternalTableDSL.g:3715:4: (lv_path_2_0= ruleNestedField )
-            // InternalTableDSL.g:3716:5: lv_path_2_0= ruleNestedField
+            // InternalTableDSL.g:3146:4: (lv_path_2_0= ruleNestedField )
+            // InternalTableDSL.g:3147:5: lv_path_2_0= ruleNestedField
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getPropertyAccess().getPathNestedFieldParserRuleCall_2_0());
               				
             }
-            pushFollow(FOLLOW_41);
+            pushFollow(FOLLOW_40);
             lv_path_2_0=ruleNestedField();
 
             state._fsp--;
@@ -10638,17 +9135,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,76,FOLLOW_42); if (state.failed) return current;
+            otherlv_3=(Token)match(input,72,FOLLOW_41); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_3, grammarAccess.getPropertyAccess().getStyleKeyword_3());
               		
             }
-            // InternalTableDSL.g:3737:3: ( (lv_style_4_0= rulePropertyStyle ) )
-            // InternalTableDSL.g:3738:4: (lv_style_4_0= rulePropertyStyle )
+            // InternalTableDSL.g:3168:3: ( (lv_style_4_0= rulePropertyStyle ) )
+            // InternalTableDSL.g:3169:4: (lv_style_4_0= rulePropertyStyle )
             {
-            // InternalTableDSL.g:3738:4: (lv_style_4_0= rulePropertyStyle )
-            // InternalTableDSL.g:3739:5: lv_style_4_0= rulePropertyStyle
+            // InternalTableDSL.g:3169:4: (lv_style_4_0= rulePropertyStyle )
+            // InternalTableDSL.g:3170:5: lv_style_4_0= rulePropertyStyle
             {
             if ( state.backtracking==0 ) {
 
@@ -10704,7 +9201,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTableDtoDatasource"
-    // InternalTableDSL.g:3760:1: entryRuleTableDtoDatasource returns [EObject current=null] : iv_ruleTableDtoDatasource= ruleTableDtoDatasource EOF ;
+    // InternalTableDSL.g:3191:1: entryRuleTableDtoDatasource returns [EObject current=null] : iv_ruleTableDtoDatasource= ruleTableDtoDatasource EOF ;
     public final EObject entryRuleTableDtoDatasource() throws RecognitionException {
         EObject current = null;
 
@@ -10712,8 +9209,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:3760:59: (iv_ruleTableDtoDatasource= ruleTableDtoDatasource EOF )
-            // InternalTableDSL.g:3761:2: iv_ruleTableDtoDatasource= ruleTableDtoDatasource EOF
+            // InternalTableDSL.g:3191:59: (iv_ruleTableDtoDatasource= ruleTableDtoDatasource EOF )
+            // InternalTableDSL.g:3192:2: iv_ruleTableDtoDatasource= ruleTableDtoDatasource EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTableDtoDatasourceRule()); 
@@ -10744,7 +9241,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTableDtoDatasource"
-    // InternalTableDSL.g:3767:1: ruleTableDtoDatasource returns [EObject current=null] : (otherlv_0= 'dto' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_properties_3_0= ruleProperty ) )* otherlv_4= '}' )? ) ;
+    // InternalTableDSL.g:3198:1: ruleTableDtoDatasource returns [EObject current=null] : (otherlv_0= 'dto' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_properties_3_0= ruleProperty ) )* otherlv_4= '}' )? ) ;
     public final EObject ruleTableDtoDatasource() throws RecognitionException {
         EObject current = null;
 
@@ -10759,23 +9256,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:3773:2: ( (otherlv_0= 'dto' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_properties_3_0= ruleProperty ) )* otherlv_4= '}' )? ) )
-            // InternalTableDSL.g:3774:2: (otherlv_0= 'dto' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_properties_3_0= ruleProperty ) )* otherlv_4= '}' )? )
+            // InternalTableDSL.g:3204:2: ( (otherlv_0= 'dto' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_properties_3_0= ruleProperty ) )* otherlv_4= '}' )? ) )
+            // InternalTableDSL.g:3205:2: (otherlv_0= 'dto' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_properties_3_0= ruleProperty ) )* otherlv_4= '}' )? )
             {
-            // InternalTableDSL.g:3774:2: (otherlv_0= 'dto' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_properties_3_0= ruleProperty ) )* otherlv_4= '}' )? )
-            // InternalTableDSL.g:3775:3: otherlv_0= 'dto' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_properties_3_0= ruleProperty ) )* otherlv_4= '}' )?
+            // InternalTableDSL.g:3205:2: (otherlv_0= 'dto' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_properties_3_0= ruleProperty ) )* otherlv_4= '}' )? )
+            // InternalTableDSL.g:3206:3: otherlv_0= 'dto' ( (otherlv_1= RULE_ID ) ) (otherlv_2= '{' ( (lv_properties_3_0= ruleProperty ) )* otherlv_4= '}' )?
             {
-            otherlv_0=(Token)match(input,77,FOLLOW_4); if (state.failed) return current;
+            otherlv_0=(Token)match(input,73,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getTableDtoDatasourceAccess().getDtoKeyword_0());
               		
             }
-            // InternalTableDSL.g:3779:3: ( (otherlv_1= RULE_ID ) )
-            // InternalTableDSL.g:3780:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:3210:3: ( (otherlv_1= RULE_ID ) )
+            // InternalTableDSL.g:3211:4: (otherlv_1= RULE_ID )
             {
-            // InternalTableDSL.g:3780:4: (otherlv_1= RULE_ID )
-            // InternalTableDSL.g:3781:5: otherlv_1= RULE_ID
+            // InternalTableDSL.g:3211:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:3212:5: otherlv_1= RULE_ID
             {
             if ( state.backtracking==0 ) {
 
@@ -10796,47 +9293,47 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:3792:3: (otherlv_2= '{' ( (lv_properties_3_0= ruleProperty ) )* otherlv_4= '}' )?
-            int alt38=2;
-            int LA38_0 = input.LA(1);
+            // InternalTableDSL.g:3223:3: (otherlv_2= '{' ( (lv_properties_3_0= ruleProperty ) )* otherlv_4= '}' )?
+            int alt33=2;
+            int LA33_0 = input.LA(1);
 
-            if ( (LA38_0==16) ) {
-                alt38=1;
+            if ( (LA33_0==16) ) {
+                alt33=1;
             }
-            switch (alt38) {
+            switch (alt33) {
                 case 1 :
-                    // InternalTableDSL.g:3793:4: otherlv_2= '{' ( (lv_properties_3_0= ruleProperty ) )* otherlv_4= '}'
+                    // InternalTableDSL.g:3224:4: otherlv_2= '{' ( (lv_properties_3_0= ruleProperty ) )* otherlv_4= '}'
                     {
-                    otherlv_2=(Token)match(input,16,FOLLOW_43); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,16,FOLLOW_42); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_2, grammarAccess.getTableDtoDatasourceAccess().getLeftCurlyBracketKeyword_2_0());
                       			
                     }
-                    // InternalTableDSL.g:3797:4: ( (lv_properties_3_0= ruleProperty ) )*
-                    loop37:
+                    // InternalTableDSL.g:3228:4: ( (lv_properties_3_0= ruleProperty ) )*
+                    loop32:
                     do {
-                        int alt37=2;
-                        int LA37_0 = input.LA(1);
+                        int alt32=2;
+                        int LA32_0 = input.LA(1);
 
-                        if ( ((LA37_0>=74 && LA37_0<=75)) ) {
-                            alt37=1;
+                        if ( ((LA32_0>=70 && LA32_0<=71)) ) {
+                            alt32=1;
                         }
 
 
-                        switch (alt37) {
+                        switch (alt32) {
                     	case 1 :
-                    	    // InternalTableDSL.g:3798:5: (lv_properties_3_0= ruleProperty )
+                    	    // InternalTableDSL.g:3229:5: (lv_properties_3_0= ruleProperty )
                     	    {
-                    	    // InternalTableDSL.g:3798:5: (lv_properties_3_0= ruleProperty )
-                    	    // InternalTableDSL.g:3799:6: lv_properties_3_0= ruleProperty
+                    	    // InternalTableDSL.g:3229:5: (lv_properties_3_0= ruleProperty )
+                    	    // InternalTableDSL.g:3230:6: lv_properties_3_0= ruleProperty
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      						newCompositeNode(grammarAccess.getTableDtoDatasourceAccess().getPropertiesPropertyParserRuleCall_2_1_0());
                     	      					
                     	    }
-                    	    pushFollow(FOLLOW_43);
+                    	    pushFollow(FOLLOW_42);
                     	    lv_properties_3_0=ruleProperty();
 
                     	    state._fsp--;
@@ -10862,7 +9359,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop37;
+                    	    break loop32;
                         }
                     } while (true);
 
@@ -10903,7 +9400,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNestedField"
-    // InternalTableDSL.g:3825:1: entryRuleNestedField returns [EObject current=null] : iv_ruleNestedField= ruleNestedField EOF ;
+    // InternalTableDSL.g:3256:1: entryRuleNestedField returns [EObject current=null] : iv_ruleNestedField= ruleNestedField EOF ;
     public final EObject entryRuleNestedField() throws RecognitionException {
         EObject current = null;
 
@@ -10911,8 +9408,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:3825:52: (iv_ruleNestedField= ruleNestedField EOF )
-            // InternalTableDSL.g:3826:2: iv_ruleNestedField= ruleNestedField EOF
+            // InternalTableDSL.g:3256:52: (iv_ruleNestedField= ruleNestedField EOF )
+            // InternalTableDSL.g:3257:2: iv_ruleNestedField= ruleNestedField EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNestedFieldRule()); 
@@ -10943,7 +9440,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNestedField"
-    // InternalTableDSL.g:3832:1: ruleNestedField returns [EObject current=null] : ( () ( (otherlv_1= RULE_ID ) ) ( (lv_path_2_0= ruleNestedPath ) )? ) ;
+    // InternalTableDSL.g:3263:1: ruleNestedField returns [EObject current=null] : ( () ( (otherlv_1= RULE_ID ) ) ( (lv_path_2_0= ruleNestedPath ) )? ) ;
     public final EObject ruleNestedField() throws RecognitionException {
         EObject current = null;
 
@@ -10955,14 +9452,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:3838:2: ( ( () ( (otherlv_1= RULE_ID ) ) ( (lv_path_2_0= ruleNestedPath ) )? ) )
-            // InternalTableDSL.g:3839:2: ( () ( (otherlv_1= RULE_ID ) ) ( (lv_path_2_0= ruleNestedPath ) )? )
+            // InternalTableDSL.g:3269:2: ( ( () ( (otherlv_1= RULE_ID ) ) ( (lv_path_2_0= ruleNestedPath ) )? ) )
+            // InternalTableDSL.g:3270:2: ( () ( (otherlv_1= RULE_ID ) ) ( (lv_path_2_0= ruleNestedPath ) )? )
             {
-            // InternalTableDSL.g:3839:2: ( () ( (otherlv_1= RULE_ID ) ) ( (lv_path_2_0= ruleNestedPath ) )? )
-            // InternalTableDSL.g:3840:3: () ( (otherlv_1= RULE_ID ) ) ( (lv_path_2_0= ruleNestedPath ) )?
+            // InternalTableDSL.g:3270:2: ( () ( (otherlv_1= RULE_ID ) ) ( (lv_path_2_0= ruleNestedPath ) )? )
+            // InternalTableDSL.g:3271:3: () ( (otherlv_1= RULE_ID ) ) ( (lv_path_2_0= ruleNestedPath ) )?
             {
-            // InternalTableDSL.g:3840:3: ()
-            // InternalTableDSL.g:3841:4: 
+            // InternalTableDSL.g:3271:3: ()
+            // InternalTableDSL.g:3272:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -10974,11 +9471,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:3847:3: ( (otherlv_1= RULE_ID ) )
-            // InternalTableDSL.g:3848:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:3278:3: ( (otherlv_1= RULE_ID ) )
+            // InternalTableDSL.g:3279:4: (otherlv_1= RULE_ID )
             {
-            // InternalTableDSL.g:3848:4: (otherlv_1= RULE_ID )
-            // InternalTableDSL.g:3849:5: otherlv_1= RULE_ID
+            // InternalTableDSL.g:3279:4: (otherlv_1= RULE_ID )
+            // InternalTableDSL.g:3280:5: otherlv_1= RULE_ID
             {
             if ( state.backtracking==0 ) {
 
@@ -10987,7 +9484,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               					}
               				
             }
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_44); if (state.failed) return current;
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_43); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(otherlv_1, grammarAccess.getNestedFieldAccess().getFieldJvmOperationCrossReference_1_0());
@@ -10999,19 +9496,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:3860:3: ( (lv_path_2_0= ruleNestedPath ) )?
-            int alt39=2;
-            int LA39_0 = input.LA(1);
+            // InternalTableDSL.g:3291:3: ( (lv_path_2_0= ruleNestedPath ) )?
+            int alt34=2;
+            int LA34_0 = input.LA(1);
 
-            if ( (LA39_0==78) ) {
-                alt39=1;
+            if ( (LA34_0==74) ) {
+                alt34=1;
             }
-            switch (alt39) {
+            switch (alt34) {
                 case 1 :
-                    // InternalTableDSL.g:3861:4: (lv_path_2_0= ruleNestedPath )
+                    // InternalTableDSL.g:3292:4: (lv_path_2_0= ruleNestedPath )
                     {
-                    // InternalTableDSL.g:3861:4: (lv_path_2_0= ruleNestedPath )
-                    // InternalTableDSL.g:3862:5: lv_path_2_0= ruleNestedPath
+                    // InternalTableDSL.g:3292:4: (lv_path_2_0= ruleNestedPath )
+                    // InternalTableDSL.g:3293:5: lv_path_2_0= ruleNestedPath
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11070,7 +9567,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNestedPath"
-    // InternalTableDSL.g:3883:1: entryRuleNestedPath returns [EObject current=null] : iv_ruleNestedPath= ruleNestedPath EOF ;
+    // InternalTableDSL.g:3314:1: entryRuleNestedPath returns [EObject current=null] : iv_ruleNestedPath= ruleNestedPath EOF ;
     public final EObject entryRuleNestedPath() throws RecognitionException {
         EObject current = null;
 
@@ -11078,8 +9575,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:3883:51: (iv_ruleNestedPath= ruleNestedPath EOF )
-            // InternalTableDSL.g:3884:2: iv_ruleNestedPath= ruleNestedPath EOF
+            // InternalTableDSL.g:3314:51: (iv_ruleNestedPath= ruleNestedPath EOF )
+            // InternalTableDSL.g:3315:2: iv_ruleNestedPath= ruleNestedPath EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNestedPathRule()); 
@@ -11110,7 +9607,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNestedPath"
-    // InternalTableDSL.g:3890:1: ruleNestedPath returns [EObject current=null] : ( () otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ( (lv_path_3_0= ruleNestedPath ) )? ) ;
+    // InternalTableDSL.g:3321:1: ruleNestedPath returns [EObject current=null] : ( () otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ( (lv_path_3_0= ruleNestedPath ) )? ) ;
     public final EObject ruleNestedPath() throws RecognitionException {
         EObject current = null;
 
@@ -11123,14 +9620,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:3896:2: ( ( () otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ( (lv_path_3_0= ruleNestedPath ) )? ) )
-            // InternalTableDSL.g:3897:2: ( () otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ( (lv_path_3_0= ruleNestedPath ) )? )
+            // InternalTableDSL.g:3327:2: ( ( () otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ( (lv_path_3_0= ruleNestedPath ) )? ) )
+            // InternalTableDSL.g:3328:2: ( () otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ( (lv_path_3_0= ruleNestedPath ) )? )
             {
-            // InternalTableDSL.g:3897:2: ( () otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ( (lv_path_3_0= ruleNestedPath ) )? )
-            // InternalTableDSL.g:3898:3: () otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ( (lv_path_3_0= ruleNestedPath ) )?
+            // InternalTableDSL.g:3328:2: ( () otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ( (lv_path_3_0= ruleNestedPath ) )? )
+            // InternalTableDSL.g:3329:3: () otherlv_1= '.' ( (otherlv_2= RULE_ID ) ) ( (lv_path_3_0= ruleNestedPath ) )?
             {
-            // InternalTableDSL.g:3898:3: ()
-            // InternalTableDSL.g:3899:4: 
+            // InternalTableDSL.g:3329:3: ()
+            // InternalTableDSL.g:3330:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -11142,17 +9639,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,78,FOLLOW_4); if (state.failed) return current;
+            otherlv_1=(Token)match(input,74,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getNestedPathAccess().getFullStopKeyword_1());
               		
             }
-            // InternalTableDSL.g:3909:3: ( (otherlv_2= RULE_ID ) )
-            // InternalTableDSL.g:3910:4: (otherlv_2= RULE_ID )
+            // InternalTableDSL.g:3340:3: ( (otherlv_2= RULE_ID ) )
+            // InternalTableDSL.g:3341:4: (otherlv_2= RULE_ID )
             {
-            // InternalTableDSL.g:3910:4: (otherlv_2= RULE_ID )
-            // InternalTableDSL.g:3911:5: otherlv_2= RULE_ID
+            // InternalTableDSL.g:3341:4: (otherlv_2= RULE_ID )
+            // InternalTableDSL.g:3342:5: otherlv_2= RULE_ID
             {
             if ( state.backtracking==0 ) {
 
@@ -11161,7 +9658,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               					}
               				
             }
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_44); if (state.failed) return current;
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_43); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(otherlv_2, grammarAccess.getNestedPathAccess().getFieldJvmOperationCrossReference_2_0());
@@ -11173,19 +9670,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:3922:3: ( (lv_path_3_0= ruleNestedPath ) )?
-            int alt40=2;
-            int LA40_0 = input.LA(1);
+            // InternalTableDSL.g:3353:3: ( (lv_path_3_0= ruleNestedPath ) )?
+            int alt35=2;
+            int LA35_0 = input.LA(1);
 
-            if ( (LA40_0==78) ) {
-                alt40=1;
+            if ( (LA35_0==74) ) {
+                alt35=1;
             }
-            switch (alt40) {
+            switch (alt35) {
                 case 1 :
-                    // InternalTableDSL.g:3923:4: (lv_path_3_0= ruleNestedPath )
+                    // InternalTableDSL.g:3354:4: (lv_path_3_0= ruleNestedPath )
                     {
-                    // InternalTableDSL.g:3923:4: (lv_path_3_0= ruleNestedPath )
-                    // InternalTableDSL.g:3924:5: lv_path_3_0= ruleNestedPath
+                    // InternalTableDSL.g:3354:4: (lv_path_3_0= ruleNestedPath )
+                    // InternalTableDSL.g:3355:5: lv_path_3_0= ruleNestedPath
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11244,7 +9741,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePropertyStyle"
-    // InternalTableDSL.g:3945:1: entryRulePropertyStyle returns [EObject current=null] : iv_rulePropertyStyle= rulePropertyStyle EOF ;
+    // InternalTableDSL.g:3376:1: entryRulePropertyStyle returns [EObject current=null] : iv_rulePropertyStyle= rulePropertyStyle EOF ;
     public final EObject entryRulePropertyStyle() throws RecognitionException {
         EObject current = null;
 
@@ -11252,8 +9749,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:3945:54: (iv_rulePropertyStyle= rulePropertyStyle EOF )
-            // InternalTableDSL.g:3946:2: iv_rulePropertyStyle= rulePropertyStyle EOF
+            // InternalTableDSL.g:3376:54: (iv_rulePropertyStyle= rulePropertyStyle EOF )
+            // InternalTableDSL.g:3377:2: iv_rulePropertyStyle= rulePropertyStyle EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getPropertyStyleRule()); 
@@ -11284,7 +9781,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePropertyStyle"
-    // InternalTableDSL.g:3952:1: rulePropertyStyle returns [EObject current=null] : (this_PropertyButtonStyle_0= rulePropertyButtonStyle | this_PropertyHtmlStyle_1= rulePropertyHtmlStyle | this_PropertyProgressbarStyle_2= rulePropertyProgressbarStyle | this_PropertyTextStyle_3= rulePropertyTextStyle | this_PropertyBooleanStyle_4= rulePropertyBooleanStyle | this_PropertyDateStyle_5= rulePropertyDateStyle | this_PropertyNumberStyle_6= rulePropertyNumberStyle | this_PropertyImageStyle_7= rulePropertyImageStyle | this_GridPropIndicatorStyle_8= ruleGridPropIndicatorStyle ) ;
+    // InternalTableDSL.g:3383:1: rulePropertyStyle returns [EObject current=null] : (this_PropertyButtonStyle_0= rulePropertyButtonStyle | this_PropertyHtmlStyle_1= rulePropertyHtmlStyle | this_PropertyProgressbarStyle_2= rulePropertyProgressbarStyle | this_PropertyTextStyle_3= rulePropertyTextStyle | this_PropertyBooleanStyle_4= rulePropertyBooleanStyle | this_PropertyDateStyle_5= rulePropertyDateStyle | this_PropertyNumberStyle_6= rulePropertyNumberStyle | this_PropertyImageStyle_7= rulePropertyImageStyle | this_PropertyBlobImageStyle_8= rulePropertyBlobImageStyle | this_GridPropIndicatorStyle_9= ruleGridPropIndicatorStyle ) ;
     public final EObject rulePropertyStyle() throws RecognitionException {
         EObject current = null;
 
@@ -11304,75 +9801,82 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
         EObject this_PropertyImageStyle_7 = null;
 
-        EObject this_GridPropIndicatorStyle_8 = null;
+        EObject this_PropertyBlobImageStyle_8 = null;
+
+        EObject this_GridPropIndicatorStyle_9 = null;
 
 
 
         	enterRule();
 
         try {
-            // InternalTableDSL.g:3958:2: ( (this_PropertyButtonStyle_0= rulePropertyButtonStyle | this_PropertyHtmlStyle_1= rulePropertyHtmlStyle | this_PropertyProgressbarStyle_2= rulePropertyProgressbarStyle | this_PropertyTextStyle_3= rulePropertyTextStyle | this_PropertyBooleanStyle_4= rulePropertyBooleanStyle | this_PropertyDateStyle_5= rulePropertyDateStyle | this_PropertyNumberStyle_6= rulePropertyNumberStyle | this_PropertyImageStyle_7= rulePropertyImageStyle | this_GridPropIndicatorStyle_8= ruleGridPropIndicatorStyle ) )
-            // InternalTableDSL.g:3959:2: (this_PropertyButtonStyle_0= rulePropertyButtonStyle | this_PropertyHtmlStyle_1= rulePropertyHtmlStyle | this_PropertyProgressbarStyle_2= rulePropertyProgressbarStyle | this_PropertyTextStyle_3= rulePropertyTextStyle | this_PropertyBooleanStyle_4= rulePropertyBooleanStyle | this_PropertyDateStyle_5= rulePropertyDateStyle | this_PropertyNumberStyle_6= rulePropertyNumberStyle | this_PropertyImageStyle_7= rulePropertyImageStyle | this_GridPropIndicatorStyle_8= ruleGridPropIndicatorStyle )
+            // InternalTableDSL.g:3389:2: ( (this_PropertyButtonStyle_0= rulePropertyButtonStyle | this_PropertyHtmlStyle_1= rulePropertyHtmlStyle | this_PropertyProgressbarStyle_2= rulePropertyProgressbarStyle | this_PropertyTextStyle_3= rulePropertyTextStyle | this_PropertyBooleanStyle_4= rulePropertyBooleanStyle | this_PropertyDateStyle_5= rulePropertyDateStyle | this_PropertyNumberStyle_6= rulePropertyNumberStyle | this_PropertyImageStyle_7= rulePropertyImageStyle | this_PropertyBlobImageStyle_8= rulePropertyBlobImageStyle | this_GridPropIndicatorStyle_9= ruleGridPropIndicatorStyle ) )
+            // InternalTableDSL.g:3390:2: (this_PropertyButtonStyle_0= rulePropertyButtonStyle | this_PropertyHtmlStyle_1= rulePropertyHtmlStyle | this_PropertyProgressbarStyle_2= rulePropertyProgressbarStyle | this_PropertyTextStyle_3= rulePropertyTextStyle | this_PropertyBooleanStyle_4= rulePropertyBooleanStyle | this_PropertyDateStyle_5= rulePropertyDateStyle | this_PropertyNumberStyle_6= rulePropertyNumberStyle | this_PropertyImageStyle_7= rulePropertyImageStyle | this_PropertyBlobImageStyle_8= rulePropertyBlobImageStyle | this_GridPropIndicatorStyle_9= ruleGridPropIndicatorStyle )
             {
-            // InternalTableDSL.g:3959:2: (this_PropertyButtonStyle_0= rulePropertyButtonStyle | this_PropertyHtmlStyle_1= rulePropertyHtmlStyle | this_PropertyProgressbarStyle_2= rulePropertyProgressbarStyle | this_PropertyTextStyle_3= rulePropertyTextStyle | this_PropertyBooleanStyle_4= rulePropertyBooleanStyle | this_PropertyDateStyle_5= rulePropertyDateStyle | this_PropertyNumberStyle_6= rulePropertyNumberStyle | this_PropertyImageStyle_7= rulePropertyImageStyle | this_GridPropIndicatorStyle_8= ruleGridPropIndicatorStyle )
-            int alt41=9;
+            // InternalTableDSL.g:3390:2: (this_PropertyButtonStyle_0= rulePropertyButtonStyle | this_PropertyHtmlStyle_1= rulePropertyHtmlStyle | this_PropertyProgressbarStyle_2= rulePropertyProgressbarStyle | this_PropertyTextStyle_3= rulePropertyTextStyle | this_PropertyBooleanStyle_4= rulePropertyBooleanStyle | this_PropertyDateStyle_5= rulePropertyDateStyle | this_PropertyNumberStyle_6= rulePropertyNumberStyle | this_PropertyImageStyle_7= rulePropertyImageStyle | this_PropertyBlobImageStyle_8= rulePropertyBlobImageStyle | this_GridPropIndicatorStyle_9= ruleGridPropIndicatorStyle )
+            int alt36=10;
             switch ( input.LA(1) ) {
-            case 79:
+            case 75:
                 {
-                alt41=1;
+                alt36=1;
                 }
                 break;
-            case 81:
+            case 77:
                 {
-                alt41=2;
+                alt36=2;
                 }
                 break;
-            case 86:
+            case 82:
                 {
-                alt41=3;
+                alt36=3;
                 }
                 break;
-            case 91:
+            case 87:
                 {
-                alt41=4;
+                alt36=4;
                 }
                 break;
-            case 82:
+            case 78:
                 {
-                alt41=5;
+                alt36=5;
                 }
                 break;
-            case 83:
+            case 79:
                 {
-                alt41=6;
+                alt36=6;
                 }
                 break;
-            case 85:
+            case 81:
                 {
-                alt41=7;
+                alt36=7;
                 }
                 break;
-            case 92:
+            case 89:
                 {
-                alt41=8;
+                alt36=8;
                 }
                 break;
             case 88:
                 {
-                alt41=9;
+                alt36=9;
+                }
+                break;
+            case 84:
+                {
+                alt36=10;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 41, 0, input);
+                    new NoViableAltException("", 36, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt41) {
+            switch (alt36) {
                 case 1 :
-                    // InternalTableDSL.g:3960:3: this_PropertyButtonStyle_0= rulePropertyButtonStyle
+                    // InternalTableDSL.g:3391:3: this_PropertyButtonStyle_0= rulePropertyButtonStyle
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11394,7 +9898,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:3969:3: this_PropertyHtmlStyle_1= rulePropertyHtmlStyle
+                    // InternalTableDSL.g:3400:3: this_PropertyHtmlStyle_1= rulePropertyHtmlStyle
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11416,7 +9920,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:3978:3: this_PropertyProgressbarStyle_2= rulePropertyProgressbarStyle
+                    // InternalTableDSL.g:3409:3: this_PropertyProgressbarStyle_2= rulePropertyProgressbarStyle
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11438,7 +9942,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:3987:3: this_PropertyTextStyle_3= rulePropertyTextStyle
+                    // InternalTableDSL.g:3418:3: this_PropertyTextStyle_3= rulePropertyTextStyle
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11460,7 +9964,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:3996:3: this_PropertyBooleanStyle_4= rulePropertyBooleanStyle
+                    // InternalTableDSL.g:3427:3: this_PropertyBooleanStyle_4= rulePropertyBooleanStyle
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11482,7 +9986,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 6 :
-                    // InternalTableDSL.g:4005:3: this_PropertyDateStyle_5= rulePropertyDateStyle
+                    // InternalTableDSL.g:3436:3: this_PropertyDateStyle_5= rulePropertyDateStyle
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11504,7 +10008,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 7 :
-                    // InternalTableDSL.g:4014:3: this_PropertyNumberStyle_6= rulePropertyNumberStyle
+                    // InternalTableDSL.g:3445:3: this_PropertyNumberStyle_6= rulePropertyNumberStyle
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11526,7 +10030,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 8 :
-                    // InternalTableDSL.g:4023:3: this_PropertyImageStyle_7= rulePropertyImageStyle
+                    // InternalTableDSL.g:3454:3: this_PropertyImageStyle_7= rulePropertyImageStyle
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11548,21 +10052,43 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 9 :
-                    // InternalTableDSL.g:4032:3: this_GridPropIndicatorStyle_8= ruleGridPropIndicatorStyle
+                    // InternalTableDSL.g:3463:3: this_PropertyBlobImageStyle_8= rulePropertyBlobImageStyle
                     {
                     if ( state.backtracking==0 ) {
 
-                      			newCompositeNode(grammarAccess.getPropertyStyleAccess().getGridPropIndicatorStyleParserRuleCall_8());
+                      			newCompositeNode(grammarAccess.getPropertyStyleAccess().getPropertyBlobImageStyleParserRuleCall_8());
                       		
                     }
                     pushFollow(FOLLOW_2);
-                    this_GridPropIndicatorStyle_8=ruleGridPropIndicatorStyle();
+                    this_PropertyBlobImageStyle_8=rulePropertyBlobImageStyle();
 
                     state._fsp--;
                     if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      			current = this_GridPropIndicatorStyle_8;
+                      			current = this_PropertyBlobImageStyle_8;
+                      			afterParserOrEnumRuleCall();
+                      		
+                    }
+
+                    }
+                    break;
+                case 10 :
+                    // InternalTableDSL.g:3472:3: this_GridPropIndicatorStyle_9= ruleGridPropIndicatorStyle
+                    {
+                    if ( state.backtracking==0 ) {
+
+                      			newCompositeNode(grammarAccess.getPropertyStyleAccess().getGridPropIndicatorStyleParserRuleCall_9());
+                      		
+                    }
+                    pushFollow(FOLLOW_2);
+                    this_GridPropIndicatorStyle_9=ruleGridPropIndicatorStyle();
+
+                    state._fsp--;
+                    if (state.failed) return current;
+                    if ( state.backtracking==0 ) {
+
+                      			current = this_GridPropIndicatorStyle_9;
                       			afterParserOrEnumRuleCall();
                       		
                     }
@@ -11594,7 +10120,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePropertyButtonStyle"
-    // InternalTableDSL.g:4044:1: entryRulePropertyButtonStyle returns [EObject current=null] : iv_rulePropertyButtonStyle= rulePropertyButtonStyle EOF ;
+    // InternalTableDSL.g:3484:1: entryRulePropertyButtonStyle returns [EObject current=null] : iv_rulePropertyButtonStyle= rulePropertyButtonStyle EOF ;
     public final EObject entryRulePropertyButtonStyle() throws RecognitionException {
         EObject current = null;
 
@@ -11602,8 +10128,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4044:60: (iv_rulePropertyButtonStyle= rulePropertyButtonStyle EOF )
-            // InternalTableDSL.g:4045:2: iv_rulePropertyButtonStyle= rulePropertyButtonStyle EOF
+            // InternalTableDSL.g:3484:60: (iv_rulePropertyButtonStyle= rulePropertyButtonStyle EOF )
+            // InternalTableDSL.g:3485:2: iv_rulePropertyButtonStyle= rulePropertyButtonStyle EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getPropertyButtonStyleRule()); 
@@ -11634,7 +10160,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePropertyButtonStyle"
-    // InternalTableDSL.g:4051:1: rulePropertyButtonStyle returns [EObject current=null] : ( () otherlv_1= 'buttonStyle' otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) ) ;
+    // InternalTableDSL.g:3491:1: rulePropertyButtonStyle returns [EObject current=null] : ( () otherlv_1= 'buttonStyle' otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) ) ;
     public final EObject rulePropertyButtonStyle() throws RecognitionException {
         EObject current = null;
 
@@ -11646,14 +10172,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4057:2: ( ( () otherlv_1= 'buttonStyle' otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) ) )
-            // InternalTableDSL.g:4058:2: ( () otherlv_1= 'buttonStyle' otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:3497:2: ( ( () otherlv_1= 'buttonStyle' otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) ) )
+            // InternalTableDSL.g:3498:2: ( () otherlv_1= 'buttonStyle' otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )
             {
-            // InternalTableDSL.g:4058:2: ( () otherlv_1= 'buttonStyle' otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )
-            // InternalTableDSL.g:4059:3: () otherlv_1= 'buttonStyle' otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) )
+            // InternalTableDSL.g:3498:2: ( () otherlv_1= 'buttonStyle' otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:3499:3: () otherlv_1= 'buttonStyle' otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) )
             {
-            // InternalTableDSL.g:4059:3: ()
-            // InternalTableDSL.g:4060:4: 
+            // InternalTableDSL.g:3499:3: ()
+            // InternalTableDSL.g:3500:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -11665,23 +10191,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,79,FOLLOW_45); if (state.failed) return current;
+            otherlv_1=(Token)match(input,75,FOLLOW_44); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getPropertyButtonStyleAccess().getButtonStyleKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,80,FOLLOW_8); if (state.failed) return current;
+            otherlv_2=(Token)match(input,76,FOLLOW_8); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getPropertyButtonStyleAccess().getEventTopicKeyword_2());
               		
             }
-            // InternalTableDSL.g:4074:3: ( (lv_eventTopic_3_0= RULE_STRING ) )
-            // InternalTableDSL.g:4075:4: (lv_eventTopic_3_0= RULE_STRING )
+            // InternalTableDSL.g:3514:3: ( (lv_eventTopic_3_0= RULE_STRING ) )
+            // InternalTableDSL.g:3515:4: (lv_eventTopic_3_0= RULE_STRING )
             {
-            // InternalTableDSL.g:4075:4: (lv_eventTopic_3_0= RULE_STRING )
-            // InternalTableDSL.g:4076:5: lv_eventTopic_3_0= RULE_STRING
+            // InternalTableDSL.g:3515:4: (lv_eventTopic_3_0= RULE_STRING )
+            // InternalTableDSL.g:3516:5: lv_eventTopic_3_0= RULE_STRING
             {
             lv_eventTopic_3_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
@@ -11732,7 +10258,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePropertyHtmlStyle"
-    // InternalTableDSL.g:4096:1: entryRulePropertyHtmlStyle returns [EObject current=null] : iv_rulePropertyHtmlStyle= rulePropertyHtmlStyle EOF ;
+    // InternalTableDSL.g:3536:1: entryRulePropertyHtmlStyle returns [EObject current=null] : iv_rulePropertyHtmlStyle= rulePropertyHtmlStyle EOF ;
     public final EObject entryRulePropertyHtmlStyle() throws RecognitionException {
         EObject current = null;
 
@@ -11740,8 +10266,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4096:58: (iv_rulePropertyHtmlStyle= rulePropertyHtmlStyle EOF )
-            // InternalTableDSL.g:4097:2: iv_rulePropertyHtmlStyle= rulePropertyHtmlStyle EOF
+            // InternalTableDSL.g:3536:58: (iv_rulePropertyHtmlStyle= rulePropertyHtmlStyle EOF )
+            // InternalTableDSL.g:3537:2: iv_rulePropertyHtmlStyle= rulePropertyHtmlStyle EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getPropertyHtmlStyleRule()); 
@@ -11772,7 +10298,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePropertyHtmlStyle"
-    // InternalTableDSL.g:4103:1: rulePropertyHtmlStyle returns [EObject current=null] : ( () otherlv_1= 'htmlStyle' ) ;
+    // InternalTableDSL.g:3543:1: rulePropertyHtmlStyle returns [EObject current=null] : ( () otherlv_1= 'htmlStyle' ) ;
     public final EObject rulePropertyHtmlStyle() throws RecognitionException {
         EObject current = null;
 
@@ -11782,14 +10308,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4109:2: ( ( () otherlv_1= 'htmlStyle' ) )
-            // InternalTableDSL.g:4110:2: ( () otherlv_1= 'htmlStyle' )
+            // InternalTableDSL.g:3549:2: ( ( () otherlv_1= 'htmlStyle' ) )
+            // InternalTableDSL.g:3550:2: ( () otherlv_1= 'htmlStyle' )
             {
-            // InternalTableDSL.g:4110:2: ( () otherlv_1= 'htmlStyle' )
-            // InternalTableDSL.g:4111:3: () otherlv_1= 'htmlStyle'
+            // InternalTableDSL.g:3550:2: ( () otherlv_1= 'htmlStyle' )
+            // InternalTableDSL.g:3551:3: () otherlv_1= 'htmlStyle'
             {
-            // InternalTableDSL.g:4111:3: ()
-            // InternalTableDSL.g:4112:4: 
+            // InternalTableDSL.g:3551:3: ()
+            // InternalTableDSL.g:3552:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -11801,7 +10327,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,81,FOLLOW_2); if (state.failed) return current;
+            otherlv_1=(Token)match(input,77,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getPropertyHtmlStyleAccess().getHtmlStyleKeyword_1());
@@ -11832,7 +10358,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePropertyBooleanStyle"
-    // InternalTableDSL.g:4126:1: entryRulePropertyBooleanStyle returns [EObject current=null] : iv_rulePropertyBooleanStyle= rulePropertyBooleanStyle EOF ;
+    // InternalTableDSL.g:3566:1: entryRulePropertyBooleanStyle returns [EObject current=null] : iv_rulePropertyBooleanStyle= rulePropertyBooleanStyle EOF ;
     public final EObject entryRulePropertyBooleanStyle() throws RecognitionException {
         EObject current = null;
 
@@ -11840,8 +10366,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4126:61: (iv_rulePropertyBooleanStyle= rulePropertyBooleanStyle EOF )
-            // InternalTableDSL.g:4127:2: iv_rulePropertyBooleanStyle= rulePropertyBooleanStyle EOF
+            // InternalTableDSL.g:3566:61: (iv_rulePropertyBooleanStyle= rulePropertyBooleanStyle EOF )
+            // InternalTableDSL.g:3567:2: iv_rulePropertyBooleanStyle= rulePropertyBooleanStyle EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getPropertyBooleanStyleRule()); 
@@ -11872,7 +10398,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePropertyBooleanStyle"
-    // InternalTableDSL.g:4133:1: rulePropertyBooleanStyle returns [EObject current=null] : ( () otherlv_1= 'boolStyle' ) ;
+    // InternalTableDSL.g:3573:1: rulePropertyBooleanStyle returns [EObject current=null] : ( () otherlv_1= 'boolStyle' ) ;
     public final EObject rulePropertyBooleanStyle() throws RecognitionException {
         EObject current = null;
 
@@ -11882,14 +10408,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4139:2: ( ( () otherlv_1= 'boolStyle' ) )
-            // InternalTableDSL.g:4140:2: ( () otherlv_1= 'boolStyle' )
+            // InternalTableDSL.g:3579:2: ( ( () otherlv_1= 'boolStyle' ) )
+            // InternalTableDSL.g:3580:2: ( () otherlv_1= 'boolStyle' )
             {
-            // InternalTableDSL.g:4140:2: ( () otherlv_1= 'boolStyle' )
-            // InternalTableDSL.g:4141:3: () otherlv_1= 'boolStyle'
+            // InternalTableDSL.g:3580:2: ( () otherlv_1= 'boolStyle' )
+            // InternalTableDSL.g:3581:3: () otherlv_1= 'boolStyle'
             {
-            // InternalTableDSL.g:4141:3: ()
-            // InternalTableDSL.g:4142:4: 
+            // InternalTableDSL.g:3581:3: ()
+            // InternalTableDSL.g:3582:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -11901,7 +10427,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,82,FOLLOW_2); if (state.failed) return current;
+            otherlv_1=(Token)match(input,78,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getPropertyBooleanStyleAccess().getBoolStyleKeyword_1());
@@ -11932,7 +10458,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePropertyDateStyle"
-    // InternalTableDSL.g:4156:1: entryRulePropertyDateStyle returns [EObject current=null] : iv_rulePropertyDateStyle= rulePropertyDateStyle EOF ;
+    // InternalTableDSL.g:3596:1: entryRulePropertyDateStyle returns [EObject current=null] : iv_rulePropertyDateStyle= rulePropertyDateStyle EOF ;
     public final EObject entryRulePropertyDateStyle() throws RecognitionException {
         EObject current = null;
 
@@ -11940,8 +10466,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4156:58: (iv_rulePropertyDateStyle= rulePropertyDateStyle EOF )
-            // InternalTableDSL.g:4157:2: iv_rulePropertyDateStyle= rulePropertyDateStyle EOF
+            // InternalTableDSL.g:3596:58: (iv_rulePropertyDateStyle= rulePropertyDateStyle EOF )
+            // InternalTableDSL.g:3597:2: iv_rulePropertyDateStyle= rulePropertyDateStyle EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getPropertyDateStyleRule()); 
@@ -11972,7 +10498,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePropertyDateStyle"
-    // InternalTableDSL.g:4163:1: rulePropertyDateStyle returns [EObject current=null] : ( () otherlv_1= 'dateStyle' otherlv_2= 'format' ( (lv_dateFormat_3_0= RULE_STRING ) ) ) ;
+    // InternalTableDSL.g:3603:1: rulePropertyDateStyle returns [EObject current=null] : ( () otherlv_1= 'dateStyle' otherlv_2= 'format' ( (lv_dateFormat_3_0= RULE_STRING ) ) ) ;
     public final EObject rulePropertyDateStyle() throws RecognitionException {
         EObject current = null;
 
@@ -11984,14 +10510,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4169:2: ( ( () otherlv_1= 'dateStyle' otherlv_2= 'format' ( (lv_dateFormat_3_0= RULE_STRING ) ) ) )
-            // InternalTableDSL.g:4170:2: ( () otherlv_1= 'dateStyle' otherlv_2= 'format' ( (lv_dateFormat_3_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:3609:2: ( ( () otherlv_1= 'dateStyle' otherlv_2= 'format' ( (lv_dateFormat_3_0= RULE_STRING ) ) ) )
+            // InternalTableDSL.g:3610:2: ( () otherlv_1= 'dateStyle' otherlv_2= 'format' ( (lv_dateFormat_3_0= RULE_STRING ) ) )
             {
-            // InternalTableDSL.g:4170:2: ( () otherlv_1= 'dateStyle' otherlv_2= 'format' ( (lv_dateFormat_3_0= RULE_STRING ) ) )
-            // InternalTableDSL.g:4171:3: () otherlv_1= 'dateStyle' otherlv_2= 'format' ( (lv_dateFormat_3_0= RULE_STRING ) )
+            // InternalTableDSL.g:3610:2: ( () otherlv_1= 'dateStyle' otherlv_2= 'format' ( (lv_dateFormat_3_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:3611:3: () otherlv_1= 'dateStyle' otherlv_2= 'format' ( (lv_dateFormat_3_0= RULE_STRING ) )
             {
-            // InternalTableDSL.g:4171:3: ()
-            // InternalTableDSL.g:4172:4: 
+            // InternalTableDSL.g:3611:3: ()
+            // InternalTableDSL.g:3612:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -12003,23 +10529,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,83,FOLLOW_46); if (state.failed) return current;
+            otherlv_1=(Token)match(input,79,FOLLOW_45); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getPropertyDateStyleAccess().getDateStyleKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,84,FOLLOW_8); if (state.failed) return current;
+            otherlv_2=(Token)match(input,80,FOLLOW_8); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getPropertyDateStyleAccess().getFormatKeyword_2());
               		
             }
-            // InternalTableDSL.g:4186:3: ( (lv_dateFormat_3_0= RULE_STRING ) )
-            // InternalTableDSL.g:4187:4: (lv_dateFormat_3_0= RULE_STRING )
+            // InternalTableDSL.g:3626:3: ( (lv_dateFormat_3_0= RULE_STRING ) )
+            // InternalTableDSL.g:3627:4: (lv_dateFormat_3_0= RULE_STRING )
             {
-            // InternalTableDSL.g:4187:4: (lv_dateFormat_3_0= RULE_STRING )
-            // InternalTableDSL.g:4188:5: lv_dateFormat_3_0= RULE_STRING
+            // InternalTableDSL.g:3627:4: (lv_dateFormat_3_0= RULE_STRING )
+            // InternalTableDSL.g:3628:5: lv_dateFormat_3_0= RULE_STRING
             {
             lv_dateFormat_3_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
@@ -12070,7 +10596,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePropertyNumberStyle"
-    // InternalTableDSL.g:4208:1: entryRulePropertyNumberStyle returns [EObject current=null] : iv_rulePropertyNumberStyle= rulePropertyNumberStyle EOF ;
+    // InternalTableDSL.g:3648:1: entryRulePropertyNumberStyle returns [EObject current=null] : iv_rulePropertyNumberStyle= rulePropertyNumberStyle EOF ;
     public final EObject entryRulePropertyNumberStyle() throws RecognitionException {
         EObject current = null;
 
@@ -12078,8 +10604,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4208:60: (iv_rulePropertyNumberStyle= rulePropertyNumberStyle EOF )
-            // InternalTableDSL.g:4209:2: iv_rulePropertyNumberStyle= rulePropertyNumberStyle EOF
+            // InternalTableDSL.g:3648:60: (iv_rulePropertyNumberStyle= rulePropertyNumberStyle EOF )
+            // InternalTableDSL.g:3649:2: iv_rulePropertyNumberStyle= rulePropertyNumberStyle EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getPropertyNumberStyleRule()); 
@@ -12110,7 +10636,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePropertyNumberStyle"
-    // InternalTableDSL.g:4215:1: rulePropertyNumberStyle returns [EObject current=null] : ( () otherlv_1= 'numberStyle' otherlv_2= 'format' ( (lv_numberFormat_3_0= RULE_STRING ) ) ) ;
+    // InternalTableDSL.g:3655:1: rulePropertyNumberStyle returns [EObject current=null] : ( () otherlv_1= 'numberStyle' otherlv_2= 'format' ( (lv_numberFormat_3_0= RULE_STRING ) ) ) ;
     public final EObject rulePropertyNumberStyle() throws RecognitionException {
         EObject current = null;
 
@@ -12122,14 +10648,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4221:2: ( ( () otherlv_1= 'numberStyle' otherlv_2= 'format' ( (lv_numberFormat_3_0= RULE_STRING ) ) ) )
-            // InternalTableDSL.g:4222:2: ( () otherlv_1= 'numberStyle' otherlv_2= 'format' ( (lv_numberFormat_3_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:3661:2: ( ( () otherlv_1= 'numberStyle' otherlv_2= 'format' ( (lv_numberFormat_3_0= RULE_STRING ) ) ) )
+            // InternalTableDSL.g:3662:2: ( () otherlv_1= 'numberStyle' otherlv_2= 'format' ( (lv_numberFormat_3_0= RULE_STRING ) ) )
             {
-            // InternalTableDSL.g:4222:2: ( () otherlv_1= 'numberStyle' otherlv_2= 'format' ( (lv_numberFormat_3_0= RULE_STRING ) ) )
-            // InternalTableDSL.g:4223:3: () otherlv_1= 'numberStyle' otherlv_2= 'format' ( (lv_numberFormat_3_0= RULE_STRING ) )
+            // InternalTableDSL.g:3662:2: ( () otherlv_1= 'numberStyle' otherlv_2= 'format' ( (lv_numberFormat_3_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:3663:3: () otherlv_1= 'numberStyle' otherlv_2= 'format' ( (lv_numberFormat_3_0= RULE_STRING ) )
             {
-            // InternalTableDSL.g:4223:3: ()
-            // InternalTableDSL.g:4224:4: 
+            // InternalTableDSL.g:3663:3: ()
+            // InternalTableDSL.g:3664:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -12141,23 +10667,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,85,FOLLOW_46); if (state.failed) return current;
+            otherlv_1=(Token)match(input,81,FOLLOW_45); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getPropertyNumberStyleAccess().getNumberStyleKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,84,FOLLOW_8); if (state.failed) return current;
+            otherlv_2=(Token)match(input,80,FOLLOW_8); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getPropertyNumberStyleAccess().getFormatKeyword_2());
               		
             }
-            // InternalTableDSL.g:4238:3: ( (lv_numberFormat_3_0= RULE_STRING ) )
-            // InternalTableDSL.g:4239:4: (lv_numberFormat_3_0= RULE_STRING )
+            // InternalTableDSL.g:3678:3: ( (lv_numberFormat_3_0= RULE_STRING ) )
+            // InternalTableDSL.g:3679:4: (lv_numberFormat_3_0= RULE_STRING )
             {
-            // InternalTableDSL.g:4239:4: (lv_numberFormat_3_0= RULE_STRING )
-            // InternalTableDSL.g:4240:5: lv_numberFormat_3_0= RULE_STRING
+            // InternalTableDSL.g:3679:4: (lv_numberFormat_3_0= RULE_STRING )
+            // InternalTableDSL.g:3680:5: lv_numberFormat_3_0= RULE_STRING
             {
             lv_numberFormat_3_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
@@ -12208,7 +10734,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePropertyProgressbarStyle"
-    // InternalTableDSL.g:4260:1: entryRulePropertyProgressbarStyle returns [EObject current=null] : iv_rulePropertyProgressbarStyle= rulePropertyProgressbarStyle EOF ;
+    // InternalTableDSL.g:3700:1: entryRulePropertyProgressbarStyle returns [EObject current=null] : iv_rulePropertyProgressbarStyle= rulePropertyProgressbarStyle EOF ;
     public final EObject entryRulePropertyProgressbarStyle() throws RecognitionException {
         EObject current = null;
 
@@ -12216,8 +10742,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4260:65: (iv_rulePropertyProgressbarStyle= rulePropertyProgressbarStyle EOF )
-            // InternalTableDSL.g:4261:2: iv_rulePropertyProgressbarStyle= rulePropertyProgressbarStyle EOF
+            // InternalTableDSL.g:3700:65: (iv_rulePropertyProgressbarStyle= rulePropertyProgressbarStyle EOF )
+            // InternalTableDSL.g:3701:2: iv_rulePropertyProgressbarStyle= rulePropertyProgressbarStyle EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getPropertyProgressbarStyleRule()); 
@@ -12248,7 +10774,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePropertyProgressbarStyle"
-    // InternalTableDSL.g:4267:1: rulePropertyProgressbarStyle returns [EObject current=null] : ( () otherlv_1= 'progressbarStyle' otherlv_2= 'max' ( (lv_maxValue_3_0= ruleLDouble ) ) ) ;
+    // InternalTableDSL.g:3707:1: rulePropertyProgressbarStyle returns [EObject current=null] : ( () otherlv_1= 'progressbarStyle' otherlv_2= 'max' ( (lv_maxValue_3_0= ruleLDouble ) ) ) ;
     public final EObject rulePropertyProgressbarStyle() throws RecognitionException {
         EObject current = null;
 
@@ -12261,14 +10787,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4273:2: ( ( () otherlv_1= 'progressbarStyle' otherlv_2= 'max' ( (lv_maxValue_3_0= ruleLDouble ) ) ) )
-            // InternalTableDSL.g:4274:2: ( () otherlv_1= 'progressbarStyle' otherlv_2= 'max' ( (lv_maxValue_3_0= ruleLDouble ) ) )
+            // InternalTableDSL.g:3713:2: ( ( () otherlv_1= 'progressbarStyle' otherlv_2= 'max' ( (lv_maxValue_3_0= ruleLDouble ) ) ) )
+            // InternalTableDSL.g:3714:2: ( () otherlv_1= 'progressbarStyle' otherlv_2= 'max' ( (lv_maxValue_3_0= ruleLDouble ) ) )
             {
-            // InternalTableDSL.g:4274:2: ( () otherlv_1= 'progressbarStyle' otherlv_2= 'max' ( (lv_maxValue_3_0= ruleLDouble ) ) )
-            // InternalTableDSL.g:4275:3: () otherlv_1= 'progressbarStyle' otherlv_2= 'max' ( (lv_maxValue_3_0= ruleLDouble ) )
+            // InternalTableDSL.g:3714:2: ( () otherlv_1= 'progressbarStyle' otherlv_2= 'max' ( (lv_maxValue_3_0= ruleLDouble ) ) )
+            // InternalTableDSL.g:3715:3: () otherlv_1= 'progressbarStyle' otherlv_2= 'max' ( (lv_maxValue_3_0= ruleLDouble ) )
             {
-            // InternalTableDSL.g:4275:3: ()
-            // InternalTableDSL.g:4276:4: 
+            // InternalTableDSL.g:3715:3: ()
+            // InternalTableDSL.g:3716:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -12280,23 +10806,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,86,FOLLOW_47); if (state.failed) return current;
+            otherlv_1=(Token)match(input,82,FOLLOW_46); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getPropertyProgressbarStyleAccess().getProgressbarStyleKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,87,FOLLOW_48); if (state.failed) return current;
+            otherlv_2=(Token)match(input,83,FOLLOW_47); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getPropertyProgressbarStyleAccess().getMaxKeyword_2());
               		
             }
-            // InternalTableDSL.g:4290:3: ( (lv_maxValue_3_0= ruleLDouble ) )
-            // InternalTableDSL.g:4291:4: (lv_maxValue_3_0= ruleLDouble )
+            // InternalTableDSL.g:3730:3: ( (lv_maxValue_3_0= ruleLDouble ) )
+            // InternalTableDSL.g:3731:4: (lv_maxValue_3_0= ruleLDouble )
             {
-            // InternalTableDSL.g:4291:4: (lv_maxValue_3_0= ruleLDouble )
-            // InternalTableDSL.g:4292:5: lv_maxValue_3_0= ruleLDouble
+            // InternalTableDSL.g:3731:4: (lv_maxValue_3_0= ruleLDouble )
+            // InternalTableDSL.g:3732:5: lv_maxValue_3_0= ruleLDouble
             {
             if ( state.backtracking==0 ) {
 
@@ -12352,7 +10878,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleGridPropIndicatorStyle"
-    // InternalTableDSL.g:4313:1: entryRuleGridPropIndicatorStyle returns [EObject current=null] : iv_ruleGridPropIndicatorStyle= ruleGridPropIndicatorStyle EOF ;
+    // InternalTableDSL.g:3753:1: entryRuleGridPropIndicatorStyle returns [EObject current=null] : iv_ruleGridPropIndicatorStyle= ruleGridPropIndicatorStyle EOF ;
     public final EObject entryRuleGridPropIndicatorStyle() throws RecognitionException {
         EObject current = null;
 
@@ -12360,8 +10886,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4313:63: (iv_ruleGridPropIndicatorStyle= ruleGridPropIndicatorStyle EOF )
-            // InternalTableDSL.g:4314:2: iv_ruleGridPropIndicatorStyle= ruleGridPropIndicatorStyle EOF
+            // InternalTableDSL.g:3753:63: (iv_ruleGridPropIndicatorStyle= ruleGridPropIndicatorStyle EOF )
+            // InternalTableDSL.g:3754:2: iv_ruleGridPropIndicatorStyle= ruleGridPropIndicatorStyle EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getGridPropIndicatorStyleRule()); 
@@ -12392,7 +10918,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleGridPropIndicatorStyle"
-    // InternalTableDSL.g:4320:1: ruleGridPropIndicatorStyle returns [EObject current=null] : ( () otherlv_1= 'indicatorStyle' otherlv_2= 'greenFrom' ( (lv_greenStarts_3_0= ruleLDouble ) ) otherlv_4= 'redUntil' ( (lv_redEnds_5_0= ruleLDouble ) ) ) ;
+    // InternalTableDSL.g:3760:1: ruleGridPropIndicatorStyle returns [EObject current=null] : ( () otherlv_1= 'indicatorStyle' otherlv_2= 'greenFrom' ( (lv_greenStarts_3_0= ruleLDouble ) ) otherlv_4= 'redUntil' ( (lv_redEnds_5_0= ruleLDouble ) ) ) ;
     public final EObject ruleGridPropIndicatorStyle() throws RecognitionException {
         EObject current = null;
 
@@ -12408,14 +10934,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4326:2: ( ( () otherlv_1= 'indicatorStyle' otherlv_2= 'greenFrom' ( (lv_greenStarts_3_0= ruleLDouble ) ) otherlv_4= 'redUntil' ( (lv_redEnds_5_0= ruleLDouble ) ) ) )
-            // InternalTableDSL.g:4327:2: ( () otherlv_1= 'indicatorStyle' otherlv_2= 'greenFrom' ( (lv_greenStarts_3_0= ruleLDouble ) ) otherlv_4= 'redUntil' ( (lv_redEnds_5_0= ruleLDouble ) ) )
+            // InternalTableDSL.g:3766:2: ( ( () otherlv_1= 'indicatorStyle' otherlv_2= 'greenFrom' ( (lv_greenStarts_3_0= ruleLDouble ) ) otherlv_4= 'redUntil' ( (lv_redEnds_5_0= ruleLDouble ) ) ) )
+            // InternalTableDSL.g:3767:2: ( () otherlv_1= 'indicatorStyle' otherlv_2= 'greenFrom' ( (lv_greenStarts_3_0= ruleLDouble ) ) otherlv_4= 'redUntil' ( (lv_redEnds_5_0= ruleLDouble ) ) )
             {
-            // InternalTableDSL.g:4327:2: ( () otherlv_1= 'indicatorStyle' otherlv_2= 'greenFrom' ( (lv_greenStarts_3_0= ruleLDouble ) ) otherlv_4= 'redUntil' ( (lv_redEnds_5_0= ruleLDouble ) ) )
-            // InternalTableDSL.g:4328:3: () otherlv_1= 'indicatorStyle' otherlv_2= 'greenFrom' ( (lv_greenStarts_3_0= ruleLDouble ) ) otherlv_4= 'redUntil' ( (lv_redEnds_5_0= ruleLDouble ) )
+            // InternalTableDSL.g:3767:2: ( () otherlv_1= 'indicatorStyle' otherlv_2= 'greenFrom' ( (lv_greenStarts_3_0= ruleLDouble ) ) otherlv_4= 'redUntil' ( (lv_redEnds_5_0= ruleLDouble ) ) )
+            // InternalTableDSL.g:3768:3: () otherlv_1= 'indicatorStyle' otherlv_2= 'greenFrom' ( (lv_greenStarts_3_0= ruleLDouble ) ) otherlv_4= 'redUntil' ( (lv_redEnds_5_0= ruleLDouble ) )
             {
-            // InternalTableDSL.g:4328:3: ()
-            // InternalTableDSL.g:4329:4: 
+            // InternalTableDSL.g:3768:3: ()
+            // InternalTableDSL.g:3769:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -12427,30 +10953,30 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,88,FOLLOW_49); if (state.failed) return current;
+            otherlv_1=(Token)match(input,84,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getGridPropIndicatorStyleAccess().getIndicatorStyleKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,89,FOLLOW_48); if (state.failed) return current;
+            otherlv_2=(Token)match(input,85,FOLLOW_47); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getGridPropIndicatorStyleAccess().getGreenFromKeyword_2());
               		
             }
-            // InternalTableDSL.g:4343:3: ( (lv_greenStarts_3_0= ruleLDouble ) )
-            // InternalTableDSL.g:4344:4: (lv_greenStarts_3_0= ruleLDouble )
+            // InternalTableDSL.g:3783:3: ( (lv_greenStarts_3_0= ruleLDouble ) )
+            // InternalTableDSL.g:3784:4: (lv_greenStarts_3_0= ruleLDouble )
             {
-            // InternalTableDSL.g:4344:4: (lv_greenStarts_3_0= ruleLDouble )
-            // InternalTableDSL.g:4345:5: lv_greenStarts_3_0= ruleLDouble
+            // InternalTableDSL.g:3784:4: (lv_greenStarts_3_0= ruleLDouble )
+            // InternalTableDSL.g:3785:5: lv_greenStarts_3_0= ruleLDouble
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getGridPropIndicatorStyleAccess().getGreenStartsLDoubleParserRuleCall_3_0());
               				
             }
-            pushFollow(FOLLOW_50);
+            pushFollow(FOLLOW_49);
             lv_greenStarts_3_0=ruleLDouble();
 
             state._fsp--;
@@ -12474,17 +11000,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,90,FOLLOW_48); if (state.failed) return current;
+            otherlv_4=(Token)match(input,86,FOLLOW_47); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_4, grammarAccess.getGridPropIndicatorStyleAccess().getRedUntilKeyword_4());
               		
             }
-            // InternalTableDSL.g:4366:3: ( (lv_redEnds_5_0= ruleLDouble ) )
-            // InternalTableDSL.g:4367:4: (lv_redEnds_5_0= ruleLDouble )
+            // InternalTableDSL.g:3806:3: ( (lv_redEnds_5_0= ruleLDouble ) )
+            // InternalTableDSL.g:3807:4: (lv_redEnds_5_0= ruleLDouble )
             {
-            // InternalTableDSL.g:4367:4: (lv_redEnds_5_0= ruleLDouble )
-            // InternalTableDSL.g:4368:5: lv_redEnds_5_0= ruleLDouble
+            // InternalTableDSL.g:3807:4: (lv_redEnds_5_0= ruleLDouble )
+            // InternalTableDSL.g:3808:5: lv_redEnds_5_0= ruleLDouble
             {
             if ( state.backtracking==0 ) {
 
@@ -12540,7 +11066,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePropertyTextStyle"
-    // InternalTableDSL.g:4389:1: entryRulePropertyTextStyle returns [EObject current=null] : iv_rulePropertyTextStyle= rulePropertyTextStyle EOF ;
+    // InternalTableDSL.g:3829:1: entryRulePropertyTextStyle returns [EObject current=null] : iv_rulePropertyTextStyle= rulePropertyTextStyle EOF ;
     public final EObject entryRulePropertyTextStyle() throws RecognitionException {
         EObject current = null;
 
@@ -12548,8 +11074,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4389:58: (iv_rulePropertyTextStyle= rulePropertyTextStyle EOF )
-            // InternalTableDSL.g:4390:2: iv_rulePropertyTextStyle= rulePropertyTextStyle EOF
+            // InternalTableDSL.g:3829:58: (iv_rulePropertyTextStyle= rulePropertyTextStyle EOF )
+            // InternalTableDSL.g:3830:2: iv_rulePropertyTextStyle= rulePropertyTextStyle EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getPropertyTextStyleRule()); 
@@ -12580,7 +11106,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePropertyTextStyle"
-    // InternalTableDSL.g:4396:1: rulePropertyTextStyle returns [EObject current=null] : ( () otherlv_1= 'textStyle' ) ;
+    // InternalTableDSL.g:3836:1: rulePropertyTextStyle returns [EObject current=null] : ( () otherlv_1= 'textStyle' ) ;
     public final EObject rulePropertyTextStyle() throws RecognitionException {
         EObject current = null;
 
@@ -12590,14 +11116,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4402:2: ( ( () otherlv_1= 'textStyle' ) )
-            // InternalTableDSL.g:4403:2: ( () otherlv_1= 'textStyle' )
+            // InternalTableDSL.g:3842:2: ( ( () otherlv_1= 'textStyle' ) )
+            // InternalTableDSL.g:3843:2: ( () otherlv_1= 'textStyle' )
             {
-            // InternalTableDSL.g:4403:2: ( () otherlv_1= 'textStyle' )
-            // InternalTableDSL.g:4404:3: () otherlv_1= 'textStyle'
+            // InternalTableDSL.g:3843:2: ( () otherlv_1= 'textStyle' )
+            // InternalTableDSL.g:3844:3: () otherlv_1= 'textStyle'
             {
-            // InternalTableDSL.g:4404:3: ()
-            // InternalTableDSL.g:4405:4: 
+            // InternalTableDSL.g:3844:3: ()
+            // InternalTableDSL.g:3845:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -12609,7 +11135,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,91,FOLLOW_2); if (state.failed) return current;
+            otherlv_1=(Token)match(input,87,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getPropertyTextStyleAccess().getTextStyleKeyword_1());
@@ -12639,8 +11165,108 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     // $ANTLR end "rulePropertyTextStyle"
 
 
+    // $ANTLR start "entryRulePropertyBlobImageStyle"
+    // InternalTableDSL.g:3859:1: entryRulePropertyBlobImageStyle returns [EObject current=null] : iv_rulePropertyBlobImageStyle= rulePropertyBlobImageStyle EOF ;
+    public final EObject entryRulePropertyBlobImageStyle() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_rulePropertyBlobImageStyle = null;
+
+
+        try {
+            // InternalTableDSL.g:3859:63: (iv_rulePropertyBlobImageStyle= rulePropertyBlobImageStyle EOF )
+            // InternalTableDSL.g:3860:2: iv_rulePropertyBlobImageStyle= rulePropertyBlobImageStyle EOF
+            {
+            if ( state.backtracking==0 ) {
+               newCompositeNode(grammarAccess.getPropertyBlobImageStyleRule()); 
+            }
+            pushFollow(FOLLOW_1);
+            iv_rulePropertyBlobImageStyle=rulePropertyBlobImageStyle();
+
+            state._fsp--;
+            if (state.failed) return current;
+            if ( state.backtracking==0 ) {
+               current =iv_rulePropertyBlobImageStyle; 
+            }
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRulePropertyBlobImageStyle"
+
+
+    // $ANTLR start "rulePropertyBlobImageStyle"
+    // InternalTableDSL.g:3866:1: rulePropertyBlobImageStyle returns [EObject current=null] : ( () otherlv_1= 'blobImageStyle' ) ;
+    public final EObject rulePropertyBlobImageStyle() throws RecognitionException {
+        EObject current = null;
+
+        Token otherlv_1=null;
+
+
+        	enterRule();
+
+        try {
+            // InternalTableDSL.g:3872:2: ( ( () otherlv_1= 'blobImageStyle' ) )
+            // InternalTableDSL.g:3873:2: ( () otherlv_1= 'blobImageStyle' )
+            {
+            // InternalTableDSL.g:3873:2: ( () otherlv_1= 'blobImageStyle' )
+            // InternalTableDSL.g:3874:3: () otherlv_1= 'blobImageStyle'
+            {
+            // InternalTableDSL.g:3874:3: ()
+            // InternalTableDSL.g:3875:4: 
+            {
+            if ( state.backtracking==0 ) {
+
+              				current = forceCreateModelElement(
+              					grammarAccess.getPropertyBlobImageStyleAccess().getCxGridPropBlobImageStyleAction_0(),
+              					current);
+              			
+            }
+
+            }
+
+            otherlv_1=(Token)match(input,88,FOLLOW_2); if (state.failed) return current;
+            if ( state.backtracking==0 ) {
+
+              			newLeafNode(otherlv_1, grammarAccess.getPropertyBlobImageStyleAccess().getBlobImageStyleKeyword_1());
+              		
+            }
+
+            }
+
+
+            }
+
+            if ( state.backtracking==0 ) {
+
+              	leaveRule();
+
+            }
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "rulePropertyBlobImageStyle"
+
+
     // $ANTLR start "entryRulePropertyImageStyle"
-    // InternalTableDSL.g:4419:1: entryRulePropertyImageStyle returns [EObject current=null] : iv_rulePropertyImageStyle= rulePropertyImageStyle EOF ;
+    // InternalTableDSL.g:3889:1: entryRulePropertyImageStyle returns [EObject current=null] : iv_rulePropertyImageStyle= rulePropertyImageStyle EOF ;
     public final EObject entryRulePropertyImageStyle() throws RecognitionException {
         EObject current = null;
 
@@ -12648,8 +11274,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4419:59: (iv_rulePropertyImageStyle= rulePropertyImageStyle EOF )
-            // InternalTableDSL.g:4420:2: iv_rulePropertyImageStyle= rulePropertyImageStyle EOF
+            // InternalTableDSL.g:3889:59: (iv_rulePropertyImageStyle= rulePropertyImageStyle EOF )
+            // InternalTableDSL.g:3890:2: iv_rulePropertyImageStyle= rulePropertyImageStyle EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getPropertyImageStyleRule()); 
@@ -12680,7 +11306,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePropertyImageStyle"
-    // InternalTableDSL.g:4426:1: rulePropertyImageStyle returns [EObject current=null] : ( () otherlv_1= 'imageStyle' (otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )? otherlv_4= '{' ( (lv_configs_5_0= ruleStyleConfig ) )* otherlv_6= '}' ) ;
+    // InternalTableDSL.g:3896:1: rulePropertyImageStyle returns [EObject current=null] : ( () otherlv_1= 'imageStyle' (otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )? otherlv_4= '{' ( (lv_configs_5_0= ruleStyleConfig ) )* otherlv_6= '}' ) ;
     public final EObject rulePropertyImageStyle() throws RecognitionException {
         EObject current = null;
 
@@ -12696,14 +11322,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4432:2: ( ( () otherlv_1= 'imageStyle' (otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )? otherlv_4= '{' ( (lv_configs_5_0= ruleStyleConfig ) )* otherlv_6= '}' ) )
-            // InternalTableDSL.g:4433:2: ( () otherlv_1= 'imageStyle' (otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )? otherlv_4= '{' ( (lv_configs_5_0= ruleStyleConfig ) )* otherlv_6= '}' )
+            // InternalTableDSL.g:3902:2: ( ( () otherlv_1= 'imageStyle' (otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )? otherlv_4= '{' ( (lv_configs_5_0= ruleStyleConfig ) )* otherlv_6= '}' ) )
+            // InternalTableDSL.g:3903:2: ( () otherlv_1= 'imageStyle' (otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )? otherlv_4= '{' ( (lv_configs_5_0= ruleStyleConfig ) )* otherlv_6= '}' )
             {
-            // InternalTableDSL.g:4433:2: ( () otherlv_1= 'imageStyle' (otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )? otherlv_4= '{' ( (lv_configs_5_0= ruleStyleConfig ) )* otherlv_6= '}' )
-            // InternalTableDSL.g:4434:3: () otherlv_1= 'imageStyle' (otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )? otherlv_4= '{' ( (lv_configs_5_0= ruleStyleConfig ) )* otherlv_6= '}'
+            // InternalTableDSL.g:3903:2: ( () otherlv_1= 'imageStyle' (otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )? otherlv_4= '{' ( (lv_configs_5_0= ruleStyleConfig ) )* otherlv_6= '}' )
+            // InternalTableDSL.g:3904:3: () otherlv_1= 'imageStyle' (otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )? otherlv_4= '{' ( (lv_configs_5_0= ruleStyleConfig ) )* otherlv_6= '}'
             {
-            // InternalTableDSL.g:4434:3: ()
-            // InternalTableDSL.g:4435:4: 
+            // InternalTableDSL.g:3904:3: ()
+            // InternalTableDSL.g:3905:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -12715,36 +11341,36 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,92,FOLLOW_51); if (state.failed) return current;
+            otherlv_1=(Token)match(input,89,FOLLOW_50); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getPropertyImageStyleAccess().getImageStyleKeyword_1());
               		
             }
-            // InternalTableDSL.g:4445:3: (otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )?
-            int alt42=2;
-            int LA42_0 = input.LA(1);
+            // InternalTableDSL.g:3915:3: (otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) ) )?
+            int alt37=2;
+            int LA37_0 = input.LA(1);
 
-            if ( (LA42_0==80) ) {
-                alt42=1;
+            if ( (LA37_0==76) ) {
+                alt37=1;
             }
-            switch (alt42) {
+            switch (alt37) {
                 case 1 :
-                    // InternalTableDSL.g:4446:4: otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) )
+                    // InternalTableDSL.g:3916:4: otherlv_2= 'eventTopic' ( (lv_eventTopic_3_0= RULE_STRING ) )
                     {
-                    otherlv_2=(Token)match(input,80,FOLLOW_8); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,76,FOLLOW_8); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_2, grammarAccess.getPropertyImageStyleAccess().getEventTopicKeyword_2_0());
                       			
                     }
-                    // InternalTableDSL.g:4450:4: ( (lv_eventTopic_3_0= RULE_STRING ) )
-                    // InternalTableDSL.g:4451:5: (lv_eventTopic_3_0= RULE_STRING )
+                    // InternalTableDSL.g:3920:4: ( (lv_eventTopic_3_0= RULE_STRING ) )
+                    // InternalTableDSL.g:3921:5: (lv_eventTopic_3_0= RULE_STRING )
                     {
-                    // InternalTableDSL.g:4451:5: (lv_eventTopic_3_0= RULE_STRING )
-                    // InternalTableDSL.g:4452:6: lv_eventTopic_3_0= RULE_STRING
+                    // InternalTableDSL.g:3921:5: (lv_eventTopic_3_0= RULE_STRING )
+                    // InternalTableDSL.g:3922:6: lv_eventTopic_3_0= RULE_STRING
                     {
-                    lv_eventTopic_3_0=(Token)match(input,RULE_STRING,FOLLOW_22); if (state.failed) return current;
+                    lv_eventTopic_3_0=(Token)match(input,RULE_STRING,FOLLOW_21); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(lv_eventTopic_3_0, grammarAccess.getPropertyImageStyleAccess().getEventTopicSTRINGTerminalRuleCall_2_1_0());
@@ -12774,36 +11400,36 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,16,FOLLOW_52); if (state.failed) return current;
+            otherlv_4=(Token)match(input,16,FOLLOW_51); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_4, grammarAccess.getPropertyImageStyleAccess().getLeftCurlyBracketKeyword_3());
               		
             }
-            // InternalTableDSL.g:4473:3: ( (lv_configs_5_0= ruleStyleConfig ) )*
-            loop43:
+            // InternalTableDSL.g:3943:3: ( (lv_configs_5_0= ruleStyleConfig ) )*
+            loop38:
             do {
-                int alt43=2;
-                int LA43_0 = input.LA(1);
+                int alt38=2;
+                int LA38_0 = input.LA(1);
 
-                if ( ((LA43_0>=60 && LA43_0<=61)) ) {
-                    alt43=1;
+                if ( ((LA38_0>=59 && LA38_0<=60)) ) {
+                    alt38=1;
                 }
 
 
-                switch (alt43) {
+                switch (alt38) {
             	case 1 :
-            	    // InternalTableDSL.g:4474:4: (lv_configs_5_0= ruleStyleConfig )
+            	    // InternalTableDSL.g:3944:4: (lv_configs_5_0= ruleStyleConfig )
             	    {
-            	    // InternalTableDSL.g:4474:4: (lv_configs_5_0= ruleStyleConfig )
-            	    // InternalTableDSL.g:4475:5: lv_configs_5_0= ruleStyleConfig
+            	    // InternalTableDSL.g:3944:4: (lv_configs_5_0= ruleStyleConfig )
+            	    // InternalTableDSL.g:3945:5: lv_configs_5_0= ruleStyleConfig
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      					newCompositeNode(grammarAccess.getPropertyImageStyleAccess().getConfigsStyleConfigParserRuleCall_4_0());
             	      				
             	    }
-            	    pushFollow(FOLLOW_52);
+            	    pushFollow(FOLLOW_51);
             	    lv_configs_5_0=ruleStyleConfig();
 
             	    state._fsp--;
@@ -12829,7 +11455,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop43;
+            	    break loop38;
                 }
             } while (true);
 
@@ -12864,7 +11490,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStyleConfig"
-    // InternalTableDSL.g:4500:1: entryRuleStyleConfig returns [EObject current=null] : iv_ruleStyleConfig= ruleStyleConfig EOF ;
+    // InternalTableDSL.g:3970:1: entryRuleStyleConfig returns [EObject current=null] : iv_ruleStyleConfig= ruleStyleConfig EOF ;
     public final EObject entryRuleStyleConfig() throws RecognitionException {
         EObject current = null;
 
@@ -12872,8 +11498,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4500:52: (iv_ruleStyleConfig= ruleStyleConfig EOF )
-            // InternalTableDSL.g:4501:2: iv_ruleStyleConfig= ruleStyleConfig EOF
+            // InternalTableDSL.g:3970:52: (iv_ruleStyleConfig= ruleStyleConfig EOF )
+            // InternalTableDSL.g:3971:2: iv_ruleStyleConfig= ruleStyleConfig EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getStyleConfigRule()); 
@@ -12904,7 +11530,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStyleConfig"
-    // InternalTableDSL.g:4507:1: ruleStyleConfig returns [EObject current=null] : (this_NumericToResourceStyleConfig_0= ruleNumericToResourceStyleConfig | this_StringToResourceStyleConfig_1= ruleStringToResourceStyleConfig ) ;
+    // InternalTableDSL.g:3977:1: ruleStyleConfig returns [EObject current=null] : (this_NumericToResourceStyleConfig_0= ruleNumericToResourceStyleConfig | this_StringToResourceStyleConfig_1= ruleStringToResourceStyleConfig ) ;
     public final EObject ruleStyleConfig() throws RecognitionException {
         EObject current = null;
 
@@ -12917,29 +11543,29 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4513:2: ( (this_NumericToResourceStyleConfig_0= ruleNumericToResourceStyleConfig | this_StringToResourceStyleConfig_1= ruleStringToResourceStyleConfig ) )
-            // InternalTableDSL.g:4514:2: (this_NumericToResourceStyleConfig_0= ruleNumericToResourceStyleConfig | this_StringToResourceStyleConfig_1= ruleStringToResourceStyleConfig )
+            // InternalTableDSL.g:3983:2: ( (this_NumericToResourceStyleConfig_0= ruleNumericToResourceStyleConfig | this_StringToResourceStyleConfig_1= ruleStringToResourceStyleConfig ) )
+            // InternalTableDSL.g:3984:2: (this_NumericToResourceStyleConfig_0= ruleNumericToResourceStyleConfig | this_StringToResourceStyleConfig_1= ruleStringToResourceStyleConfig )
             {
-            // InternalTableDSL.g:4514:2: (this_NumericToResourceStyleConfig_0= ruleNumericToResourceStyleConfig | this_StringToResourceStyleConfig_1= ruleStringToResourceStyleConfig )
-            int alt44=2;
-            int LA44_0 = input.LA(1);
+            // InternalTableDSL.g:3984:2: (this_NumericToResourceStyleConfig_0= ruleNumericToResourceStyleConfig | this_StringToResourceStyleConfig_1= ruleStringToResourceStyleConfig )
+            int alt39=2;
+            int LA39_0 = input.LA(1);
 
-            if ( (LA44_0==60) ) {
-                alt44=1;
+            if ( (LA39_0==59) ) {
+                alt39=1;
             }
-            else if ( (LA44_0==61) ) {
-                alt44=2;
+            else if ( (LA39_0==60) ) {
+                alt39=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 44, 0, input);
+                    new NoViableAltException("", 39, 0, input);
 
                 throw nvae;
             }
-            switch (alt44) {
+            switch (alt39) {
                 case 1 :
-                    // InternalTableDSL.g:4515:3: this_NumericToResourceStyleConfig_0= ruleNumericToResourceStyleConfig
+                    // InternalTableDSL.g:3985:3: this_NumericToResourceStyleConfig_0= ruleNumericToResourceStyleConfig
                     {
                     if ( state.backtracking==0 ) {
 
@@ -12961,7 +11587,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:4524:3: this_StringToResourceStyleConfig_1= ruleStringToResourceStyleConfig
+                    // InternalTableDSL.g:3994:3: this_StringToResourceStyleConfig_1= ruleStringToResourceStyleConfig
                     {
                     if ( state.backtracking==0 ) {
 
@@ -13007,7 +11633,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNumericToResourceStyleConfig"
-    // InternalTableDSL.g:4536:1: entryRuleNumericToResourceStyleConfig returns [EObject current=null] : iv_ruleNumericToResourceStyleConfig= ruleNumericToResourceStyleConfig EOF ;
+    // InternalTableDSL.g:4006:1: entryRuleNumericToResourceStyleConfig returns [EObject current=null] : iv_ruleNumericToResourceStyleConfig= ruleNumericToResourceStyleConfig EOF ;
     public final EObject entryRuleNumericToResourceStyleConfig() throws RecognitionException {
         EObject current = null;
 
@@ -13015,8 +11641,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4536:69: (iv_ruleNumericToResourceStyleConfig= ruleNumericToResourceStyleConfig EOF )
-            // InternalTableDSL.g:4537:2: iv_ruleNumericToResourceStyleConfig= ruleNumericToResourceStyleConfig EOF
+            // InternalTableDSL.g:4006:69: (iv_ruleNumericToResourceStyleConfig= ruleNumericToResourceStyleConfig EOF )
+            // InternalTableDSL.g:4007:2: iv_ruleNumericToResourceStyleConfig= ruleNumericToResourceStyleConfig EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNumericToResourceStyleConfigRule()); 
@@ -13047,7 +11673,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNumericToResourceStyleConfig"
-    // InternalTableDSL.g:4543:1: ruleNumericToResourceStyleConfig returns [EObject current=null] : (otherlv_0= 'number' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= ruleLDouble ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) ) ;
+    // InternalTableDSL.g:4013:1: ruleNumericToResourceStyleConfig returns [EObject current=null] : (otherlv_0= 'number' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= ruleLDouble ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) ) ;
     public final EObject ruleNumericToResourceStyleConfig() throws RecognitionException {
         EObject current = null;
 
@@ -13063,30 +11689,30 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4549:2: ( (otherlv_0= 'number' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= ruleLDouble ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) ) )
-            // InternalTableDSL.g:4550:2: (otherlv_0= 'number' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= ruleLDouble ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) )
+            // InternalTableDSL.g:4019:2: ( (otherlv_0= 'number' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= ruleLDouble ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) ) )
+            // InternalTableDSL.g:4020:2: (otherlv_0= 'number' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= ruleLDouble ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) )
             {
-            // InternalTableDSL.g:4550:2: (otherlv_0= 'number' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= ruleLDouble ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) )
-            // InternalTableDSL.g:4551:3: otherlv_0= 'number' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= ruleLDouble ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) )
+            // InternalTableDSL.g:4020:2: (otherlv_0= 'number' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= ruleLDouble ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) )
+            // InternalTableDSL.g:4021:3: otherlv_0= 'number' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= ruleLDouble ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) )
             {
-            otherlv_0=(Token)match(input,60,FOLLOW_53); if (state.failed) return current;
+            otherlv_0=(Token)match(input,59,FOLLOW_52); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getNumericToResourceStyleConfigAccess().getNumberKeyword_0());
               		
             }
-            // InternalTableDSL.g:4555:3: ( (lv_compare_1_0= ruleStyleCompare ) )
-            // InternalTableDSL.g:4556:4: (lv_compare_1_0= ruleStyleCompare )
+            // InternalTableDSL.g:4025:3: ( (lv_compare_1_0= ruleStyleCompare ) )
+            // InternalTableDSL.g:4026:4: (lv_compare_1_0= ruleStyleCompare )
             {
-            // InternalTableDSL.g:4556:4: (lv_compare_1_0= ruleStyleCompare )
-            // InternalTableDSL.g:4557:5: lv_compare_1_0= ruleStyleCompare
+            // InternalTableDSL.g:4026:4: (lv_compare_1_0= ruleStyleCompare )
+            // InternalTableDSL.g:4027:5: lv_compare_1_0= ruleStyleCompare
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getNumericToResourceStyleConfigAccess().getCompareStyleCompareEnumRuleCall_1_0());
               				
             }
-            pushFollow(FOLLOW_48);
+            pushFollow(FOLLOW_47);
             lv_compare_1_0=ruleStyleCompare();
 
             state._fsp--;
@@ -13110,18 +11736,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:4574:3: ( (lv_value_2_0= ruleLDouble ) )
-            // InternalTableDSL.g:4575:4: (lv_value_2_0= ruleLDouble )
+            // InternalTableDSL.g:4044:3: ( (lv_value_2_0= ruleLDouble ) )
+            // InternalTableDSL.g:4045:4: (lv_value_2_0= ruleLDouble )
             {
-            // InternalTableDSL.g:4575:4: (lv_value_2_0= ruleLDouble )
-            // InternalTableDSL.g:4576:5: lv_value_2_0= ruleLDouble
+            // InternalTableDSL.g:4045:4: (lv_value_2_0= ruleLDouble )
+            // InternalTableDSL.g:4046:5: lv_value_2_0= ruleLDouble
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getNumericToResourceStyleConfigAccess().getValueLDoubleParserRuleCall_2_0());
               				
             }
-            pushFollow(FOLLOW_54);
+            pushFollow(FOLLOW_53);
             lv_value_2_0=ruleLDouble();
 
             state._fsp--;
@@ -13145,17 +11771,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,93,FOLLOW_55); if (state.failed) return current;
+            otherlv_3=(Token)match(input,90,FOLLOW_54); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_3, grammarAccess.getNumericToResourceStyleConfigAccess().getThenKeyword_3());
               		
             }
-            // InternalTableDSL.g:4597:3: ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) )
-            // InternalTableDSL.g:4598:4: (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE )
+            // InternalTableDSL.g:4067:3: ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) )
+            // InternalTableDSL.g:4068:4: (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE )
             {
-            // InternalTableDSL.g:4598:4: (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE )
-            // InternalTableDSL.g:4599:5: lv_resourceThemePath_4_0= RULE_THEME_RESOURCE
+            // InternalTableDSL.g:4068:4: (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE )
+            // InternalTableDSL.g:4069:5: lv_resourceThemePath_4_0= RULE_THEME_RESOURCE
             {
             lv_resourceThemePath_4_0=(Token)match(input,RULE_THEME_RESOURCE,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
@@ -13206,7 +11832,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStringToResourceStyleConfig"
-    // InternalTableDSL.g:4619:1: entryRuleStringToResourceStyleConfig returns [EObject current=null] : iv_ruleStringToResourceStyleConfig= ruleStringToResourceStyleConfig EOF ;
+    // InternalTableDSL.g:4089:1: entryRuleStringToResourceStyleConfig returns [EObject current=null] : iv_ruleStringToResourceStyleConfig= ruleStringToResourceStyleConfig EOF ;
     public final EObject entryRuleStringToResourceStyleConfig() throws RecognitionException {
         EObject current = null;
 
@@ -13214,8 +11840,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4619:68: (iv_ruleStringToResourceStyleConfig= ruleStringToResourceStyleConfig EOF )
-            // InternalTableDSL.g:4620:2: iv_ruleStringToResourceStyleConfig= ruleStringToResourceStyleConfig EOF
+            // InternalTableDSL.g:4089:68: (iv_ruleStringToResourceStyleConfig= ruleStringToResourceStyleConfig EOF )
+            // InternalTableDSL.g:4090:2: iv_ruleStringToResourceStyleConfig= ruleStringToResourceStyleConfig EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getStringToResourceStyleConfigRule()); 
@@ -13246,7 +11872,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStringToResourceStyleConfig"
-    // InternalTableDSL.g:4626:1: ruleStringToResourceStyleConfig returns [EObject current=null] : (otherlv_0= 'string' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= RULE_STRING ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) ) ;
+    // InternalTableDSL.g:4096:1: ruleStringToResourceStyleConfig returns [EObject current=null] : (otherlv_0= 'string' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= RULE_STRING ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) ) ;
     public final EObject ruleStringToResourceStyleConfig() throws RecognitionException {
         EObject current = null;
 
@@ -13261,23 +11887,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4632:2: ( (otherlv_0= 'string' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= RULE_STRING ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) ) )
-            // InternalTableDSL.g:4633:2: (otherlv_0= 'string' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= RULE_STRING ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) )
+            // InternalTableDSL.g:4102:2: ( (otherlv_0= 'string' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= RULE_STRING ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) ) )
+            // InternalTableDSL.g:4103:2: (otherlv_0= 'string' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= RULE_STRING ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) )
             {
-            // InternalTableDSL.g:4633:2: (otherlv_0= 'string' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= RULE_STRING ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) )
-            // InternalTableDSL.g:4634:3: otherlv_0= 'string' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= RULE_STRING ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) )
+            // InternalTableDSL.g:4103:2: (otherlv_0= 'string' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= RULE_STRING ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) ) )
+            // InternalTableDSL.g:4104:3: otherlv_0= 'string' ( (lv_compare_1_0= ruleStyleCompare ) ) ( (lv_value_2_0= RULE_STRING ) ) otherlv_3= 'then' ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) )
             {
-            otherlv_0=(Token)match(input,61,FOLLOW_53); if (state.failed) return current;
+            otherlv_0=(Token)match(input,60,FOLLOW_52); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getStringToResourceStyleConfigAccess().getStringKeyword_0());
               		
             }
-            // InternalTableDSL.g:4638:3: ( (lv_compare_1_0= ruleStyleCompare ) )
-            // InternalTableDSL.g:4639:4: (lv_compare_1_0= ruleStyleCompare )
+            // InternalTableDSL.g:4108:3: ( (lv_compare_1_0= ruleStyleCompare ) )
+            // InternalTableDSL.g:4109:4: (lv_compare_1_0= ruleStyleCompare )
             {
-            // InternalTableDSL.g:4639:4: (lv_compare_1_0= ruleStyleCompare )
-            // InternalTableDSL.g:4640:5: lv_compare_1_0= ruleStyleCompare
+            // InternalTableDSL.g:4109:4: (lv_compare_1_0= ruleStyleCompare )
+            // InternalTableDSL.g:4110:5: lv_compare_1_0= ruleStyleCompare
             {
             if ( state.backtracking==0 ) {
 
@@ -13308,13 +11934,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:4657:3: ( (lv_value_2_0= RULE_STRING ) )
-            // InternalTableDSL.g:4658:4: (lv_value_2_0= RULE_STRING )
+            // InternalTableDSL.g:4127:3: ( (lv_value_2_0= RULE_STRING ) )
+            // InternalTableDSL.g:4128:4: (lv_value_2_0= RULE_STRING )
             {
-            // InternalTableDSL.g:4658:4: (lv_value_2_0= RULE_STRING )
-            // InternalTableDSL.g:4659:5: lv_value_2_0= RULE_STRING
+            // InternalTableDSL.g:4128:4: (lv_value_2_0= RULE_STRING )
+            // InternalTableDSL.g:4129:5: lv_value_2_0= RULE_STRING
             {
-            lv_value_2_0=(Token)match(input,RULE_STRING,FOLLOW_54); if (state.failed) return current;
+            lv_value_2_0=(Token)match(input,RULE_STRING,FOLLOW_53); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(lv_value_2_0, grammarAccess.getStringToResourceStyleConfigAccess().getValueSTRINGTerminalRuleCall_2_0());
@@ -13338,17 +11964,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,93,FOLLOW_55); if (state.failed) return current;
+            otherlv_3=(Token)match(input,90,FOLLOW_54); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_3, grammarAccess.getStringToResourceStyleConfigAccess().getThenKeyword_3());
               		
             }
-            // InternalTableDSL.g:4679:3: ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) )
-            // InternalTableDSL.g:4680:4: (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE )
+            // InternalTableDSL.g:4149:3: ( (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE ) )
+            // InternalTableDSL.g:4150:4: (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE )
             {
-            // InternalTableDSL.g:4680:4: (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE )
-            // InternalTableDSL.g:4681:5: lv_resourceThemePath_4_0= RULE_THEME_RESOURCE
+            // InternalTableDSL.g:4150:4: (lv_resourceThemePath_4_0= RULE_THEME_RESOURCE )
+            // InternalTableDSL.g:4151:5: lv_resourceThemePath_4_0= RULE_THEME_RESOURCE
             {
             lv_resourceThemePath_4_0=(Token)match(input,RULE_THEME_RESOURCE,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
@@ -13399,7 +12025,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLInt"
-    // InternalTableDSL.g:4701:1: entryRuleLInt returns [String current=null] : iv_ruleLInt= ruleLInt EOF ;
+    // InternalTableDSL.g:4171:1: entryRuleLInt returns [String current=null] : iv_ruleLInt= ruleLInt EOF ;
     public final String entryRuleLInt() throws RecognitionException {
         String current = null;
 
@@ -13407,8 +12033,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4701:44: (iv_ruleLInt= ruleLInt EOF )
-            // InternalTableDSL.g:4702:2: iv_ruleLInt= ruleLInt EOF
+            // InternalTableDSL.g:4171:44: (iv_ruleLInt= ruleLInt EOF )
+            // InternalTableDSL.g:4172:2: iv_ruleLInt= ruleLInt EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getLIntRule()); 
@@ -13439,7 +12065,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLInt"
-    // InternalTableDSL.g:4708:1: ruleLInt returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) ;
+    // InternalTableDSL.g:4178:1: ruleLInt returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) ;
     public final AntlrDatatypeRuleToken ruleLInt() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -13450,27 +12076,27 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4714:2: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) )
-            // InternalTableDSL.g:4715:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+            // InternalTableDSL.g:4184:2: ( ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT ) )
+            // InternalTableDSL.g:4185:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
             {
-            // InternalTableDSL.g:4715:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
-            // InternalTableDSL.g:4716:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
+            // InternalTableDSL.g:4185:2: ( (kw= '+' | kw= '-' )? this_INT_2= RULE_INT )
+            // InternalTableDSL.g:4186:3: (kw= '+' | kw= '-' )? this_INT_2= RULE_INT
             {
-            // InternalTableDSL.g:4716:3: (kw= '+' | kw= '-' )?
-            int alt45=3;
-            int LA45_0 = input.LA(1);
+            // InternalTableDSL.g:4186:3: (kw= '+' | kw= '-' )?
+            int alt40=3;
+            int LA40_0 = input.LA(1);
 
-            if ( (LA45_0==94) ) {
-                alt45=1;
+            if ( (LA40_0==91) ) {
+                alt40=1;
             }
-            else if ( (LA45_0==95) ) {
-                alt45=2;
+            else if ( (LA40_0==92) ) {
+                alt40=2;
             }
-            switch (alt45) {
+            switch (alt40) {
                 case 1 :
-                    // InternalTableDSL.g:4717:4: kw= '+'
+                    // InternalTableDSL.g:4187:4: kw= '+'
                     {
-                    kw=(Token)match(input,94,FOLLOW_56); if (state.failed) return current;
+                    kw=(Token)match(input,91,FOLLOW_55); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
@@ -13481,9 +12107,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:4723:4: kw= '-'
+                    // InternalTableDSL.g:4193:4: kw= '-'
                     {
-                    kw=(Token)match(input,95,FOLLOW_56); if (state.failed) return current;
+                    kw=(Token)match(input,92,FOLLOW_55); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
@@ -13532,7 +12158,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLDouble"
-    // InternalTableDSL.g:4740:1: entryRuleLDouble returns [String current=null] : iv_ruleLDouble= ruleLDouble EOF ;
+    // InternalTableDSL.g:4210:1: entryRuleLDouble returns [String current=null] : iv_ruleLDouble= ruleLDouble EOF ;
     public final String entryRuleLDouble() throws RecognitionException {
         String current = null;
 
@@ -13540,8 +12166,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4740:47: (iv_ruleLDouble= ruleLDouble EOF )
-            // InternalTableDSL.g:4741:2: iv_ruleLDouble= ruleLDouble EOF
+            // InternalTableDSL.g:4210:47: (iv_ruleLDouble= ruleLDouble EOF )
+            // InternalTableDSL.g:4211:2: iv_ruleLDouble= ruleLDouble EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getLDoubleRule()); 
@@ -13572,7 +12198,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLDouble"
-    // InternalTableDSL.g:4747:1: ruleLDouble returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_LInt_0= ruleLInt (kw= '.' this_INT_2= RULE_INT )? ) ;
+    // InternalTableDSL.g:4217:1: ruleLDouble returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_LInt_0= ruleLInt (kw= '.' this_INT_2= RULE_INT )? ) ;
     public final AntlrDatatypeRuleToken ruleLDouble() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -13585,18 +12211,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4753:2: ( (this_LInt_0= ruleLInt (kw= '.' this_INT_2= RULE_INT )? ) )
-            // InternalTableDSL.g:4754:2: (this_LInt_0= ruleLInt (kw= '.' this_INT_2= RULE_INT )? )
+            // InternalTableDSL.g:4223:2: ( (this_LInt_0= ruleLInt (kw= '.' this_INT_2= RULE_INT )? ) )
+            // InternalTableDSL.g:4224:2: (this_LInt_0= ruleLInt (kw= '.' this_INT_2= RULE_INT )? )
             {
-            // InternalTableDSL.g:4754:2: (this_LInt_0= ruleLInt (kw= '.' this_INT_2= RULE_INT )? )
-            // InternalTableDSL.g:4755:3: this_LInt_0= ruleLInt (kw= '.' this_INT_2= RULE_INT )?
+            // InternalTableDSL.g:4224:2: (this_LInt_0= ruleLInt (kw= '.' this_INT_2= RULE_INT )? )
+            // InternalTableDSL.g:4225:3: this_LInt_0= ruleLInt (kw= '.' this_INT_2= RULE_INT )?
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getLDoubleAccess().getLIntParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_43);
             this_LInt_0=ruleLInt();
 
             state._fsp--;
@@ -13611,18 +12237,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalTableDSL.g:4765:3: (kw= '.' this_INT_2= RULE_INT )?
-            int alt46=2;
-            int LA46_0 = input.LA(1);
+            // InternalTableDSL.g:4235:3: (kw= '.' this_INT_2= RULE_INT )?
+            int alt41=2;
+            int LA41_0 = input.LA(1);
 
-            if ( (LA46_0==78) ) {
-                alt46=1;
+            if ( (LA41_0==74) ) {
+                alt41=1;
             }
-            switch (alt46) {
+            switch (alt41) {
                 case 1 :
-                    // InternalTableDSL.g:4766:4: kw= '.' this_INT_2= RULE_INT
+                    // InternalTableDSL.g:4236:4: kw= '.' this_INT_2= RULE_INT
                     {
-                    kw=(Token)match(input,78,FOLLOW_56); if (state.failed) return current;
+                    kw=(Token)match(input,74,FOLLOW_55); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
@@ -13671,7 +12297,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSignedNumber"
-    // InternalTableDSL.g:4783:1: entryRuleSignedNumber returns [String current=null] : iv_ruleSignedNumber= ruleSignedNumber EOF ;
+    // InternalTableDSL.g:4253:1: entryRuleSignedNumber returns [String current=null] : iv_ruleSignedNumber= ruleSignedNumber EOF ;
     public final String entryRuleSignedNumber() throws RecognitionException {
         String current = null;
 
@@ -13679,8 +12305,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4783:52: (iv_ruleSignedNumber= ruleSignedNumber EOF )
-            // InternalTableDSL.g:4784:2: iv_ruleSignedNumber= ruleSignedNumber EOF
+            // InternalTableDSL.g:4253:52: (iv_ruleSignedNumber= ruleSignedNumber EOF )
+            // InternalTableDSL.g:4254:2: iv_ruleSignedNumber= ruleSignedNumber EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getSignedNumberRule()); 
@@ -13711,7 +12337,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSignedNumber"
-    // InternalTableDSL.g:4790:1: ruleSignedNumber returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '-' )? this_Number_1= ruleNumber ) ;
+    // InternalTableDSL.g:4260:1: ruleSignedNumber returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '-' )? this_Number_1= ruleNumber ) ;
     public final AntlrDatatypeRuleToken ruleSignedNumber() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -13723,24 +12349,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4796:2: ( ( (kw= '-' )? this_Number_1= ruleNumber ) )
-            // InternalTableDSL.g:4797:2: ( (kw= '-' )? this_Number_1= ruleNumber )
+            // InternalTableDSL.g:4266:2: ( ( (kw= '-' )? this_Number_1= ruleNumber ) )
+            // InternalTableDSL.g:4267:2: ( (kw= '-' )? this_Number_1= ruleNumber )
             {
-            // InternalTableDSL.g:4797:2: ( (kw= '-' )? this_Number_1= ruleNumber )
-            // InternalTableDSL.g:4798:3: (kw= '-' )? this_Number_1= ruleNumber
+            // InternalTableDSL.g:4267:2: ( (kw= '-' )? this_Number_1= ruleNumber )
+            // InternalTableDSL.g:4268:3: (kw= '-' )? this_Number_1= ruleNumber
             {
-            // InternalTableDSL.g:4798:3: (kw= '-' )?
-            int alt47=2;
-            int LA47_0 = input.LA(1);
+            // InternalTableDSL.g:4268:3: (kw= '-' )?
+            int alt42=2;
+            int LA42_0 = input.LA(1);
 
-            if ( (LA47_0==95) ) {
-                alt47=1;
+            if ( (LA42_0==92) ) {
+                alt42=1;
             }
-            switch (alt47) {
+            switch (alt42) {
                 case 1 :
-                    // InternalTableDSL.g:4799:4: kw= '-'
+                    // InternalTableDSL.g:4269:4: kw= '-'
                     {
-                    kw=(Token)match(input,95,FOLLOW_14); if (state.failed) return current;
+                    kw=(Token)match(input,92,FOLLOW_26); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
@@ -13798,7 +12424,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleSignedInt"
-    // InternalTableDSL.g:4819:1: entryRuleSignedInt returns [String current=null] : iv_ruleSignedInt= ruleSignedInt EOF ;
+    // InternalTableDSL.g:4289:1: entryRuleSignedInt returns [String current=null] : iv_ruleSignedInt= ruleSignedInt EOF ;
     public final String entryRuleSignedInt() throws RecognitionException {
         String current = null;
 
@@ -13806,8 +12432,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4819:49: (iv_ruleSignedInt= ruleSignedInt EOF )
-            // InternalTableDSL.g:4820:2: iv_ruleSignedInt= ruleSignedInt EOF
+            // InternalTableDSL.g:4289:49: (iv_ruleSignedInt= ruleSignedInt EOF )
+            // InternalTableDSL.g:4290:2: iv_ruleSignedInt= ruleSignedInt EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getSignedIntRule()); 
@@ -13838,7 +12464,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleSignedInt"
-    // InternalTableDSL.g:4826:1: ruleSignedInt returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '-' )? this_INT_1= RULE_INT ) ;
+    // InternalTableDSL.g:4296:1: ruleSignedInt returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '-' )? this_INT_1= RULE_INT ) ;
     public final AntlrDatatypeRuleToken ruleSignedInt() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -13849,24 +12475,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4832:2: ( ( (kw= '-' )? this_INT_1= RULE_INT ) )
-            // InternalTableDSL.g:4833:2: ( (kw= '-' )? this_INT_1= RULE_INT )
+            // InternalTableDSL.g:4302:2: ( ( (kw= '-' )? this_INT_1= RULE_INT ) )
+            // InternalTableDSL.g:4303:2: ( (kw= '-' )? this_INT_1= RULE_INT )
             {
-            // InternalTableDSL.g:4833:2: ( (kw= '-' )? this_INT_1= RULE_INT )
-            // InternalTableDSL.g:4834:3: (kw= '-' )? this_INT_1= RULE_INT
+            // InternalTableDSL.g:4303:2: ( (kw= '-' )? this_INT_1= RULE_INT )
+            // InternalTableDSL.g:4304:3: (kw= '-' )? this_INT_1= RULE_INT
             {
-            // InternalTableDSL.g:4834:3: (kw= '-' )?
-            int alt48=2;
-            int LA48_0 = input.LA(1);
+            // InternalTableDSL.g:4304:3: (kw= '-' )?
+            int alt43=2;
+            int LA43_0 = input.LA(1);
 
-            if ( (LA48_0==95) ) {
-                alt48=1;
+            if ( (LA43_0==92) ) {
+                alt43=1;
             }
-            switch (alt48) {
+            switch (alt43) {
                 case 1 :
-                    // InternalTableDSL.g:4835:4: kw= '-'
+                    // InternalTableDSL.g:4305:4: kw= '-'
                     {
-                    kw=(Token)match(input,95,FOLLOW_56); if (state.failed) return current;
+                    kw=(Token)match(input,92,FOLLOW_55); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
@@ -13915,7 +12541,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTRANSLATABLESTRING"
-    // InternalTableDSL.g:4852:1: entryRuleTRANSLATABLESTRING returns [String current=null] : iv_ruleTRANSLATABLESTRING= ruleTRANSLATABLESTRING EOF ;
+    // InternalTableDSL.g:4322:1: entryRuleTRANSLATABLESTRING returns [String current=null] : iv_ruleTRANSLATABLESTRING= ruleTRANSLATABLESTRING EOF ;
     public final String entryRuleTRANSLATABLESTRING() throws RecognitionException {
         String current = null;
 
@@ -13923,8 +12549,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4852:58: (iv_ruleTRANSLATABLESTRING= ruleTRANSLATABLESTRING EOF )
-            // InternalTableDSL.g:4853:2: iv_ruleTRANSLATABLESTRING= ruleTRANSLATABLESTRING EOF
+            // InternalTableDSL.g:4322:58: (iv_ruleTRANSLATABLESTRING= ruleTRANSLATABLESTRING EOF )
+            // InternalTableDSL.g:4323:2: iv_ruleTRANSLATABLESTRING= ruleTRANSLATABLESTRING EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTRANSLATABLESTRINGRule()); 
@@ -13955,7 +12581,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTRANSLATABLESTRING"
-    // InternalTableDSL.g:4859:1: ruleTRANSLATABLESTRING returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_STRING_0= RULE_STRING ;
+    // InternalTableDSL.g:4329:1: ruleTRANSLATABLESTRING returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_STRING_0= RULE_STRING ;
     public final AntlrDatatypeRuleToken ruleTRANSLATABLESTRING() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -13965,8 +12591,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4865:2: (this_STRING_0= RULE_STRING )
-            // InternalTableDSL.g:4866:2: this_STRING_0= RULE_STRING
+            // InternalTableDSL.g:4335:2: (this_STRING_0= RULE_STRING )
+            // InternalTableDSL.g:4336:2: this_STRING_0= RULE_STRING
             {
             this_STRING_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
@@ -14001,7 +12627,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXImportDeclaration"
-    // InternalTableDSL.g:4876:1: entryRuleXImportDeclaration returns [EObject current=null] : iv_ruleXImportDeclaration= ruleXImportDeclaration EOF ;
+    // InternalTableDSL.g:4346:1: entryRuleXImportDeclaration returns [EObject current=null] : iv_ruleXImportDeclaration= ruleXImportDeclaration EOF ;
     public final EObject entryRuleXImportDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -14009,8 +12635,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:4876:59: (iv_ruleXImportDeclaration= ruleXImportDeclaration EOF )
-            // InternalTableDSL.g:4877:2: iv_ruleXImportDeclaration= ruleXImportDeclaration EOF
+            // InternalTableDSL.g:4346:59: (iv_ruleXImportDeclaration= ruleXImportDeclaration EOF )
+            // InternalTableDSL.g:4347:2: iv_ruleXImportDeclaration= ruleXImportDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXImportDeclarationRule()); 
@@ -14041,7 +12667,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXImportDeclaration"
-    // InternalTableDSL.g:4883:1: ruleXImportDeclaration returns [EObject current=null] : ( () otherlv_1= 'import' ( ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) ) | ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) ) ) (otherlv_11= ';' )? ) ;
+    // InternalTableDSL.g:4353:1: ruleXImportDeclaration returns [EObject current=null] : ( () otherlv_1= 'import' ( ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) ) | ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) ) ) (otherlv_11= ';' )? ) ;
     public final EObject ruleXImportDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -14062,14 +12688,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:4889:2: ( ( () otherlv_1= 'import' ( ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) ) | ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) ) ) (otherlv_11= ';' )? ) )
-            // InternalTableDSL.g:4890:2: ( () otherlv_1= 'import' ( ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) ) | ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) ) ) (otherlv_11= ';' )? )
+            // InternalTableDSL.g:4359:2: ( ( () otherlv_1= 'import' ( ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) ) | ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) ) ) (otherlv_11= ';' )? ) )
+            // InternalTableDSL.g:4360:2: ( () otherlv_1= 'import' ( ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) ) | ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) ) ) (otherlv_11= ';' )? )
             {
-            // InternalTableDSL.g:4890:2: ( () otherlv_1= 'import' ( ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) ) | ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) ) ) (otherlv_11= ';' )? )
-            // InternalTableDSL.g:4891:3: () otherlv_1= 'import' ( ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) ) | ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) ) ) (otherlv_11= ';' )?
+            // InternalTableDSL.g:4360:2: ( () otherlv_1= 'import' ( ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) ) | ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) ) ) (otherlv_11= ';' )? )
+            // InternalTableDSL.g:4361:3: () otherlv_1= 'import' ( ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) ) | ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) ) ) (otherlv_11= ';' )?
             {
-            // InternalTableDSL.g:4891:3: ()
-            // InternalTableDSL.g:4892:4: 
+            // InternalTableDSL.g:4361:3: ()
+            // InternalTableDSL.g:4362:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14081,29 +12707,29 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,96,FOLLOW_57); if (state.failed) return current;
+            otherlv_1=(Token)match(input,93,FOLLOW_56); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXImportDeclarationAccess().getImportKeyword_1());
               		
             }
-            // InternalTableDSL.g:4902:3: ( ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) ) | ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) ) )
-            int alt51=4;
-            alt51 = dfa51.predict(input);
-            switch (alt51) {
+            // InternalTableDSL.g:4372:3: ( ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) ) | ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) ) )
+            int alt46=4;
+            alt46 = dfa46.predict(input);
+            switch (alt46) {
                 case 1 :
-                    // InternalTableDSL.g:4903:4: ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) )
+                    // InternalTableDSL.g:4373:4: ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) )
                     {
-                    // InternalTableDSL.g:4903:4: ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) )
-                    // InternalTableDSL.g:4904:5: ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) )
+                    // InternalTableDSL.g:4373:4: ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) )
+                    // InternalTableDSL.g:4374:5: ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) )
                     {
-                    // InternalTableDSL.g:4904:5: ( (lv_static_2_0= 'static' ) )
-                    // InternalTableDSL.g:4905:6: (lv_static_2_0= 'static' )
+                    // InternalTableDSL.g:4374:5: ( (lv_static_2_0= 'static' ) )
+                    // InternalTableDSL.g:4375:6: (lv_static_2_0= 'static' )
                     {
-                    // InternalTableDSL.g:4905:6: (lv_static_2_0= 'static' )
-                    // InternalTableDSL.g:4906:7: lv_static_2_0= 'static'
+                    // InternalTableDSL.g:4375:6: (lv_static_2_0= 'static' )
+                    // InternalTableDSL.g:4376:7: lv_static_2_0= 'static'
                     {
-                    lv_static_2_0=(Token)match(input,97,FOLLOW_58); if (state.failed) return current;
+                    lv_static_2_0=(Token)match(input,94,FOLLOW_57); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       							newLeafNode(lv_static_2_0, grammarAccess.getXImportDeclarationAccess().getStaticStaticKeyword_2_0_0_0());
@@ -14123,21 +12749,21 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:4918:5: ( (lv_extension_3_0= 'extension' ) )?
-                    int alt49=2;
-                    int LA49_0 = input.LA(1);
+                    // InternalTableDSL.g:4388:5: ( (lv_extension_3_0= 'extension' ) )?
+                    int alt44=2;
+                    int LA44_0 = input.LA(1);
 
-                    if ( (LA49_0==98) ) {
-                        alt49=1;
+                    if ( (LA44_0==95) ) {
+                        alt44=1;
                     }
-                    switch (alt49) {
+                    switch (alt44) {
                         case 1 :
-                            // InternalTableDSL.g:4919:6: (lv_extension_3_0= 'extension' )
+                            // InternalTableDSL.g:4389:6: (lv_extension_3_0= 'extension' )
                             {
-                            // InternalTableDSL.g:4919:6: (lv_extension_3_0= 'extension' )
-                            // InternalTableDSL.g:4920:7: lv_extension_3_0= 'extension'
+                            // InternalTableDSL.g:4389:6: (lv_extension_3_0= 'extension' )
+                            // InternalTableDSL.g:4390:7: lv_extension_3_0= 'extension'
                             {
-                            lv_extension_3_0=(Token)match(input,98,FOLLOW_58); if (state.failed) return current;
+                            lv_extension_3_0=(Token)match(input,95,FOLLOW_57); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               							newLeafNode(lv_extension_3_0, grammarAccess.getXImportDeclarationAccess().getExtensionExtensionKeyword_2_0_1_0());
@@ -14160,11 +12786,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:4932:5: ( ( ruleQualifiedNameInStaticImport ) )
-                    // InternalTableDSL.g:4933:6: ( ruleQualifiedNameInStaticImport )
+                    // InternalTableDSL.g:4402:5: ( ( ruleQualifiedNameInStaticImport ) )
+                    // InternalTableDSL.g:4403:6: ( ruleQualifiedNameInStaticImport )
                     {
-                    // InternalTableDSL.g:4933:6: ( ruleQualifiedNameInStaticImport )
-                    // InternalTableDSL.g:4934:7: ruleQualifiedNameInStaticImport
+                    // InternalTableDSL.g:4403:6: ( ruleQualifiedNameInStaticImport )
+                    // InternalTableDSL.g:4404:7: ruleQualifiedNameInStaticImport
                     {
                     if ( state.backtracking==0 ) {
 
@@ -14178,7 +12804,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       							newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_2_0_2_0());
                       						
                     }
-                    pushFollow(FOLLOW_59);
+                    pushFollow(FOLLOW_58);
                     ruleQualifiedNameInStaticImport();
 
                     state._fsp--;
@@ -14194,34 +12820,34 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:4948:5: ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) )
-                    int alt50=2;
-                    int LA50_0 = input.LA(1);
+                    // InternalTableDSL.g:4418:5: ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) )
+                    int alt45=2;
+                    int LA45_0 = input.LA(1);
 
-                    if ( (LA50_0==99) ) {
-                        alt50=1;
+                    if ( (LA45_0==96) ) {
+                        alt45=1;
                     }
-                    else if ( (LA50_0==RULE_ID) ) {
-                        alt50=2;
+                    else if ( (LA45_0==RULE_ID) ) {
+                        alt45=2;
                     }
                     else {
                         if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
-                            new NoViableAltException("", 50, 0, input);
+                            new NoViableAltException("", 45, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt50) {
+                    switch (alt45) {
                         case 1 :
-                            // InternalTableDSL.g:4949:6: ( (lv_wildcard_5_0= '*' ) )
+                            // InternalTableDSL.g:4419:6: ( (lv_wildcard_5_0= '*' ) )
                             {
-                            // InternalTableDSL.g:4949:6: ( (lv_wildcard_5_0= '*' ) )
-                            // InternalTableDSL.g:4950:7: (lv_wildcard_5_0= '*' )
+                            // InternalTableDSL.g:4419:6: ( (lv_wildcard_5_0= '*' ) )
+                            // InternalTableDSL.g:4420:7: (lv_wildcard_5_0= '*' )
                             {
-                            // InternalTableDSL.g:4950:7: (lv_wildcard_5_0= '*' )
-                            // InternalTableDSL.g:4951:8: lv_wildcard_5_0= '*'
+                            // InternalTableDSL.g:4420:7: (lv_wildcard_5_0= '*' )
+                            // InternalTableDSL.g:4421:8: lv_wildcard_5_0= '*'
                             {
-                            lv_wildcard_5_0=(Token)match(input,99,FOLLOW_60); if (state.failed) return current;
+                            lv_wildcard_5_0=(Token)match(input,96,FOLLOW_59); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               								newLeafNode(lv_wildcard_5_0, grammarAccess.getXImportDeclarationAccess().getWildcardAsteriskKeyword_2_0_3_0_0());
@@ -14245,20 +12871,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // InternalTableDSL.g:4964:6: ( (lv_memberName_6_0= ruleValidID ) )
+                            // InternalTableDSL.g:4434:6: ( (lv_memberName_6_0= ruleValidID ) )
                             {
-                            // InternalTableDSL.g:4964:6: ( (lv_memberName_6_0= ruleValidID ) )
-                            // InternalTableDSL.g:4965:7: (lv_memberName_6_0= ruleValidID )
+                            // InternalTableDSL.g:4434:6: ( (lv_memberName_6_0= ruleValidID ) )
+                            // InternalTableDSL.g:4435:7: (lv_memberName_6_0= ruleValidID )
                             {
-                            // InternalTableDSL.g:4965:7: (lv_memberName_6_0= ruleValidID )
-                            // InternalTableDSL.g:4966:8: lv_memberName_6_0= ruleValidID
+                            // InternalTableDSL.g:4435:7: (lv_memberName_6_0= ruleValidID )
+                            // InternalTableDSL.g:4436:8: lv_memberName_6_0= ruleValidID
                             {
                             if ( state.backtracking==0 ) {
 
                               								newCompositeNode(grammarAccess.getXImportDeclarationAccess().getMemberNameValidIDParserRuleCall_2_0_3_1_0());
                               							
                             }
-                            pushFollow(FOLLOW_60);
+                            pushFollow(FOLLOW_59);
                             lv_memberName_6_0=ruleValidID();
 
                             state._fsp--;
@@ -14295,13 +12921,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:4986:4: ( ( ruleQualifiedName ) )
+                    // InternalTableDSL.g:4456:4: ( ( ruleQualifiedName ) )
                     {
-                    // InternalTableDSL.g:4986:4: ( ( ruleQualifiedName ) )
-                    // InternalTableDSL.g:4987:5: ( ruleQualifiedName )
+                    // InternalTableDSL.g:4456:4: ( ( ruleQualifiedName ) )
+                    // InternalTableDSL.g:4457:5: ( ruleQualifiedName )
                     {
-                    // InternalTableDSL.g:4987:5: ( ruleQualifiedName )
-                    // InternalTableDSL.g:4988:6: ruleQualifiedName
+                    // InternalTableDSL.g:4457:5: ( ruleQualifiedName )
+                    // InternalTableDSL.g:4458:6: ruleQualifiedName
                     {
                     if ( state.backtracking==0 ) {
 
@@ -14315,7 +12941,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       						newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_2_1_0());
                       					
                     }
-                    pushFollow(FOLLOW_60);
+                    pushFollow(FOLLOW_59);
                     ruleQualifiedName();
 
                     state._fsp--;
@@ -14335,20 +12961,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:5003:4: ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) )
+                    // InternalTableDSL.g:4473:4: ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) )
                     {
-                    // InternalTableDSL.g:5003:4: ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) )
-                    // InternalTableDSL.g:5004:5: (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard )
+                    // InternalTableDSL.g:4473:4: ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) )
+                    // InternalTableDSL.g:4474:5: (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard )
                     {
-                    // InternalTableDSL.g:5004:5: (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard )
-                    // InternalTableDSL.g:5005:6: lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard
+                    // InternalTableDSL.g:4474:5: (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard )
+                    // InternalTableDSL.g:4475:6: lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceQualifiedNameWithWildcardParserRuleCall_2_2_0());
                       					
                     }
-                    pushFollow(FOLLOW_60);
+                    pushFollow(FOLLOW_59);
                     lv_importedNamespace_8_0=ruleQualifiedNameWithWildcard();
 
                     state._fsp--;
@@ -14376,18 +13002,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:5023:4: ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) )
+                    // InternalTableDSL.g:4493:4: ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) )
                     {
-                    // InternalTableDSL.g:5023:4: ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) )
-                    // InternalTableDSL.g:5024:5: ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) )
+                    // InternalTableDSL.g:4493:4: ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) )
+                    // InternalTableDSL.g:4494:5: ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) )
                     {
-                    // InternalTableDSL.g:5024:5: ( (lv_fqnImport_9_0= 'ns' ) )
-                    // InternalTableDSL.g:5025:6: (lv_fqnImport_9_0= 'ns' )
+                    // InternalTableDSL.g:4494:5: ( (lv_fqnImport_9_0= 'ns' ) )
+                    // InternalTableDSL.g:4495:6: (lv_fqnImport_9_0= 'ns' )
                     {
-                    // InternalTableDSL.g:5025:6: (lv_fqnImport_9_0= 'ns' )
-                    // InternalTableDSL.g:5026:7: lv_fqnImport_9_0= 'ns'
+                    // InternalTableDSL.g:4495:6: (lv_fqnImport_9_0= 'ns' )
+                    // InternalTableDSL.g:4496:7: lv_fqnImport_9_0= 'ns'
                     {
-                    lv_fqnImport_9_0=(Token)match(input,100,FOLLOW_4); if (state.failed) return current;
+                    lv_fqnImport_9_0=(Token)match(input,97,FOLLOW_4); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       							newLeafNode(lv_fqnImport_9_0, grammarAccess.getXImportDeclarationAccess().getFqnImportNsKeyword_2_3_0_0());
@@ -14407,18 +13033,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:5038:5: ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) )
-                    // InternalTableDSL.g:5039:6: (lv_importedFullyQualifiedName_10_0= ruleQualifiedName )
+                    // InternalTableDSL.g:4508:5: ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) )
+                    // InternalTableDSL.g:4509:6: (lv_importedFullyQualifiedName_10_0= ruleQualifiedName )
                     {
-                    // InternalTableDSL.g:5039:6: (lv_importedFullyQualifiedName_10_0= ruleQualifiedName )
-                    // InternalTableDSL.g:5040:7: lv_importedFullyQualifiedName_10_0= ruleQualifiedName
+                    // InternalTableDSL.g:4509:6: (lv_importedFullyQualifiedName_10_0= ruleQualifiedName )
+                    // InternalTableDSL.g:4510:7: lv_importedFullyQualifiedName_10_0= ruleQualifiedName
                     {
                     if ( state.backtracking==0 ) {
 
                       							newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedFullyQualifiedNameQualifiedNameParserRuleCall_2_3_1_0());
                       						
                     }
-                    pushFollow(FOLLOW_60);
+                    pushFollow(FOLLOW_59);
                     lv_importedFullyQualifiedName_10_0=ruleQualifiedName();
 
                     state._fsp--;
@@ -14451,18 +13077,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:5059:3: (otherlv_11= ';' )?
-            int alt52=2;
-            int LA52_0 = input.LA(1);
+            // InternalTableDSL.g:4529:3: (otherlv_11= ';' )?
+            int alt47=2;
+            int LA47_0 = input.LA(1);
 
-            if ( (LA52_0==101) ) {
-                alt52=1;
+            if ( (LA47_0==98) ) {
+                alt47=1;
             }
-            switch (alt52) {
+            switch (alt47) {
                 case 1 :
-                    // InternalTableDSL.g:5060:4: otherlv_11= ';'
+                    // InternalTableDSL.g:4530:4: otherlv_11= ';'
                     {
-                    otherlv_11=(Token)match(input,101,FOLLOW_2); if (state.failed) return current;
+                    otherlv_11=(Token)match(input,98,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_11, grammarAccess.getXImportDeclarationAccess().getSemicolonKeyword_3());
@@ -14499,7 +13125,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAnnotation"
-    // InternalTableDSL.g:5069:1: entryRuleXAnnotation returns [EObject current=null] : iv_ruleXAnnotation= ruleXAnnotation EOF ;
+    // InternalTableDSL.g:4539:1: entryRuleXAnnotation returns [EObject current=null] : iv_ruleXAnnotation= ruleXAnnotation EOF ;
     public final EObject entryRuleXAnnotation() throws RecognitionException {
         EObject current = null;
 
@@ -14507,8 +13133,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:5069:52: (iv_ruleXAnnotation= ruleXAnnotation EOF )
-            // InternalTableDSL.g:5070:2: iv_ruleXAnnotation= ruleXAnnotation EOF
+            // InternalTableDSL.g:4539:52: (iv_ruleXAnnotation= ruleXAnnotation EOF )
+            // InternalTableDSL.g:4540:2: iv_ruleXAnnotation= ruleXAnnotation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationRule()); 
@@ -14539,7 +13165,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAnnotation"
-    // InternalTableDSL.g:5076:1: ruleXAnnotation returns [EObject current=null] : ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) ;
+    // InternalTableDSL.g:4546:1: ruleXAnnotation returns [EObject current=null] : ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) ;
     public final EObject ruleXAnnotation() throws RecognitionException {
         EObject current = null;
 
@@ -14558,14 +13184,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:5082:2: ( ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) )
-            // InternalTableDSL.g:5083:2: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
+            // InternalTableDSL.g:4552:2: ( ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) )
+            // InternalTableDSL.g:4553:2: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
             {
-            // InternalTableDSL.g:5083:2: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
-            // InternalTableDSL.g:5084:3: () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
+            // InternalTableDSL.g:4553:2: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
+            // InternalTableDSL.g:4554:3: () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
             {
-            // InternalTableDSL.g:5084:3: ()
-            // InternalTableDSL.g:5085:4: 
+            // InternalTableDSL.g:4554:3: ()
+            // InternalTableDSL.g:4555:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14577,17 +13203,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,102,FOLLOW_4); if (state.failed) return current;
+            otherlv_1=(Token)match(input,99,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1());
               		
             }
-            // InternalTableDSL.g:5095:3: ( ( ruleQualifiedName ) )
-            // InternalTableDSL.g:5096:4: ( ruleQualifiedName )
+            // InternalTableDSL.g:4565:3: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:4566:4: ( ruleQualifiedName )
             {
-            // InternalTableDSL.g:5096:4: ( ruleQualifiedName )
-            // InternalTableDSL.g:5097:5: ruleQualifiedName
+            // InternalTableDSL.g:4566:4: ( ruleQualifiedName )
+            // InternalTableDSL.g:4567:5: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -14601,7 +13227,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               					newCompositeNode(grammarAccess.getXAnnotationAccess().getAnnotationTypeJvmAnnotationTypeCrossReference_2_0());
               				
             }
-            pushFollow(FOLLOW_61);
+            pushFollow(FOLLOW_60);
             ruleQualifiedName();
 
             state._fsp--;
@@ -14617,21 +13243,21 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:5111:3: ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
-            int alt55=2;
-            int LA55_0 = input.LA(1);
+            // InternalTableDSL.g:4581:3: ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
+            int alt50=2;
+            int LA50_0 = input.LA(1);
 
-            if ( (LA55_0==103) && (synpred1_InternalTableDSL())) {
-                alt55=1;
+            if ( (LA50_0==100) && (synpred1_InternalTableDSL())) {
+                alt50=1;
             }
-            switch (alt55) {
+            switch (alt50) {
                 case 1 :
-                    // InternalTableDSL.g:5112:4: ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')'
+                    // InternalTableDSL.g:4582:4: ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')'
                     {
-                    // InternalTableDSL.g:5112:4: ( ( '(' )=>otherlv_3= '(' )
-                    // InternalTableDSL.g:5113:5: ( '(' )=>otherlv_3= '('
+                    // InternalTableDSL.g:4582:4: ( ( '(' )=>otherlv_3= '(' )
+                    // InternalTableDSL.g:4583:5: ( '(' )=>otherlv_3= '('
                     {
-                    otherlv_3=(Token)match(input,103,FOLLOW_62); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,100,FOLLOW_61); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(otherlv_3, grammarAccess.getXAnnotationAccess().getLeftParenthesisKeyword_3_0());
@@ -14640,28 +13266,28 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:5119:4: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?
-                    int alt54=3;
-                    alt54 = dfa54.predict(input);
-                    switch (alt54) {
+                    // InternalTableDSL.g:4589:4: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?
+                    int alt49=3;
+                    alt49 = dfa49.predict(input);
+                    switch (alt49) {
                         case 1 :
-                            // InternalTableDSL.g:5120:5: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
+                            // InternalTableDSL.g:4590:5: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
                             {
-                            // InternalTableDSL.g:5120:5: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
-                            // InternalTableDSL.g:5121:6: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
+                            // InternalTableDSL.g:4590:5: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
+                            // InternalTableDSL.g:4591:6: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
                             {
-                            // InternalTableDSL.g:5121:6: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) )
-                            // InternalTableDSL.g:5122:7: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
+                            // InternalTableDSL.g:4591:6: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) )
+                            // InternalTableDSL.g:4592:7: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
                             {
-                            // InternalTableDSL.g:5131:7: (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
-                            // InternalTableDSL.g:5132:8: lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair
+                            // InternalTableDSL.g:4601:7: (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
+                            // InternalTableDSL.g:4602:8: lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair
                             {
                             if ( state.backtracking==0 ) {
 
                               								newCompositeNode(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_0_0());
                               							
                             }
-                            pushFollow(FOLLOW_63);
+                            pushFollow(FOLLOW_62);
                             lv_elementValuePairs_4_0=ruleXAnnotationElementValuePair();
 
                             state._fsp--;
@@ -14685,39 +13311,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalTableDSL.g:5149:6: (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
-                            loop53:
+                            // InternalTableDSL.g:4619:6: (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
+                            loop48:
                             do {
-                                int alt53=2;
-                                int LA53_0 = input.LA(1);
+                                int alt48=2;
+                                int LA48_0 = input.LA(1);
 
-                                if ( (LA53_0==104) ) {
-                                    alt53=1;
+                                if ( (LA48_0==101) ) {
+                                    alt48=1;
                                 }
 
 
-                                switch (alt53) {
+                                switch (alt48) {
                             	case 1 :
-                            	    // InternalTableDSL.g:5150:7: otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
+                            	    // InternalTableDSL.g:4620:7: otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
                             	    {
-                            	    otherlv_5=(Token)match(input,104,FOLLOW_4); if (state.failed) return current;
+                            	    otherlv_5=(Token)match(input,101,FOLLOW_4); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      							newLeafNode(otherlv_5, grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0());
                             	      						
                             	    }
-                            	    // InternalTableDSL.g:5154:7: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
-                            	    // InternalTableDSL.g:5155:8: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
+                            	    // InternalTableDSL.g:4624:7: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
+                            	    // InternalTableDSL.g:4625:8: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
                             	    {
-                            	    // InternalTableDSL.g:5164:8: (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
-                            	    // InternalTableDSL.g:5165:9: lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair
+                            	    // InternalTableDSL.g:4634:8: (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
+                            	    // InternalTableDSL.g:4635:9: lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair
                             	    {
                             	    if ( state.backtracking==0 ) {
 
                             	      									newCompositeNode(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_1_1_0());
                             	      								
                             	    }
-                            	    pushFollow(FOLLOW_63);
+                            	    pushFollow(FOLLOW_62);
                             	    lv_elementValuePairs_6_0=ruleXAnnotationElementValuePair();
 
                             	    state._fsp--;
@@ -14746,7 +13372,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    break loop53;
+                            	    break loop48;
                                 }
                             } while (true);
 
@@ -14757,20 +13383,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // InternalTableDSL.g:5185:5: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
+                            // InternalTableDSL.g:4655:5: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
                             {
-                            // InternalTableDSL.g:5185:5: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
-                            // InternalTableDSL.g:5186:6: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
+                            // InternalTableDSL.g:4655:5: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
+                            // InternalTableDSL.g:4656:6: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
                             {
-                            // InternalTableDSL.g:5186:6: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
-                            // InternalTableDSL.g:5187:7: lv_value_7_0= ruleXAnnotationElementValueOrCommaList
+                            // InternalTableDSL.g:4656:6: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
+                            // InternalTableDSL.g:4657:7: lv_value_7_0= ruleXAnnotationElementValueOrCommaList
                             {
                             if ( state.backtracking==0 ) {
 
                               							newCompositeNode(grammarAccess.getXAnnotationAccess().getValueXAnnotationElementValueOrCommaListParserRuleCall_3_1_1_0());
                               						
                             }
-                            pushFollow(FOLLOW_64);
+                            pushFollow(FOLLOW_63);
                             lv_value_7_0=ruleXAnnotationElementValueOrCommaList();
 
                             state._fsp--;
@@ -14800,7 +13426,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_8=(Token)match(input,105,FOLLOW_2); if (state.failed) return current;
+                    otherlv_8=(Token)match(input,102,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_8, grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2());
@@ -14837,7 +13463,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAnnotationElementValuePair"
-    // InternalTableDSL.g:5214:1: entryRuleXAnnotationElementValuePair returns [EObject current=null] : iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF ;
+    // InternalTableDSL.g:4684:1: entryRuleXAnnotationElementValuePair returns [EObject current=null] : iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF ;
     public final EObject entryRuleXAnnotationElementValuePair() throws RecognitionException {
         EObject current = null;
 
@@ -14845,8 +13471,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:5214:68: (iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF )
-            // InternalTableDSL.g:5215:2: iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF
+            // InternalTableDSL.g:4684:68: (iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF )
+            // InternalTableDSL.g:4685:2: iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationElementValuePairRule()); 
@@ -14877,7 +13503,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAnnotationElementValuePair"
-    // InternalTableDSL.g:5221:1: ruleXAnnotationElementValuePair returns [EObject current=null] : ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) ;
+    // InternalTableDSL.g:4691:1: ruleXAnnotationElementValuePair returns [EObject current=null] : ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) ;
     public final EObject ruleXAnnotationElementValuePair() throws RecognitionException {
         EObject current = null;
 
@@ -14889,23 +13515,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:5227:2: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) )
-            // InternalTableDSL.g:5228:2: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
+            // InternalTableDSL.g:4697:2: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) )
+            // InternalTableDSL.g:4698:2: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
             {
-            // InternalTableDSL.g:5228:2: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
-            // InternalTableDSL.g:5229:3: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) )
+            // InternalTableDSL.g:4698:2: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
+            // InternalTableDSL.g:4699:3: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) )
             {
-            // InternalTableDSL.g:5229:3: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) )
-            // InternalTableDSL.g:5230:4: ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' )
+            // InternalTableDSL.g:4699:3: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) )
+            // InternalTableDSL.g:4700:4: ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' )
             {
-            // InternalTableDSL.g:5239:4: ( ( ( ruleValidID ) ) otherlv_1= '=' )
-            // InternalTableDSL.g:5240:5: ( ( ruleValidID ) ) otherlv_1= '='
+            // InternalTableDSL.g:4709:4: ( ( ( ruleValidID ) ) otherlv_1= '=' )
+            // InternalTableDSL.g:4710:5: ( ( ruleValidID ) ) otherlv_1= '='
             {
-            // InternalTableDSL.g:5240:5: ( ( ruleValidID ) )
-            // InternalTableDSL.g:5241:6: ( ruleValidID )
+            // InternalTableDSL.g:4710:5: ( ( ruleValidID ) )
+            // InternalTableDSL.g:4711:6: ( ruleValidID )
             {
-            // InternalTableDSL.g:5241:6: ( ruleValidID )
-            // InternalTableDSL.g:5242:7: ruleValidID
+            // InternalTableDSL.g:4711:6: ( ruleValidID )
+            // InternalTableDSL.g:4712:7: ruleValidID
             {
             if ( state.backtracking==0 ) {
 
@@ -14919,7 +13545,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               							newCompositeNode(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationCrossReference_0_0_0_0());
               						
             }
-            pushFollow(FOLLOW_65);
+            pushFollow(FOLLOW_64);
             ruleValidID();
 
             state._fsp--;
@@ -14935,7 +13561,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,106,FOLLOW_66); if (state.failed) return current;
+            otherlv_1=(Token)match(input,103,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValuePairAccess().getEqualsSignKeyword_0_0_1());
@@ -14947,11 +13573,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:5262:3: ( (lv_value_2_0= ruleXAnnotationElementValue ) )
-            // InternalTableDSL.g:5263:4: (lv_value_2_0= ruleXAnnotationElementValue )
+            // InternalTableDSL.g:4732:3: ( (lv_value_2_0= ruleXAnnotationElementValue ) )
+            // InternalTableDSL.g:4733:4: (lv_value_2_0= ruleXAnnotationElementValue )
             {
-            // InternalTableDSL.g:5263:4: (lv_value_2_0= ruleXAnnotationElementValue )
-            // InternalTableDSL.g:5264:5: lv_value_2_0= ruleXAnnotationElementValue
+            // InternalTableDSL.g:4733:4: (lv_value_2_0= ruleXAnnotationElementValue )
+            // InternalTableDSL.g:4734:5: lv_value_2_0= ruleXAnnotationElementValue
             {
             if ( state.backtracking==0 ) {
 
@@ -15007,7 +13633,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAnnotationElementValueOrCommaList"
-    // InternalTableDSL.g:5285:1: entryRuleXAnnotationElementValueOrCommaList returns [EObject current=null] : iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF ;
+    // InternalTableDSL.g:4755:1: entryRuleXAnnotationElementValueOrCommaList returns [EObject current=null] : iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF ;
     public final EObject entryRuleXAnnotationElementValueOrCommaList() throws RecognitionException {
         EObject current = null;
 
@@ -15015,8 +13641,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:5285:75: (iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF )
-            // InternalTableDSL.g:5286:2: iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF
+            // InternalTableDSL.g:4755:75: (iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF )
+            // InternalTableDSL.g:4756:2: iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListRule()); 
@@ -15047,7 +13673,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAnnotationElementValueOrCommaList"
-    // InternalTableDSL.g:5292:1: ruleXAnnotationElementValueOrCommaList returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) ;
+    // InternalTableDSL.g:4762:1: ruleXAnnotationElementValueOrCommaList returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) ;
     public final EObject ruleXAnnotationElementValueOrCommaList() throws RecognitionException {
         EObject current = null;
 
@@ -15069,27 +13695,27 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:5298:2: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) )
-            // InternalTableDSL.g:5299:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
+            // InternalTableDSL.g:4768:2: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) )
+            // InternalTableDSL.g:4769:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
             {
-            // InternalTableDSL.g:5299:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
-            int alt60=2;
-            alt60 = dfa60.predict(input);
-            switch (alt60) {
+            // InternalTableDSL.g:4769:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
+            int alt55=2;
+            alt55 = dfa55.predict(input);
+            switch (alt55) {
                 case 1 :
-                    // InternalTableDSL.g:5300:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalTableDSL.g:4770:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
                     {
-                    // InternalTableDSL.g:5300:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
-                    // InternalTableDSL.g:5301:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
+                    // InternalTableDSL.g:4770:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalTableDSL.g:4771:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
                     {
-                    // InternalTableDSL.g:5301:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
-                    // InternalTableDSL.g:5302:5: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalTableDSL.g:4771:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
+                    // InternalTableDSL.g:4772:5: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
                     {
-                    // InternalTableDSL.g:5309:5: ( () otherlv_1= '#' otherlv_2= '[' )
-                    // InternalTableDSL.g:5310:6: () otherlv_1= '#' otherlv_2= '['
+                    // InternalTableDSL.g:4779:5: ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalTableDSL.g:4780:6: () otherlv_1= '#' otherlv_2= '['
                     {
-                    // InternalTableDSL.g:5310:6: ()
-                    // InternalTableDSL.g:5311:7: 
+                    // InternalTableDSL.g:4780:6: ()
+                    // InternalTableDSL.g:4781:7: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -15101,13 +13727,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_1=(Token)match(input,107,FOLLOW_67); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,104,FOLLOW_66); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1());
                       					
                     }
-                    otherlv_2=(Token)match(input,108,FOLLOW_68); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,105,FOLLOW_67); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(otherlv_2, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2());
@@ -15119,29 +13745,29 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:5327:4: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
-                    int alt57=2;
-                    int LA57_0 = input.LA(1);
+                    // InternalTableDSL.g:4797:4: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
+                    int alt52=2;
+                    int LA52_0 = input.LA(1);
 
-                    if ( ((LA57_0>=RULE_ID && LA57_0<=RULE_STRING)||(LA57_0>=RULE_INT && LA57_0<=RULE_DECIMAL)||LA57_0==16||(LA57_0>=94 && LA57_0<=98)||(LA57_0>=102 && LA57_0<=103)||(LA57_0>=107 && LA57_0<=108)||LA57_0==115||LA57_0==134||LA57_0==140||LA57_0==142||(LA57_0>=146 && LA57_0<=148)||(LA57_0>=151 && LA57_0<=160)||LA57_0==162) ) {
-                        alt57=1;
+                    if ( ((LA52_0>=RULE_ID && LA52_0<=RULE_STRING)||(LA52_0>=RULE_INT && LA52_0<=RULE_DECIMAL)||LA52_0==16||(LA52_0>=91 && LA52_0<=95)||(LA52_0>=99 && LA52_0<=100)||(LA52_0>=104 && LA52_0<=105)||LA52_0==112||LA52_0==131||LA52_0==137||LA52_0==139||(LA52_0>=143 && LA52_0<=145)||(LA52_0>=148 && LA52_0<=157)||LA52_0==159) ) {
+                        alt52=1;
                     }
-                    switch (alt57) {
+                    switch (alt52) {
                         case 1 :
-                            // InternalTableDSL.g:5328:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            // InternalTableDSL.g:4798:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
                             {
-                            // InternalTableDSL.g:5328:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
-                            // InternalTableDSL.g:5329:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalTableDSL.g:4798:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
+                            // InternalTableDSL.g:4799:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
                             {
-                            // InternalTableDSL.g:5329:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
-                            // InternalTableDSL.g:5330:7: lv_elements_3_0= ruleXAnnotationOrExpression
+                            // InternalTableDSL.g:4799:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalTableDSL.g:4800:7: lv_elements_3_0= ruleXAnnotationOrExpression
                             {
                             if ( state.backtracking==0 ) {
 
                               							newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0());
                               						
                             }
-                            pushFollow(FOLLOW_69);
+                            pushFollow(FOLLOW_68);
                             lv_elements_3_0=ruleXAnnotationOrExpression();
 
                             state._fsp--;
@@ -15165,39 +13791,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalTableDSL.g:5347:5: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
-                            loop56:
+                            // InternalTableDSL.g:4817:5: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            loop51:
                             do {
-                                int alt56=2;
-                                int LA56_0 = input.LA(1);
+                                int alt51=2;
+                                int LA51_0 = input.LA(1);
 
-                                if ( (LA56_0==104) ) {
-                                    alt56=1;
+                                if ( (LA51_0==101) ) {
+                                    alt51=1;
                                 }
 
 
-                                switch (alt56) {
+                                switch (alt51) {
                             	case 1 :
-                            	    // InternalTableDSL.g:5348:6: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalTableDSL.g:4818:6: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
                             	    {
-                            	    otherlv_4=(Token)match(input,104,FOLLOW_66); if (state.failed) return current;
+                            	    otherlv_4=(Token)match(input,101,FOLLOW_65); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      						newLeafNode(otherlv_4, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0());
                             	      					
                             	    }
-                            	    // InternalTableDSL.g:5352:6: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
-                            	    // InternalTableDSL.g:5353:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalTableDSL.g:4822:6: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalTableDSL.g:4823:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
                             	    {
-                            	    // InternalTableDSL.g:5353:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
-                            	    // InternalTableDSL.g:5354:8: lv_elements_5_0= ruleXAnnotationOrExpression
+                            	    // InternalTableDSL.g:4823:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalTableDSL.g:4824:8: lv_elements_5_0= ruleXAnnotationOrExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
 
                             	      								newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0());
                             	      							
                             	    }
-                            	    pushFollow(FOLLOW_69);
+                            	    pushFollow(FOLLOW_68);
                             	    lv_elements_5_0=ruleXAnnotationOrExpression();
 
                             	    state._fsp--;
@@ -15226,7 +13852,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    break loop56;
+                            	    break loop51;
                                 }
                             } while (true);
 
@@ -15236,7 +13862,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_6=(Token)match(input,109,FOLLOW_2); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,106,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_6, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2());
@@ -15249,17 +13875,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:5379:3: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
+                    // InternalTableDSL.g:4849:3: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
                     {
-                    // InternalTableDSL.g:5379:3: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
-                    // InternalTableDSL.g:5380:4: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
+                    // InternalTableDSL.g:4849:3: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
+                    // InternalTableDSL.g:4850:4: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
                     {
                     if ( state.backtracking==0 ) {
 
                       				newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXAnnotationOrExpressionParserRuleCall_1_0());
                       			
                     }
-                    pushFollow(FOLLOW_70);
+                    pushFollow(FOLLOW_69);
                     this_XAnnotationOrExpression_7=ruleXAnnotationOrExpression();
 
                     state._fsp--;
@@ -15270,19 +13896,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       				afterParserOrEnumRuleCall();
                       			
                     }
-                    // InternalTableDSL.g:5388:4: ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
-                    int alt59=2;
-                    int LA59_0 = input.LA(1);
+                    // InternalTableDSL.g:4858:4: ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
+                    int alt54=2;
+                    int LA54_0 = input.LA(1);
 
-                    if ( (LA59_0==104) ) {
-                        alt59=1;
+                    if ( (LA54_0==101) ) {
+                        alt54=1;
                     }
-                    switch (alt59) {
+                    switch (alt54) {
                         case 1 :
-                            // InternalTableDSL.g:5389:5: () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
+                            // InternalTableDSL.g:4859:5: () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
                             {
-                            // InternalTableDSL.g:5389:5: ()
-                            // InternalTableDSL.g:5390:6: 
+                            // InternalTableDSL.g:4859:5: ()
+                            // InternalTableDSL.g:4860:6: 
                             {
                             if ( state.backtracking==0 ) {
 
@@ -15294,40 +13920,40 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalTableDSL.g:5396:5: (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
-                            int cnt58=0;
-                            loop58:
+                            // InternalTableDSL.g:4866:5: (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
+                            int cnt53=0;
+                            loop53:
                             do {
-                                int alt58=2;
-                                int LA58_0 = input.LA(1);
+                                int alt53=2;
+                                int LA53_0 = input.LA(1);
 
-                                if ( (LA58_0==104) ) {
-                                    alt58=1;
+                                if ( (LA53_0==101) ) {
+                                    alt53=1;
                                 }
 
 
-                                switch (alt58) {
+                                switch (alt53) {
                             	case 1 :
-                            	    // InternalTableDSL.g:5397:6: otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalTableDSL.g:4867:6: otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
                             	    {
-                            	    otherlv_9=(Token)match(input,104,FOLLOW_66); if (state.failed) return current;
+                            	    otherlv_9=(Token)match(input,101,FOLLOW_65); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      						newLeafNode(otherlv_9, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0());
                             	      					
                             	    }
-                            	    // InternalTableDSL.g:5401:6: ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
-                            	    // InternalTableDSL.g:5402:7: (lv_elements_10_0= ruleXAnnotationOrExpression )
+                            	    // InternalTableDSL.g:4871:6: ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalTableDSL.g:4872:7: (lv_elements_10_0= ruleXAnnotationOrExpression )
                             	    {
-                            	    // InternalTableDSL.g:5402:7: (lv_elements_10_0= ruleXAnnotationOrExpression )
-                            	    // InternalTableDSL.g:5403:8: lv_elements_10_0= ruleXAnnotationOrExpression
+                            	    // InternalTableDSL.g:4872:7: (lv_elements_10_0= ruleXAnnotationOrExpression )
+                            	    // InternalTableDSL.g:4873:8: lv_elements_10_0= ruleXAnnotationOrExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
 
                             	      								newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_1_1_1_1_0());
                             	      							
                             	    }
-                            	    pushFollow(FOLLOW_70);
+                            	    pushFollow(FOLLOW_69);
                             	    lv_elements_10_0=ruleXAnnotationOrExpression();
 
                             	    state._fsp--;
@@ -15356,13 +13982,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    if ( cnt58 >= 1 ) break loop58;
+                            	    if ( cnt53 >= 1 ) break loop53;
                             	    if (state.backtracking>0) {state.failed=true; return current;}
                                         EarlyExitException eee =
-                                            new EarlyExitException(58, input);
+                                            new EarlyExitException(53, input);
                                         throw eee;
                                 }
-                                cnt58++;
+                                cnt53++;
                             } while (true);
 
 
@@ -15402,7 +14028,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAnnotationElementValue"
-    // InternalTableDSL.g:5427:1: entryRuleXAnnotationElementValue returns [EObject current=null] : iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF ;
+    // InternalTableDSL.g:4897:1: entryRuleXAnnotationElementValue returns [EObject current=null] : iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF ;
     public final EObject entryRuleXAnnotationElementValue() throws RecognitionException {
         EObject current = null;
 
@@ -15410,8 +14036,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:5427:64: (iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF )
-            // InternalTableDSL.g:5428:2: iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF
+            // InternalTableDSL.g:4897:64: (iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF )
+            // InternalTableDSL.g:4898:2: iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationElementValueRule()); 
@@ -15442,7 +14068,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAnnotationElementValue"
-    // InternalTableDSL.g:5434:1: ruleXAnnotationElementValue returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) ;
+    // InternalTableDSL.g:4904:1: ruleXAnnotationElementValue returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) ;
     public final EObject ruleXAnnotationElementValue() throws RecognitionException {
         EObject current = null;
 
@@ -15461,27 +14087,27 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:5440:2: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) )
-            // InternalTableDSL.g:5441:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
+            // InternalTableDSL.g:4910:2: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) )
+            // InternalTableDSL.g:4911:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
             {
-            // InternalTableDSL.g:5441:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
-            int alt63=2;
-            alt63 = dfa63.predict(input);
-            switch (alt63) {
+            // InternalTableDSL.g:4911:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
+            int alt58=2;
+            alt58 = dfa58.predict(input);
+            switch (alt58) {
                 case 1 :
-                    // InternalTableDSL.g:5442:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalTableDSL.g:4912:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
                     {
-                    // InternalTableDSL.g:5442:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
-                    // InternalTableDSL.g:5443:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
+                    // InternalTableDSL.g:4912:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalTableDSL.g:4913:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
                     {
-                    // InternalTableDSL.g:5443:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
-                    // InternalTableDSL.g:5444:5: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalTableDSL.g:4913:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
+                    // InternalTableDSL.g:4914:5: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
                     {
-                    // InternalTableDSL.g:5451:5: ( () otherlv_1= '#' otherlv_2= '[' )
-                    // InternalTableDSL.g:5452:6: () otherlv_1= '#' otherlv_2= '['
+                    // InternalTableDSL.g:4921:5: ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalTableDSL.g:4922:6: () otherlv_1= '#' otherlv_2= '['
                     {
-                    // InternalTableDSL.g:5452:6: ()
-                    // InternalTableDSL.g:5453:7: 
+                    // InternalTableDSL.g:4922:6: ()
+                    // InternalTableDSL.g:4923:7: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -15493,13 +14119,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_1=(Token)match(input,107,FOLLOW_67); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,104,FOLLOW_66); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1());
                       					
                     }
-                    otherlv_2=(Token)match(input,108,FOLLOW_68); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,105,FOLLOW_67); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(otherlv_2, grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2());
@@ -15511,29 +14137,29 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:5469:4: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
-                    int alt62=2;
-                    int LA62_0 = input.LA(1);
+                    // InternalTableDSL.g:4939:4: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
+                    int alt57=2;
+                    int LA57_0 = input.LA(1);
 
-                    if ( ((LA62_0>=RULE_ID && LA62_0<=RULE_STRING)||(LA62_0>=RULE_INT && LA62_0<=RULE_DECIMAL)||LA62_0==16||(LA62_0>=94 && LA62_0<=98)||(LA62_0>=102 && LA62_0<=103)||(LA62_0>=107 && LA62_0<=108)||LA62_0==115||LA62_0==134||LA62_0==140||LA62_0==142||(LA62_0>=146 && LA62_0<=148)||(LA62_0>=151 && LA62_0<=160)||LA62_0==162) ) {
-                        alt62=1;
+                    if ( ((LA57_0>=RULE_ID && LA57_0<=RULE_STRING)||(LA57_0>=RULE_INT && LA57_0<=RULE_DECIMAL)||LA57_0==16||(LA57_0>=91 && LA57_0<=95)||(LA57_0>=99 && LA57_0<=100)||(LA57_0>=104 && LA57_0<=105)||LA57_0==112||LA57_0==131||LA57_0==137||LA57_0==139||(LA57_0>=143 && LA57_0<=145)||(LA57_0>=148 && LA57_0<=157)||LA57_0==159) ) {
+                        alt57=1;
                     }
-                    switch (alt62) {
+                    switch (alt57) {
                         case 1 :
-                            // InternalTableDSL.g:5470:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            // InternalTableDSL.g:4940:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
                             {
-                            // InternalTableDSL.g:5470:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
-                            // InternalTableDSL.g:5471:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalTableDSL.g:4940:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
+                            // InternalTableDSL.g:4941:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
                             {
-                            // InternalTableDSL.g:5471:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
-                            // InternalTableDSL.g:5472:7: lv_elements_3_0= ruleXAnnotationOrExpression
+                            // InternalTableDSL.g:4941:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalTableDSL.g:4942:7: lv_elements_3_0= ruleXAnnotationOrExpression
                             {
                             if ( state.backtracking==0 ) {
 
                               							newCompositeNode(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0());
                               						
                             }
-                            pushFollow(FOLLOW_69);
+                            pushFollow(FOLLOW_68);
                             lv_elements_3_0=ruleXAnnotationOrExpression();
 
                             state._fsp--;
@@ -15557,39 +14183,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalTableDSL.g:5489:5: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
-                            loop61:
+                            // InternalTableDSL.g:4959:5: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            loop56:
                             do {
-                                int alt61=2;
-                                int LA61_0 = input.LA(1);
+                                int alt56=2;
+                                int LA56_0 = input.LA(1);
 
-                                if ( (LA61_0==104) ) {
-                                    alt61=1;
+                                if ( (LA56_0==101) ) {
+                                    alt56=1;
                                 }
 
 
-                                switch (alt61) {
+                                switch (alt56) {
                             	case 1 :
-                            	    // InternalTableDSL.g:5490:6: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalTableDSL.g:4960:6: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
                             	    {
-                            	    otherlv_4=(Token)match(input,104,FOLLOW_66); if (state.failed) return current;
+                            	    otherlv_4=(Token)match(input,101,FOLLOW_65); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      						newLeafNode(otherlv_4, grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0());
                             	      					
                             	    }
-                            	    // InternalTableDSL.g:5494:6: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
-                            	    // InternalTableDSL.g:5495:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalTableDSL.g:4964:6: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalTableDSL.g:4965:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
                             	    {
-                            	    // InternalTableDSL.g:5495:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
-                            	    // InternalTableDSL.g:5496:8: lv_elements_5_0= ruleXAnnotationOrExpression
+                            	    // InternalTableDSL.g:4965:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalTableDSL.g:4966:8: lv_elements_5_0= ruleXAnnotationOrExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
 
                             	      								newCompositeNode(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0());
                             	      							
                             	    }
-                            	    pushFollow(FOLLOW_69);
+                            	    pushFollow(FOLLOW_68);
                             	    lv_elements_5_0=ruleXAnnotationOrExpression();
 
                             	    state._fsp--;
@@ -15618,7 +14244,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    break loop61;
+                            	    break loop56;
                                 }
                             } while (true);
 
@@ -15628,7 +14254,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_6=(Token)match(input,109,FOLLOW_2); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,106,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_6, grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2());
@@ -15641,7 +14267,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:5521:3: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression
+                    // InternalTableDSL.g:4991:3: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -15687,7 +14313,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAnnotationOrExpression"
-    // InternalTableDSL.g:5533:1: entryRuleXAnnotationOrExpression returns [EObject current=null] : iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF ;
+    // InternalTableDSL.g:5003:1: entryRuleXAnnotationOrExpression returns [EObject current=null] : iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF ;
     public final EObject entryRuleXAnnotationOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15695,8 +14321,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:5533:64: (iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF )
-            // InternalTableDSL.g:5534:2: iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF
+            // InternalTableDSL.g:5003:64: (iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF )
+            // InternalTableDSL.g:5004:2: iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationOrExpressionRule()); 
@@ -15727,7 +14353,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAnnotationOrExpression"
-    // InternalTableDSL.g:5540:1: ruleXAnnotationOrExpression returns [EObject current=null] : (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) ;
+    // InternalTableDSL.g:5010:1: ruleXAnnotationOrExpression returns [EObject current=null] : (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) ;
     public final EObject ruleXAnnotationOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15740,29 +14366,29 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:5546:2: ( (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) )
-            // InternalTableDSL.g:5547:2: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
+            // InternalTableDSL.g:5016:2: ( (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) )
+            // InternalTableDSL.g:5017:2: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
             {
-            // InternalTableDSL.g:5547:2: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
-            int alt64=2;
-            int LA64_0 = input.LA(1);
+            // InternalTableDSL.g:5017:2: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
+            int alt59=2;
+            int LA59_0 = input.LA(1);
 
-            if ( (LA64_0==102) ) {
-                alt64=1;
+            if ( (LA59_0==99) ) {
+                alt59=1;
             }
-            else if ( ((LA64_0>=RULE_ID && LA64_0<=RULE_STRING)||(LA64_0>=RULE_INT && LA64_0<=RULE_DECIMAL)||LA64_0==16||(LA64_0>=94 && LA64_0<=98)||LA64_0==103||(LA64_0>=107 && LA64_0<=108)||LA64_0==115||LA64_0==134||LA64_0==140||LA64_0==142||(LA64_0>=146 && LA64_0<=148)||(LA64_0>=151 && LA64_0<=160)||LA64_0==162) ) {
-                alt64=2;
+            else if ( ((LA59_0>=RULE_ID && LA59_0<=RULE_STRING)||(LA59_0>=RULE_INT && LA59_0<=RULE_DECIMAL)||LA59_0==16||(LA59_0>=91 && LA59_0<=95)||LA59_0==100||(LA59_0>=104 && LA59_0<=105)||LA59_0==112||LA59_0==131||LA59_0==137||LA59_0==139||(LA59_0>=143 && LA59_0<=145)||(LA59_0>=148 && LA59_0<=157)||LA59_0==159) ) {
+                alt59=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 64, 0, input);
+                    new NoViableAltException("", 59, 0, input);
 
                 throw nvae;
             }
-            switch (alt64) {
+            switch (alt59) {
                 case 1 :
-                    // InternalTableDSL.g:5548:3: this_XAnnotation_0= ruleXAnnotation
+                    // InternalTableDSL.g:5018:3: this_XAnnotation_0= ruleXAnnotation
                     {
                     if ( state.backtracking==0 ) {
 
@@ -15784,7 +14410,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:5557:3: this_XExpression_1= ruleXExpression
+                    // InternalTableDSL.g:5027:3: this_XExpression_1= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -15830,7 +14456,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXExpression"
-    // InternalTableDSL.g:5569:1: entryRuleXExpression returns [EObject current=null] : iv_ruleXExpression= ruleXExpression EOF ;
+    // InternalTableDSL.g:5039:1: entryRuleXExpression returns [EObject current=null] : iv_ruleXExpression= ruleXExpression EOF ;
     public final EObject entryRuleXExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15838,8 +14464,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:5569:52: (iv_ruleXExpression= ruleXExpression EOF )
-            // InternalTableDSL.g:5570:2: iv_ruleXExpression= ruleXExpression EOF
+            // InternalTableDSL.g:5039:52: (iv_ruleXExpression= ruleXExpression EOF )
+            // InternalTableDSL.g:5040:2: iv_ruleXExpression= ruleXExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionRule()); 
@@ -15870,7 +14496,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXExpression"
-    // InternalTableDSL.g:5576:1: ruleXExpression returns [EObject current=null] : this_XAssignment_0= ruleXAssignment ;
+    // InternalTableDSL.g:5046:1: ruleXExpression returns [EObject current=null] : this_XAssignment_0= ruleXAssignment ;
     public final EObject ruleXExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15881,8 +14507,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:5582:2: (this_XAssignment_0= ruleXAssignment )
-            // InternalTableDSL.g:5583:2: this_XAssignment_0= ruleXAssignment
+            // InternalTableDSL.g:5052:2: (this_XAssignment_0= ruleXAssignment )
+            // InternalTableDSL.g:5053:2: this_XAssignment_0= ruleXAssignment
             {
             if ( state.backtracking==0 ) {
 
@@ -15922,7 +14548,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAssignment"
-    // InternalTableDSL.g:5594:1: entryRuleXAssignment returns [EObject current=null] : iv_ruleXAssignment= ruleXAssignment EOF ;
+    // InternalTableDSL.g:5064:1: entryRuleXAssignment returns [EObject current=null] : iv_ruleXAssignment= ruleXAssignment EOF ;
     public final EObject entryRuleXAssignment() throws RecognitionException {
         EObject current = null;
 
@@ -15930,8 +14556,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:5594:52: (iv_ruleXAssignment= ruleXAssignment EOF )
-            // InternalTableDSL.g:5595:2: iv_ruleXAssignment= ruleXAssignment EOF
+            // InternalTableDSL.g:5064:52: (iv_ruleXAssignment= ruleXAssignment EOF )
+            // InternalTableDSL.g:5065:2: iv_ruleXAssignment= ruleXAssignment EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAssignmentRule()); 
@@ -15962,7 +14588,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAssignment"
-    // InternalTableDSL.g:5601:1: ruleXAssignment returns [EObject current=null] : ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) ;
+    // InternalTableDSL.g:5071:1: ruleXAssignment returns [EObject current=null] : ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) ;
     public final EObject ruleXAssignment() throws RecognitionException {
         EObject current = null;
 
@@ -15977,102 +14603,102 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:5607:2: ( ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) )
-            // InternalTableDSL.g:5608:2: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
+            // InternalTableDSL.g:5077:2: ( ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) )
+            // InternalTableDSL.g:5078:2: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
             {
-            // InternalTableDSL.g:5608:2: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
-            int alt66=2;
+            // InternalTableDSL.g:5078:2: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
+            int alt61=2;
             switch ( input.LA(1) ) {
             case RULE_ID:
                 {
-                int LA66_1 = input.LA(2);
+                int LA61_1 = input.LA(2);
 
-                if ( (LA66_1==EOF||(LA66_1>=RULE_ID && LA66_1<=RULE_STRING)||(LA66_1>=RULE_INT && LA66_1<=RULE_DECIMAL)||(LA66_1>=16 && LA66_1<=17)||LA66_1==20||LA66_1==78||(LA66_1>=94 && LA66_1<=99)||LA66_1==101||(LA66_1>=103 && LA66_1<=105)||(LA66_1>=107 && LA66_1<=138)||(LA66_1>=140 && LA66_1<=163)) ) {
-                    alt66=2;
+                if ( (LA61_1==103) ) {
+                    alt61=1;
                 }
-                else if ( (LA66_1==106) ) {
-                    alt66=1;
+                else if ( (LA61_1==EOF||(LA61_1>=RULE_ID && LA61_1<=RULE_STRING)||(LA61_1>=RULE_INT && LA61_1<=RULE_DECIMAL)||(LA61_1>=16 && LA61_1<=17)||LA61_1==20||LA61_1==74||(LA61_1>=91 && LA61_1<=96)||LA61_1==98||(LA61_1>=100 && LA61_1<=102)||(LA61_1>=104 && LA61_1<=135)||(LA61_1>=137 && LA61_1<=160)) ) {
+                    alt61=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 66, 1, input);
+                        new NoViableAltException("", 61, 1, input);
 
                     throw nvae;
                 }
                 }
                 break;
-            case 151:
+            case 148:
                 {
-                int LA66_2 = input.LA(2);
+                int LA61_2 = input.LA(2);
 
-                if ( (LA66_2==EOF||(LA66_2>=RULE_ID && LA66_2<=RULE_STRING)||(LA66_2>=RULE_INT && LA66_2<=RULE_DECIMAL)||(LA66_2>=16 && LA66_2<=17)||LA66_2==20||LA66_2==78||(LA66_2>=94 && LA66_2<=99)||LA66_2==101||(LA66_2>=103 && LA66_2<=105)||(LA66_2>=107 && LA66_2<=138)||(LA66_2>=140 && LA66_2<=163)) ) {
-                    alt66=2;
+                if ( (LA61_2==103) ) {
+                    alt61=1;
                 }
-                else if ( (LA66_2==106) ) {
-                    alt66=1;
+                else if ( (LA61_2==EOF||(LA61_2>=RULE_ID && LA61_2<=RULE_STRING)||(LA61_2>=RULE_INT && LA61_2<=RULE_DECIMAL)||(LA61_2>=16 && LA61_2<=17)||LA61_2==20||LA61_2==74||(LA61_2>=91 && LA61_2<=96)||LA61_2==98||(LA61_2>=100 && LA61_2<=102)||(LA61_2>=104 && LA61_2<=135)||(LA61_2>=137 && LA61_2<=160)) ) {
+                    alt61=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 66, 2, input);
+                        new NoViableAltException("", 61, 2, input);
 
                     throw nvae;
                 }
                 }
                 break;
-            case 97:
+            case 94:
                 {
-                int LA66_3 = input.LA(2);
+                int LA61_3 = input.LA(2);
 
-                if ( (LA66_3==106) ) {
-                    alt66=1;
+                if ( (LA61_3==103) ) {
+                    alt61=1;
                 }
-                else if ( (LA66_3==EOF||(LA66_3>=RULE_ID && LA66_3<=RULE_STRING)||(LA66_3>=RULE_INT && LA66_3<=RULE_DECIMAL)||(LA66_3>=16 && LA66_3<=17)||LA66_3==20||LA66_3==78||(LA66_3>=94 && LA66_3<=99)||LA66_3==101||(LA66_3>=103 && LA66_3<=105)||(LA66_3>=107 && LA66_3<=138)||(LA66_3>=140 && LA66_3<=163)) ) {
-                    alt66=2;
+                else if ( (LA61_3==EOF||(LA61_3>=RULE_ID && LA61_3<=RULE_STRING)||(LA61_3>=RULE_INT && LA61_3<=RULE_DECIMAL)||(LA61_3>=16 && LA61_3<=17)||LA61_3==20||LA61_3==74||(LA61_3>=91 && LA61_3<=96)||LA61_3==98||(LA61_3>=100 && LA61_3<=102)||(LA61_3>=104 && LA61_3<=135)||(LA61_3>=137 && LA61_3<=160)) ) {
+                    alt61=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 66, 3, input);
+                        new NoViableAltException("", 61, 3, input);
 
                     throw nvae;
                 }
                 }
                 break;
-            case 96:
+            case 93:
                 {
-                int LA66_4 = input.LA(2);
+                int LA61_4 = input.LA(2);
 
-                if ( (LA66_4==106) ) {
-                    alt66=1;
+                if ( (LA61_4==103) ) {
+                    alt61=1;
                 }
-                else if ( (LA66_4==EOF||(LA66_4>=RULE_ID && LA66_4<=RULE_STRING)||(LA66_4>=RULE_INT && LA66_4<=RULE_DECIMAL)||(LA66_4>=16 && LA66_4<=17)||LA66_4==20||LA66_4==78||(LA66_4>=94 && LA66_4<=99)||LA66_4==101||(LA66_4>=103 && LA66_4<=105)||(LA66_4>=107 && LA66_4<=138)||(LA66_4>=140 && LA66_4<=163)) ) {
-                    alt66=2;
+                else if ( (LA61_4==EOF||(LA61_4>=RULE_ID && LA61_4<=RULE_STRING)||(LA61_4>=RULE_INT && LA61_4<=RULE_DECIMAL)||(LA61_4>=16 && LA61_4<=17)||LA61_4==20||LA61_4==74||(LA61_4>=91 && LA61_4<=96)||LA61_4==98||(LA61_4>=100 && LA61_4<=102)||(LA61_4>=104 && LA61_4<=135)||(LA61_4>=137 && LA61_4<=160)) ) {
+                    alt61=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 66, 4, input);
+                        new NoViableAltException("", 61, 4, input);
 
                     throw nvae;
                 }
                 }
                 break;
-            case 98:
+            case 95:
                 {
-                int LA66_5 = input.LA(2);
+                int LA61_5 = input.LA(2);
 
-                if ( (LA66_5==EOF||(LA66_5>=RULE_ID && LA66_5<=RULE_STRING)||(LA66_5>=RULE_INT && LA66_5<=RULE_DECIMAL)||(LA66_5>=16 && LA66_5<=17)||LA66_5==20||LA66_5==78||(LA66_5>=94 && LA66_5<=99)||LA66_5==101||(LA66_5>=103 && LA66_5<=105)||(LA66_5>=107 && LA66_5<=138)||(LA66_5>=140 && LA66_5<=163)) ) {
-                    alt66=2;
+                if ( (LA61_5==EOF||(LA61_5>=RULE_ID && LA61_5<=RULE_STRING)||(LA61_5>=RULE_INT && LA61_5<=RULE_DECIMAL)||(LA61_5>=16 && LA61_5<=17)||LA61_5==20||LA61_5==74||(LA61_5>=91 && LA61_5<=96)||LA61_5==98||(LA61_5>=100 && LA61_5<=102)||(LA61_5>=104 && LA61_5<=135)||(LA61_5>=137 && LA61_5<=160)) ) {
+                    alt61=2;
                 }
-                else if ( (LA66_5==106) ) {
-                    alt66=1;
+                else if ( (LA61_5==103) ) {
+                    alt61=1;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 66, 5, input);
+                        new NoViableAltException("", 61, 5, input);
 
                     throw nvae;
                 }
@@ -16083,49 +14709,49 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             case RULE_HEX:
             case RULE_DECIMAL:
             case 16:
-            case 94:
-            case 95:
-            case 103:
-            case 107:
-            case 108:
-            case 115:
-            case 134:
-            case 140:
-            case 142:
-            case 146:
-            case 147:
-            case 148:
+            case 91:
+            case 92:
+            case 100:
+            case 104:
+            case 105:
+            case 112:
+            case 131:
+            case 137:
+            case 139:
+            case 143:
+            case 144:
+            case 145:
+            case 149:
+            case 150:
+            case 151:
             case 152:
             case 153:
             case 154:
             case 155:
             case 156:
             case 157:
-            case 158:
             case 159:
-            case 160:
-            case 162:
                 {
-                alt66=2;
+                alt61=2;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 66, 0, input);
+                    new NoViableAltException("", 61, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt66) {
+            switch (alt61) {
                 case 1 :
-                    // InternalTableDSL.g:5609:3: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
+                    // InternalTableDSL.g:5079:3: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
                     {
-                    // InternalTableDSL.g:5609:3: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
-                    // InternalTableDSL.g:5610:4: () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) )
+                    // InternalTableDSL.g:5079:3: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
+                    // InternalTableDSL.g:5080:4: () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) )
                     {
-                    // InternalTableDSL.g:5610:4: ()
-                    // InternalTableDSL.g:5611:5: 
+                    // InternalTableDSL.g:5080:4: ()
+                    // InternalTableDSL.g:5081:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -16137,11 +14763,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:5617:4: ( ( ruleFeatureCallID ) )
-                    // InternalTableDSL.g:5618:5: ( ruleFeatureCallID )
+                    // InternalTableDSL.g:5087:4: ( ( ruleFeatureCallID ) )
+                    // InternalTableDSL.g:5088:5: ( ruleFeatureCallID )
                     {
-                    // InternalTableDSL.g:5618:5: ( ruleFeatureCallID )
-                    // InternalTableDSL.g:5619:6: ruleFeatureCallID
+                    // InternalTableDSL.g:5088:5: ( ruleFeatureCallID )
+                    // InternalTableDSL.g:5089:6: ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -16155,7 +14781,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       						newCompositeNode(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0());
                       					
                     }
-                    pushFollow(FOLLOW_65);
+                    pushFollow(FOLLOW_64);
                     ruleFeatureCallID();
 
                     state._fsp--;
@@ -16176,7 +14802,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       				newCompositeNode(grammarAccess.getXAssignmentAccess().getOpSingleAssignParserRuleCall_0_2());
                       			
                     }
-                    pushFollow(FOLLOW_66);
+                    pushFollow(FOLLOW_65);
                     ruleOpSingleAssign();
 
                     state._fsp--;
@@ -16186,11 +14812,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       				afterParserOrEnumRuleCall();
                       			
                     }
-                    // InternalTableDSL.g:5640:4: ( (lv_value_3_0= ruleXAssignment ) )
-                    // InternalTableDSL.g:5641:5: (lv_value_3_0= ruleXAssignment )
+                    // InternalTableDSL.g:5110:4: ( (lv_value_3_0= ruleXAssignment ) )
+                    // InternalTableDSL.g:5111:5: (lv_value_3_0= ruleXAssignment )
                     {
-                    // InternalTableDSL.g:5641:5: (lv_value_3_0= ruleXAssignment )
-                    // InternalTableDSL.g:5642:6: lv_value_3_0= ruleXAssignment
+                    // InternalTableDSL.g:5111:5: (lv_value_3_0= ruleXAssignment )
+                    // InternalTableDSL.g:5112:6: lv_value_3_0= ruleXAssignment
                     {
                     if ( state.backtracking==0 ) {
 
@@ -16228,17 +14854,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:5661:3: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
+                    // InternalTableDSL.g:5131:3: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
                     {
-                    // InternalTableDSL.g:5661:3: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
-                    // InternalTableDSL.g:5662:4: this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
+                    // InternalTableDSL.g:5131:3: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
+                    // InternalTableDSL.g:5132:4: this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
                     {
                     if ( state.backtracking==0 ) {
 
                       				newCompositeNode(grammarAccess.getXAssignmentAccess().getXOrExpressionParserRuleCall_1_0());
                       			
                     }
-                    pushFollow(FOLLOW_71);
+                    pushFollow(FOLLOW_70);
                     this_XOrExpression_4=ruleXOrExpression();
 
                     state._fsp--;
@@ -16249,21 +14875,21 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       				afterParserOrEnumRuleCall();
                       			
                     }
-                    // InternalTableDSL.g:5670:4: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
-                    int alt65=2;
-                    alt65 = dfa65.predict(input);
-                    switch (alt65) {
+                    // InternalTableDSL.g:5140:4: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
+                    int alt60=2;
+                    alt60 = dfa60.predict(input);
+                    switch (alt60) {
                         case 1 :
-                            // InternalTableDSL.g:5671:5: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) )
+                            // InternalTableDSL.g:5141:5: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) )
                             {
-                            // InternalTableDSL.g:5671:5: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) )
-                            // InternalTableDSL.g:5672:6: ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) )
+                            // InternalTableDSL.g:5141:5: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) )
+                            // InternalTableDSL.g:5142:6: ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) )
                             {
-                            // InternalTableDSL.g:5682:6: ( () ( ( ruleOpMultiAssign ) ) )
-                            // InternalTableDSL.g:5683:7: () ( ( ruleOpMultiAssign ) )
+                            // InternalTableDSL.g:5152:6: ( () ( ( ruleOpMultiAssign ) ) )
+                            // InternalTableDSL.g:5153:7: () ( ( ruleOpMultiAssign ) )
                             {
-                            // InternalTableDSL.g:5683:7: ()
-                            // InternalTableDSL.g:5684:8: 
+                            // InternalTableDSL.g:5153:7: ()
+                            // InternalTableDSL.g:5154:8: 
                             {
                             if ( state.backtracking==0 ) {
 
@@ -16275,11 +14901,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalTableDSL.g:5690:7: ( ( ruleOpMultiAssign ) )
-                            // InternalTableDSL.g:5691:8: ( ruleOpMultiAssign )
+                            // InternalTableDSL.g:5160:7: ( ( ruleOpMultiAssign ) )
+                            // InternalTableDSL.g:5161:8: ( ruleOpMultiAssign )
                             {
-                            // InternalTableDSL.g:5691:8: ( ruleOpMultiAssign )
-                            // InternalTableDSL.g:5692:9: ruleOpMultiAssign
+                            // InternalTableDSL.g:5161:8: ( ruleOpMultiAssign )
+                            // InternalTableDSL.g:5162:9: ruleOpMultiAssign
                             {
                             if ( state.backtracking==0 ) {
 
@@ -16293,7 +14919,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                               									newCompositeNode(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0());
                               								
                             }
-                            pushFollow(FOLLOW_66);
+                            pushFollow(FOLLOW_65);
                             ruleOpMultiAssign();
 
                             state._fsp--;
@@ -16315,11 +14941,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalTableDSL.g:5708:5: ( (lv_rightOperand_7_0= ruleXAssignment ) )
-                            // InternalTableDSL.g:5709:6: (lv_rightOperand_7_0= ruleXAssignment )
+                            // InternalTableDSL.g:5178:5: ( (lv_rightOperand_7_0= ruleXAssignment ) )
+                            // InternalTableDSL.g:5179:6: (lv_rightOperand_7_0= ruleXAssignment )
                             {
-                            // InternalTableDSL.g:5709:6: (lv_rightOperand_7_0= ruleXAssignment )
-                            // InternalTableDSL.g:5710:7: lv_rightOperand_7_0= ruleXAssignment
+                            // InternalTableDSL.g:5179:6: (lv_rightOperand_7_0= ruleXAssignment )
+                            // InternalTableDSL.g:5180:7: lv_rightOperand_7_0= ruleXAssignment
                             {
                             if ( state.backtracking==0 ) {
 
@@ -16387,7 +15013,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpSingleAssign"
-    // InternalTableDSL.g:5733:1: entryRuleOpSingleAssign returns [String current=null] : iv_ruleOpSingleAssign= ruleOpSingleAssign EOF ;
+    // InternalTableDSL.g:5203:1: entryRuleOpSingleAssign returns [String current=null] : iv_ruleOpSingleAssign= ruleOpSingleAssign EOF ;
     public final String entryRuleOpSingleAssign() throws RecognitionException {
         String current = null;
 
@@ -16395,8 +15021,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:5733:54: (iv_ruleOpSingleAssign= ruleOpSingleAssign EOF )
-            // InternalTableDSL.g:5734:2: iv_ruleOpSingleAssign= ruleOpSingleAssign EOF
+            // InternalTableDSL.g:5203:54: (iv_ruleOpSingleAssign= ruleOpSingleAssign EOF )
+            // InternalTableDSL.g:5204:2: iv_ruleOpSingleAssign= ruleOpSingleAssign EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpSingleAssignRule()); 
@@ -16427,7 +15053,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpSingleAssign"
-    // InternalTableDSL.g:5740:1: ruleOpSingleAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '=' ;
+    // InternalTableDSL.g:5210:1: ruleOpSingleAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '=' ;
     public final AntlrDatatypeRuleToken ruleOpSingleAssign() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -16437,10 +15063,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:5746:2: (kw= '=' )
-            // InternalTableDSL.g:5747:2: kw= '='
+            // InternalTableDSL.g:5216:2: (kw= '=' )
+            // InternalTableDSL.g:5217:2: kw= '='
             {
-            kw=(Token)match(input,106,FOLLOW_2); if (state.failed) return current;
+            kw=(Token)match(input,103,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(kw);
@@ -16469,7 +15095,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpMultiAssign"
-    // InternalTableDSL.g:5755:1: entryRuleOpMultiAssign returns [String current=null] : iv_ruleOpMultiAssign= ruleOpMultiAssign EOF ;
+    // InternalTableDSL.g:5225:1: entryRuleOpMultiAssign returns [String current=null] : iv_ruleOpMultiAssign= ruleOpMultiAssign EOF ;
     public final String entryRuleOpMultiAssign() throws RecognitionException {
         String current = null;
 
@@ -16477,8 +15103,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:5755:53: (iv_ruleOpMultiAssign= ruleOpMultiAssign EOF )
-            // InternalTableDSL.g:5756:2: iv_ruleOpMultiAssign= ruleOpMultiAssign EOF
+            // InternalTableDSL.g:5225:53: (iv_ruleOpMultiAssign= ruleOpMultiAssign EOF )
+            // InternalTableDSL.g:5226:2: iv_ruleOpMultiAssign= ruleOpMultiAssign EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpMultiAssignRule()); 
@@ -16509,7 +15135,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpMultiAssign"
-    // InternalTableDSL.g:5762:1: ruleOpMultiAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) ;
+    // InternalTableDSL.g:5232:1: ruleOpMultiAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) ;
     public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -16519,60 +15145,60 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:5768:2: ( (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) )
-            // InternalTableDSL.g:5769:2: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
+            // InternalTableDSL.g:5238:2: ( (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) )
+            // InternalTableDSL.g:5239:2: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
             {
-            // InternalTableDSL.g:5769:2: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
-            int alt68=7;
+            // InternalTableDSL.g:5239:2: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
+            int alt63=7;
             switch ( input.LA(1) ) {
-            case 110:
+            case 107:
                 {
-                alt68=1;
+                alt63=1;
                 }
                 break;
-            case 111:
+            case 108:
                 {
-                alt68=2;
+                alt63=2;
                 }
                 break;
-            case 112:
+            case 109:
                 {
-                alt68=3;
+                alt63=3;
                 }
                 break;
-            case 113:
+            case 110:
                 {
-                alt68=4;
+                alt63=4;
                 }
                 break;
-            case 114:
+            case 111:
                 {
-                alt68=5;
+                alt63=5;
                 }
                 break;
-            case 115:
+            case 112:
                 {
-                alt68=6;
+                alt63=6;
                 }
                 break;
-            case 116:
+            case 113:
                 {
-                alt68=7;
+                alt63=7;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 68, 0, input);
+                    new NoViableAltException("", 63, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt68) {
+            switch (alt63) {
                 case 1 :
-                    // InternalTableDSL.g:5770:3: kw= '+='
+                    // InternalTableDSL.g:5240:3: kw= '+='
                     {
-                    kw=(Token)match(input,110,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,107,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -16583,9 +15209,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:5776:3: kw= '-='
+                    // InternalTableDSL.g:5246:3: kw= '-='
                     {
-                    kw=(Token)match(input,111,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,108,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -16596,9 +15222,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:5782:3: kw= '*='
+                    // InternalTableDSL.g:5252:3: kw= '*='
                     {
-                    kw=(Token)match(input,112,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,109,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -16609,9 +15235,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:5788:3: kw= '/='
+                    // InternalTableDSL.g:5258:3: kw= '/='
                     {
-                    kw=(Token)match(input,113,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,110,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -16622,9 +15248,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:5794:3: kw= '%='
+                    // InternalTableDSL.g:5264:3: kw= '%='
                     {
-                    kw=(Token)match(input,114,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,111,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -16635,26 +15261,26 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 6 :
-                    // InternalTableDSL.g:5800:3: (kw= '<' kw= '<' kw= '=' )
+                    // InternalTableDSL.g:5270:3: (kw= '<' kw= '<' kw= '=' )
                     {
-                    // InternalTableDSL.g:5800:3: (kw= '<' kw= '<' kw= '=' )
-                    // InternalTableDSL.g:5801:4: kw= '<' kw= '<' kw= '='
+                    // InternalTableDSL.g:5270:3: (kw= '<' kw= '<' kw= '=' )
+                    // InternalTableDSL.g:5271:4: kw= '<' kw= '<' kw= '='
                     {
-                    kw=(Token)match(input,115,FOLLOW_72); if (state.failed) return current;
+                    kw=(Token)match(input,112,FOLLOW_71); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
                       				newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0());
                       			
                     }
-                    kw=(Token)match(input,115,FOLLOW_65); if (state.failed) return current;
+                    kw=(Token)match(input,112,FOLLOW_64); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
                       				newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1());
                       			
                     }
-                    kw=(Token)match(input,106,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,103,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
@@ -16668,30 +15294,30 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 7 :
-                    // InternalTableDSL.g:5818:3: (kw= '>' (kw= '>' )? kw= '>=' )
+                    // InternalTableDSL.g:5288:3: (kw= '>' (kw= '>' )? kw= '>=' )
                     {
-                    // InternalTableDSL.g:5818:3: (kw= '>' (kw= '>' )? kw= '>=' )
-                    // InternalTableDSL.g:5819:4: kw= '>' (kw= '>' )? kw= '>='
+                    // InternalTableDSL.g:5288:3: (kw= '>' (kw= '>' )? kw= '>=' )
+                    // InternalTableDSL.g:5289:4: kw= '>' (kw= '>' )? kw= '>='
                     {
-                    kw=(Token)match(input,116,FOLLOW_73); if (state.failed) return current;
+                    kw=(Token)match(input,113,FOLLOW_72); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
                       				newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0());
                       			
                     }
-                    // InternalTableDSL.g:5824:4: (kw= '>' )?
-                    int alt67=2;
-                    int LA67_0 = input.LA(1);
+                    // InternalTableDSL.g:5294:4: (kw= '>' )?
+                    int alt62=2;
+                    int LA62_0 = input.LA(1);
 
-                    if ( (LA67_0==116) ) {
-                        alt67=1;
+                    if ( (LA62_0==113) ) {
+                        alt62=1;
                     }
-                    switch (alt67) {
+                    switch (alt62) {
                         case 1 :
-                            // InternalTableDSL.g:5825:5: kw= '>'
+                            // InternalTableDSL.g:5295:5: kw= '>'
                             {
-                            kw=(Token)match(input,116,FOLLOW_74); if (state.failed) return current;
+                            kw=(Token)match(input,113,FOLLOW_73); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               					current.merge(kw);
@@ -16704,7 +15330,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    kw=(Token)match(input,117,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,114,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
@@ -16742,7 +15368,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXOrExpression"
-    // InternalTableDSL.g:5841:1: entryRuleXOrExpression returns [EObject current=null] : iv_ruleXOrExpression= ruleXOrExpression EOF ;
+    // InternalTableDSL.g:5311:1: entryRuleXOrExpression returns [EObject current=null] : iv_ruleXOrExpression= ruleXOrExpression EOF ;
     public final EObject entryRuleXOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16750,8 +15376,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:5841:54: (iv_ruleXOrExpression= ruleXOrExpression EOF )
-            // InternalTableDSL.g:5842:2: iv_ruleXOrExpression= ruleXOrExpression EOF
+            // InternalTableDSL.g:5311:54: (iv_ruleXOrExpression= ruleXOrExpression EOF )
+            // InternalTableDSL.g:5312:2: iv_ruleXOrExpression= ruleXOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXOrExpressionRule()); 
@@ -16782,7 +15408,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXOrExpression"
-    // InternalTableDSL.g:5848:1: ruleXOrExpression returns [EObject current=null] : (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) ;
+    // InternalTableDSL.g:5318:1: ruleXOrExpression returns [EObject current=null] : (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) ;
     public final EObject ruleXOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16795,18 +15421,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:5854:2: ( (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) )
-            // InternalTableDSL.g:5855:2: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
+            // InternalTableDSL.g:5324:2: ( (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) )
+            // InternalTableDSL.g:5325:2: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
             {
-            // InternalTableDSL.g:5855:2: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
-            // InternalTableDSL.g:5856:3: this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
+            // InternalTableDSL.g:5325:2: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
+            // InternalTableDSL.g:5326:3: this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXOrExpressionAccess().getXAndExpressionParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_75);
+            pushFollow(FOLLOW_74);
             this_XAndExpression_0=ruleXAndExpression();
 
             state._fsp--;
@@ -16817,35 +15443,35 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalTableDSL.g:5864:3: ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
-            loop69:
+            // InternalTableDSL.g:5334:3: ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
+            loop64:
             do {
-                int alt69=2;
-                int LA69_0 = input.LA(1);
+                int alt64=2;
+                int LA64_0 = input.LA(1);
 
-                if ( (LA69_0==118) ) {
-                    int LA69_2 = input.LA(2);
+                if ( (LA64_0==115) ) {
+                    int LA64_2 = input.LA(2);
 
                     if ( (synpred8_InternalTableDSL()) ) {
-                        alt69=1;
+                        alt64=1;
                     }
 
 
                 }
 
 
-                switch (alt69) {
+                switch (alt64) {
             	case 1 :
-            	    // InternalTableDSL.g:5865:4: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) )
+            	    // InternalTableDSL.g:5335:4: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) )
             	    {
-            	    // InternalTableDSL.g:5865:4: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) )
-            	    // InternalTableDSL.g:5866:5: ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) )
+            	    // InternalTableDSL.g:5335:4: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) )
+            	    // InternalTableDSL.g:5336:5: ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) )
             	    {
-            	    // InternalTableDSL.g:5876:5: ( () ( ( ruleOpOr ) ) )
-            	    // InternalTableDSL.g:5877:6: () ( ( ruleOpOr ) )
+            	    // InternalTableDSL.g:5346:5: ( () ( ( ruleOpOr ) ) )
+            	    // InternalTableDSL.g:5347:6: () ( ( ruleOpOr ) )
             	    {
-            	    // InternalTableDSL.g:5877:6: ()
-            	    // InternalTableDSL.g:5878:7: 
+            	    // InternalTableDSL.g:5347:6: ()
+            	    // InternalTableDSL.g:5348:7: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -16857,11 +15483,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:5884:6: ( ( ruleOpOr ) )
-            	    // InternalTableDSL.g:5885:7: ( ruleOpOr )
+            	    // InternalTableDSL.g:5354:6: ( ( ruleOpOr ) )
+            	    // InternalTableDSL.g:5355:7: ( ruleOpOr )
             	    {
-            	    // InternalTableDSL.g:5885:7: ( ruleOpOr )
-            	    // InternalTableDSL.g:5886:8: ruleOpOr
+            	    // InternalTableDSL.g:5355:7: ( ruleOpOr )
+            	    // InternalTableDSL.g:5356:8: ruleOpOr
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -16875,7 +15501,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      								newCompositeNode(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0());
             	      							
             	    }
-            	    pushFollow(FOLLOW_66);
+            	    pushFollow(FOLLOW_65);
             	    ruleOpOr();
 
             	    state._fsp--;
@@ -16897,18 +15523,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:5902:4: ( (lv_rightOperand_3_0= ruleXAndExpression ) )
-            	    // InternalTableDSL.g:5903:5: (lv_rightOperand_3_0= ruleXAndExpression )
+            	    // InternalTableDSL.g:5372:4: ( (lv_rightOperand_3_0= ruleXAndExpression ) )
+            	    // InternalTableDSL.g:5373:5: (lv_rightOperand_3_0= ruleXAndExpression )
             	    {
-            	    // InternalTableDSL.g:5903:5: (lv_rightOperand_3_0= ruleXAndExpression )
-            	    // InternalTableDSL.g:5904:6: lv_rightOperand_3_0= ruleXAndExpression
+            	    // InternalTableDSL.g:5373:5: (lv_rightOperand_3_0= ruleXAndExpression )
+            	    // InternalTableDSL.g:5374:6: lv_rightOperand_3_0= ruleXAndExpression
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXOrExpressionAccess().getRightOperandXAndExpressionParserRuleCall_1_1_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_75);
+            	    pushFollow(FOLLOW_74);
             	    lv_rightOperand_3_0=ruleXAndExpression();
 
             	    state._fsp--;
@@ -16937,7 +15563,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop69;
+            	    break loop64;
                 }
             } while (true);
 
@@ -16966,7 +15592,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpOr"
-    // InternalTableDSL.g:5926:1: entryRuleOpOr returns [String current=null] : iv_ruleOpOr= ruleOpOr EOF ;
+    // InternalTableDSL.g:5396:1: entryRuleOpOr returns [String current=null] : iv_ruleOpOr= ruleOpOr EOF ;
     public final String entryRuleOpOr() throws RecognitionException {
         String current = null;
 
@@ -16974,8 +15600,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:5926:44: (iv_ruleOpOr= ruleOpOr EOF )
-            // InternalTableDSL.g:5927:2: iv_ruleOpOr= ruleOpOr EOF
+            // InternalTableDSL.g:5396:44: (iv_ruleOpOr= ruleOpOr EOF )
+            // InternalTableDSL.g:5397:2: iv_ruleOpOr= ruleOpOr EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpOrRule()); 
@@ -17006,7 +15632,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpOr"
-    // InternalTableDSL.g:5933:1: ruleOpOr returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '||' ;
+    // InternalTableDSL.g:5403:1: ruleOpOr returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '||' ;
     public final AntlrDatatypeRuleToken ruleOpOr() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -17016,10 +15642,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:5939:2: (kw= '||' )
-            // InternalTableDSL.g:5940:2: kw= '||'
+            // InternalTableDSL.g:5409:2: (kw= '||' )
+            // InternalTableDSL.g:5410:2: kw= '||'
             {
-            kw=(Token)match(input,118,FOLLOW_2); if (state.failed) return current;
+            kw=(Token)match(input,115,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(kw);
@@ -17048,7 +15674,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAndExpression"
-    // InternalTableDSL.g:5948:1: entryRuleXAndExpression returns [EObject current=null] : iv_ruleXAndExpression= ruleXAndExpression EOF ;
+    // InternalTableDSL.g:5418:1: entryRuleXAndExpression returns [EObject current=null] : iv_ruleXAndExpression= ruleXAndExpression EOF ;
     public final EObject entryRuleXAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -17056,8 +15682,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:5948:55: (iv_ruleXAndExpression= ruleXAndExpression EOF )
-            // InternalTableDSL.g:5949:2: iv_ruleXAndExpression= ruleXAndExpression EOF
+            // InternalTableDSL.g:5418:55: (iv_ruleXAndExpression= ruleXAndExpression EOF )
+            // InternalTableDSL.g:5419:2: iv_ruleXAndExpression= ruleXAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAndExpressionRule()); 
@@ -17088,7 +15714,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAndExpression"
-    // InternalTableDSL.g:5955:1: ruleXAndExpression returns [EObject current=null] : (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) ;
+    // InternalTableDSL.g:5425:1: ruleXAndExpression returns [EObject current=null] : (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) ;
     public final EObject ruleXAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -17101,18 +15727,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:5961:2: ( (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) )
-            // InternalTableDSL.g:5962:2: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
+            // InternalTableDSL.g:5431:2: ( (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) )
+            // InternalTableDSL.g:5432:2: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
             {
-            // InternalTableDSL.g:5962:2: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
-            // InternalTableDSL.g:5963:3: this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
+            // InternalTableDSL.g:5432:2: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
+            // InternalTableDSL.g:5433:3: this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXAndExpressionAccess().getXEqualityExpressionParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_76);
+            pushFollow(FOLLOW_75);
             this_XEqualityExpression_0=ruleXEqualityExpression();
 
             state._fsp--;
@@ -17123,35 +15749,35 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalTableDSL.g:5971:3: ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
-            loop70:
+            // InternalTableDSL.g:5441:3: ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
+            loop65:
             do {
-                int alt70=2;
-                int LA70_0 = input.LA(1);
+                int alt65=2;
+                int LA65_0 = input.LA(1);
 
-                if ( (LA70_0==119) ) {
-                    int LA70_2 = input.LA(2);
+                if ( (LA65_0==116) ) {
+                    int LA65_2 = input.LA(2);
 
                     if ( (synpred9_InternalTableDSL()) ) {
-                        alt70=1;
+                        alt65=1;
                     }
 
 
                 }
 
 
-                switch (alt70) {
+                switch (alt65) {
             	case 1 :
-            	    // InternalTableDSL.g:5972:4: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
+            	    // InternalTableDSL.g:5442:4: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
             	    {
-            	    // InternalTableDSL.g:5972:4: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) )
-            	    // InternalTableDSL.g:5973:5: ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) )
+            	    // InternalTableDSL.g:5442:4: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) )
+            	    // InternalTableDSL.g:5443:5: ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) )
             	    {
-            	    // InternalTableDSL.g:5983:5: ( () ( ( ruleOpAnd ) ) )
-            	    // InternalTableDSL.g:5984:6: () ( ( ruleOpAnd ) )
+            	    // InternalTableDSL.g:5453:5: ( () ( ( ruleOpAnd ) ) )
+            	    // InternalTableDSL.g:5454:6: () ( ( ruleOpAnd ) )
             	    {
-            	    // InternalTableDSL.g:5984:6: ()
-            	    // InternalTableDSL.g:5985:7: 
+            	    // InternalTableDSL.g:5454:6: ()
+            	    // InternalTableDSL.g:5455:7: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -17163,11 +15789,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:5991:6: ( ( ruleOpAnd ) )
-            	    // InternalTableDSL.g:5992:7: ( ruleOpAnd )
+            	    // InternalTableDSL.g:5461:6: ( ( ruleOpAnd ) )
+            	    // InternalTableDSL.g:5462:7: ( ruleOpAnd )
             	    {
-            	    // InternalTableDSL.g:5992:7: ( ruleOpAnd )
-            	    // InternalTableDSL.g:5993:8: ruleOpAnd
+            	    // InternalTableDSL.g:5462:7: ( ruleOpAnd )
+            	    // InternalTableDSL.g:5463:8: ruleOpAnd
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -17181,7 +15807,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      								newCompositeNode(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0());
             	      							
             	    }
-            	    pushFollow(FOLLOW_66);
+            	    pushFollow(FOLLOW_65);
             	    ruleOpAnd();
 
             	    state._fsp--;
@@ -17203,18 +15829,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:6009:4: ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
-            	    // InternalTableDSL.g:6010:5: (lv_rightOperand_3_0= ruleXEqualityExpression )
+            	    // InternalTableDSL.g:5479:4: ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
+            	    // InternalTableDSL.g:5480:5: (lv_rightOperand_3_0= ruleXEqualityExpression )
             	    {
-            	    // InternalTableDSL.g:6010:5: (lv_rightOperand_3_0= ruleXEqualityExpression )
-            	    // InternalTableDSL.g:6011:6: lv_rightOperand_3_0= ruleXEqualityExpression
+            	    // InternalTableDSL.g:5480:5: (lv_rightOperand_3_0= ruleXEqualityExpression )
+            	    // InternalTableDSL.g:5481:6: lv_rightOperand_3_0= ruleXEqualityExpression
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXAndExpressionAccess().getRightOperandXEqualityExpressionParserRuleCall_1_1_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_76);
+            	    pushFollow(FOLLOW_75);
             	    lv_rightOperand_3_0=ruleXEqualityExpression();
 
             	    state._fsp--;
@@ -17243,7 +15869,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop70;
+            	    break loop65;
                 }
             } while (true);
 
@@ -17272,7 +15898,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpAnd"
-    // InternalTableDSL.g:6033:1: entryRuleOpAnd returns [String current=null] : iv_ruleOpAnd= ruleOpAnd EOF ;
+    // InternalTableDSL.g:5503:1: entryRuleOpAnd returns [String current=null] : iv_ruleOpAnd= ruleOpAnd EOF ;
     public final String entryRuleOpAnd() throws RecognitionException {
         String current = null;
 
@@ -17280,8 +15906,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:6033:45: (iv_ruleOpAnd= ruleOpAnd EOF )
-            // InternalTableDSL.g:6034:2: iv_ruleOpAnd= ruleOpAnd EOF
+            // InternalTableDSL.g:5503:45: (iv_ruleOpAnd= ruleOpAnd EOF )
+            // InternalTableDSL.g:5504:2: iv_ruleOpAnd= ruleOpAnd EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpAndRule()); 
@@ -17312,7 +15938,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpAnd"
-    // InternalTableDSL.g:6040:1: ruleOpAnd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '&&' ;
+    // InternalTableDSL.g:5510:1: ruleOpAnd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '&&' ;
     public final AntlrDatatypeRuleToken ruleOpAnd() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -17322,10 +15948,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:6046:2: (kw= '&&' )
-            // InternalTableDSL.g:6047:2: kw= '&&'
+            // InternalTableDSL.g:5516:2: (kw= '&&' )
+            // InternalTableDSL.g:5517:2: kw= '&&'
             {
-            kw=(Token)match(input,119,FOLLOW_2); if (state.failed) return current;
+            kw=(Token)match(input,116,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(kw);
@@ -17354,7 +15980,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXEqualityExpression"
-    // InternalTableDSL.g:6055:1: entryRuleXEqualityExpression returns [EObject current=null] : iv_ruleXEqualityExpression= ruleXEqualityExpression EOF ;
+    // InternalTableDSL.g:5525:1: entryRuleXEqualityExpression returns [EObject current=null] : iv_ruleXEqualityExpression= ruleXEqualityExpression EOF ;
     public final EObject entryRuleXEqualityExpression() throws RecognitionException {
         EObject current = null;
 
@@ -17362,8 +15988,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:6055:60: (iv_ruleXEqualityExpression= ruleXEqualityExpression EOF )
-            // InternalTableDSL.g:6056:2: iv_ruleXEqualityExpression= ruleXEqualityExpression EOF
+            // InternalTableDSL.g:5525:60: (iv_ruleXEqualityExpression= ruleXEqualityExpression EOF )
+            // InternalTableDSL.g:5526:2: iv_ruleXEqualityExpression= ruleXEqualityExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXEqualityExpressionRule()); 
@@ -17394,7 +16020,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXEqualityExpression"
-    // InternalTableDSL.g:6062:1: ruleXEqualityExpression returns [EObject current=null] : (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) ;
+    // InternalTableDSL.g:5532:1: ruleXEqualityExpression returns [EObject current=null] : (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) ;
     public final EObject ruleXEqualityExpression() throws RecognitionException {
         EObject current = null;
 
@@ -17407,18 +16033,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:6068:2: ( (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) )
-            // InternalTableDSL.g:6069:2: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
+            // InternalTableDSL.g:5538:2: ( (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) )
+            // InternalTableDSL.g:5539:2: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
             {
-            // InternalTableDSL.g:6069:2: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
-            // InternalTableDSL.g:6070:3: this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
+            // InternalTableDSL.g:5539:2: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
+            // InternalTableDSL.g:5540:3: this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getXRelationalExpressionParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_77);
+            pushFollow(FOLLOW_76);
             this_XRelationalExpression_0=ruleXRelationalExpression();
 
             state._fsp--;
@@ -17429,50 +16055,50 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalTableDSL.g:6078:3: ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
-            loop71:
+            // InternalTableDSL.g:5548:3: ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
+            loop66:
             do {
-                int alt71=2;
+                int alt66=2;
                 switch ( input.LA(1) ) {
-                case 120:
+                case 117:
                     {
-                    int LA71_2 = input.LA(2);
+                    int LA66_2 = input.LA(2);
 
                     if ( (synpred10_InternalTableDSL()) ) {
-                        alt71=1;
+                        alt66=1;
                     }
 
 
                     }
                     break;
-                case 121:
+                case 118:
                     {
-                    int LA71_3 = input.LA(2);
+                    int LA66_3 = input.LA(2);
 
                     if ( (synpred10_InternalTableDSL()) ) {
-                        alt71=1;
+                        alt66=1;
                     }
 
 
                     }
                     break;
-                case 122:
+                case 119:
                     {
-                    int LA71_4 = input.LA(2);
+                    int LA66_4 = input.LA(2);
 
                     if ( (synpred10_InternalTableDSL()) ) {
-                        alt71=1;
+                        alt66=1;
                     }
 
 
                     }
                     break;
-                case 123:
+                case 120:
                     {
-                    int LA71_5 = input.LA(2);
+                    int LA66_5 = input.LA(2);
 
                     if ( (synpred10_InternalTableDSL()) ) {
-                        alt71=1;
+                        alt66=1;
                     }
 
 
@@ -17481,18 +16107,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                 }
 
-                switch (alt71) {
+                switch (alt66) {
             	case 1 :
-            	    // InternalTableDSL.g:6079:4: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
+            	    // InternalTableDSL.g:5549:4: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
             	    {
-            	    // InternalTableDSL.g:6079:4: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) )
-            	    // InternalTableDSL.g:6080:5: ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) )
+            	    // InternalTableDSL.g:5549:4: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) )
+            	    // InternalTableDSL.g:5550:5: ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) )
             	    {
-            	    // InternalTableDSL.g:6090:5: ( () ( ( ruleOpEquality ) ) )
-            	    // InternalTableDSL.g:6091:6: () ( ( ruleOpEquality ) )
+            	    // InternalTableDSL.g:5560:5: ( () ( ( ruleOpEquality ) ) )
+            	    // InternalTableDSL.g:5561:6: () ( ( ruleOpEquality ) )
             	    {
-            	    // InternalTableDSL.g:6091:6: ()
-            	    // InternalTableDSL.g:6092:7: 
+            	    // InternalTableDSL.g:5561:6: ()
+            	    // InternalTableDSL.g:5562:7: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -17504,11 +16130,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:6098:6: ( ( ruleOpEquality ) )
-            	    // InternalTableDSL.g:6099:7: ( ruleOpEquality )
+            	    // InternalTableDSL.g:5568:6: ( ( ruleOpEquality ) )
+            	    // InternalTableDSL.g:5569:7: ( ruleOpEquality )
             	    {
-            	    // InternalTableDSL.g:6099:7: ( ruleOpEquality )
-            	    // InternalTableDSL.g:6100:8: ruleOpEquality
+            	    // InternalTableDSL.g:5569:7: ( ruleOpEquality )
+            	    // InternalTableDSL.g:5570:8: ruleOpEquality
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -17522,7 +16148,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      								newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0());
             	      							
             	    }
-            	    pushFollow(FOLLOW_66);
+            	    pushFollow(FOLLOW_65);
             	    ruleOpEquality();
 
             	    state._fsp--;
@@ -17544,18 +16170,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:6116:4: ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
-            	    // InternalTableDSL.g:6117:5: (lv_rightOperand_3_0= ruleXRelationalExpression )
+            	    // InternalTableDSL.g:5586:4: ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
+            	    // InternalTableDSL.g:5587:5: (lv_rightOperand_3_0= ruleXRelationalExpression )
             	    {
-            	    // InternalTableDSL.g:6117:5: (lv_rightOperand_3_0= ruleXRelationalExpression )
-            	    // InternalTableDSL.g:6118:6: lv_rightOperand_3_0= ruleXRelationalExpression
+            	    // InternalTableDSL.g:5587:5: (lv_rightOperand_3_0= ruleXRelationalExpression )
+            	    // InternalTableDSL.g:5588:6: lv_rightOperand_3_0= ruleXRelationalExpression
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getRightOperandXRelationalExpressionParserRuleCall_1_1_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_77);
+            	    pushFollow(FOLLOW_76);
             	    lv_rightOperand_3_0=ruleXRelationalExpression();
 
             	    state._fsp--;
@@ -17584,7 +16210,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop71;
+            	    break loop66;
                 }
             } while (true);
 
@@ -17613,7 +16239,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpEquality"
-    // InternalTableDSL.g:6140:1: entryRuleOpEquality returns [String current=null] : iv_ruleOpEquality= ruleOpEquality EOF ;
+    // InternalTableDSL.g:5610:1: entryRuleOpEquality returns [String current=null] : iv_ruleOpEquality= ruleOpEquality EOF ;
     public final String entryRuleOpEquality() throws RecognitionException {
         String current = null;
 
@@ -17621,8 +16247,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:6140:50: (iv_ruleOpEquality= ruleOpEquality EOF )
-            // InternalTableDSL.g:6141:2: iv_ruleOpEquality= ruleOpEquality EOF
+            // InternalTableDSL.g:5610:50: (iv_ruleOpEquality= ruleOpEquality EOF )
+            // InternalTableDSL.g:5611:2: iv_ruleOpEquality= ruleOpEquality EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpEqualityRule()); 
@@ -17653,7 +16279,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpEquality"
-    // InternalTableDSL.g:6147:1: ruleOpEquality returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) ;
+    // InternalTableDSL.g:5617:1: ruleOpEquality returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) ;
     public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -17663,45 +16289,45 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:6153:2: ( (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) )
-            // InternalTableDSL.g:6154:2: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
+            // InternalTableDSL.g:5623:2: ( (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) )
+            // InternalTableDSL.g:5624:2: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
             {
-            // InternalTableDSL.g:6154:2: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
-            int alt72=4;
+            // InternalTableDSL.g:5624:2: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
+            int alt67=4;
             switch ( input.LA(1) ) {
-            case 120:
+            case 117:
                 {
-                alt72=1;
+                alt67=1;
                 }
                 break;
-            case 121:
+            case 118:
                 {
-                alt72=2;
+                alt67=2;
                 }
                 break;
-            case 122:
+            case 119:
                 {
-                alt72=3;
+                alt67=3;
                 }
                 break;
-            case 123:
+            case 120:
                 {
-                alt72=4;
+                alt67=4;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 72, 0, input);
+                    new NoViableAltException("", 67, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt72) {
+            switch (alt67) {
                 case 1 :
-                    // InternalTableDSL.g:6155:3: kw= '=='
+                    // InternalTableDSL.g:5625:3: kw= '=='
                     {
-                    kw=(Token)match(input,120,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,117,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -17712,9 +16338,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:6161:3: kw= '!='
+                    // InternalTableDSL.g:5631:3: kw= '!='
                     {
-                    kw=(Token)match(input,121,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,118,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -17725,9 +16351,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:6167:3: kw= '==='
+                    // InternalTableDSL.g:5637:3: kw= '==='
                     {
-                    kw=(Token)match(input,122,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,119,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -17738,9 +16364,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:6173:3: kw= '!=='
+                    // InternalTableDSL.g:5643:3: kw= '!=='
                     {
-                    kw=(Token)match(input,123,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,120,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -17775,7 +16401,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXRelationalExpression"
-    // InternalTableDSL.g:6182:1: entryRuleXRelationalExpression returns [EObject current=null] : iv_ruleXRelationalExpression= ruleXRelationalExpression EOF ;
+    // InternalTableDSL.g:5652:1: entryRuleXRelationalExpression returns [EObject current=null] : iv_ruleXRelationalExpression= ruleXRelationalExpression EOF ;
     public final EObject entryRuleXRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -17783,8 +16409,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:6182:62: (iv_ruleXRelationalExpression= ruleXRelationalExpression EOF )
-            // InternalTableDSL.g:6183:2: iv_ruleXRelationalExpression= ruleXRelationalExpression EOF
+            // InternalTableDSL.g:5652:62: (iv_ruleXRelationalExpression= ruleXRelationalExpression EOF )
+            // InternalTableDSL.g:5653:2: iv_ruleXRelationalExpression= ruleXRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXRelationalExpressionRule()); 
@@ -17815,7 +16441,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXRelationalExpression"
-    // InternalTableDSL.g:6189:1: ruleXRelationalExpression returns [EObject current=null] : (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) ;
+    // InternalTableDSL.g:5659:1: ruleXRelationalExpression returns [EObject current=null] : (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) ;
     public final EObject ruleXRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -17831,18 +16457,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:6195:2: ( (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) )
-            // InternalTableDSL.g:6196:2: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
+            // InternalTableDSL.g:5665:2: ( (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) )
+            // InternalTableDSL.g:5666:2: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
             {
-            // InternalTableDSL.g:6196:2: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
-            // InternalTableDSL.g:6197:3: this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
+            // InternalTableDSL.g:5666:2: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
+            // InternalTableDSL.g:5667:3: this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getXOtherOperatorExpressionParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_78);
+            pushFollow(FOLLOW_77);
             this_XOtherOperatorExpression_0=ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -17853,50 +16479,50 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalTableDSL.g:6205:3: ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
-            loop73:
+            // InternalTableDSL.g:5675:3: ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
+            loop68:
             do {
-                int alt73=3;
+                int alt68=3;
                 switch ( input.LA(1) ) {
-                case 115:
+                case 112:
                     {
-                    int LA73_2 = input.LA(2);
+                    int LA68_2 = input.LA(2);
 
                     if ( (synpred12_InternalTableDSL()) ) {
-                        alt73=2;
+                        alt68=2;
                     }
 
 
                     }
                     break;
-                case 116:
+                case 113:
                     {
-                    int LA73_3 = input.LA(2);
+                    int LA68_3 = input.LA(2);
 
                     if ( (synpred12_InternalTableDSL()) ) {
-                        alt73=2;
+                        alt68=2;
                     }
 
 
                     }
                     break;
-                case 124:
+                case 121:
                     {
-                    int LA73_4 = input.LA(2);
+                    int LA68_4 = input.LA(2);
 
                     if ( (synpred11_InternalTableDSL()) ) {
-                        alt73=1;
+                        alt68=1;
                     }
 
 
                     }
                     break;
-                case 117:
+                case 114:
                     {
-                    int LA73_5 = input.LA(2);
+                    int LA68_5 = input.LA(2);
 
                     if ( (synpred12_InternalTableDSL()) ) {
-                        alt73=2;
+                        alt68=2;
                     }
 
 
@@ -17905,21 +16531,21 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                 }
 
-                switch (alt73) {
+                switch (alt68) {
             	case 1 :
-            	    // InternalTableDSL.g:6206:4: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
+            	    // InternalTableDSL.g:5676:4: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
             	    {
-            	    // InternalTableDSL.g:6206:4: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
-            	    // InternalTableDSL.g:6207:5: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalTableDSL.g:5676:4: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
+            	    // InternalTableDSL.g:5677:5: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
             	    {
-            	    // InternalTableDSL.g:6207:5: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) )
-            	    // InternalTableDSL.g:6208:6: ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' )
+            	    // InternalTableDSL.g:5677:5: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) )
+            	    // InternalTableDSL.g:5678:6: ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' )
             	    {
-            	    // InternalTableDSL.g:6214:6: ( () otherlv_2= 'instanceof' )
-            	    // InternalTableDSL.g:6215:7: () otherlv_2= 'instanceof'
+            	    // InternalTableDSL.g:5684:6: ( () otherlv_2= 'instanceof' )
+            	    // InternalTableDSL.g:5685:7: () otherlv_2= 'instanceof'
             	    {
-            	    // InternalTableDSL.g:6215:7: ()
-            	    // InternalTableDSL.g:6216:8: 
+            	    // InternalTableDSL.g:5685:7: ()
+            	    // InternalTableDSL.g:5686:8: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -17931,7 +16557,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,124,FOLLOW_79); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,121,FOLLOW_78); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      							newLeafNode(otherlv_2, grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1());
@@ -17943,18 +16569,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:6228:5: ( (lv_type_3_0= ruleJvmTypeReference ) )
-            	    // InternalTableDSL.g:6229:6: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalTableDSL.g:5698:5: ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalTableDSL.g:5699:6: (lv_type_3_0= ruleJvmTypeReference )
             	    {
-            	    // InternalTableDSL.g:6229:6: (lv_type_3_0= ruleJvmTypeReference )
-            	    // InternalTableDSL.g:6230:7: lv_type_3_0= ruleJvmTypeReference
+            	    // InternalTableDSL.g:5699:6: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalTableDSL.g:5700:7: lv_type_3_0= ruleJvmTypeReference
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      							newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_0_1_0());
             	      						
             	    }
-            	    pushFollow(FOLLOW_78);
+            	    pushFollow(FOLLOW_77);
             	    lv_type_3_0=ruleJvmTypeReference();
 
             	    state._fsp--;
@@ -17985,19 +16611,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // InternalTableDSL.g:6249:4: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
+            	    // InternalTableDSL.g:5719:4: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
             	    {
-            	    // InternalTableDSL.g:6249:4: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
-            	    // InternalTableDSL.g:6250:5: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
+            	    // InternalTableDSL.g:5719:4: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
+            	    // InternalTableDSL.g:5720:5: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
             	    {
-            	    // InternalTableDSL.g:6250:5: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) )
-            	    // InternalTableDSL.g:6251:6: ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) )
+            	    // InternalTableDSL.g:5720:5: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) )
+            	    // InternalTableDSL.g:5721:6: ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) )
             	    {
-            	    // InternalTableDSL.g:6261:6: ( () ( ( ruleOpCompare ) ) )
-            	    // InternalTableDSL.g:6262:7: () ( ( ruleOpCompare ) )
+            	    // InternalTableDSL.g:5731:6: ( () ( ( ruleOpCompare ) ) )
+            	    // InternalTableDSL.g:5732:7: () ( ( ruleOpCompare ) )
             	    {
-            	    // InternalTableDSL.g:6262:7: ()
-            	    // InternalTableDSL.g:6263:8: 
+            	    // InternalTableDSL.g:5732:7: ()
+            	    // InternalTableDSL.g:5733:8: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -18009,11 +16635,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:6269:7: ( ( ruleOpCompare ) )
-            	    // InternalTableDSL.g:6270:8: ( ruleOpCompare )
+            	    // InternalTableDSL.g:5739:7: ( ( ruleOpCompare ) )
+            	    // InternalTableDSL.g:5740:8: ( ruleOpCompare )
             	    {
-            	    // InternalTableDSL.g:6270:8: ( ruleOpCompare )
-            	    // InternalTableDSL.g:6271:9: ruleOpCompare
+            	    // InternalTableDSL.g:5740:8: ( ruleOpCompare )
+            	    // InternalTableDSL.g:5741:9: ruleOpCompare
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -18027,7 +16653,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      									newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0());
             	      								
             	    }
-            	    pushFollow(FOLLOW_66);
+            	    pushFollow(FOLLOW_65);
             	    ruleOpCompare();
 
             	    state._fsp--;
@@ -18049,18 +16675,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:6287:5: ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
-            	    // InternalTableDSL.g:6288:6: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
+            	    // InternalTableDSL.g:5757:5: ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
+            	    // InternalTableDSL.g:5758:6: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
             	    {
-            	    // InternalTableDSL.g:6288:6: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
-            	    // InternalTableDSL.g:6289:7: lv_rightOperand_6_0= ruleXOtherOperatorExpression
+            	    // InternalTableDSL.g:5758:6: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
+            	    // InternalTableDSL.g:5759:7: lv_rightOperand_6_0= ruleXOtherOperatorExpression
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      							newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getRightOperandXOtherOperatorExpressionParserRuleCall_1_1_1_0());
             	      						
             	    }
-            	    pushFollow(FOLLOW_78);
+            	    pushFollow(FOLLOW_77);
             	    lv_rightOperand_6_0=ruleXOtherOperatorExpression();
 
             	    state._fsp--;
@@ -18092,7 +16718,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop73;
+            	    break loop68;
                 }
             } while (true);
 
@@ -18121,7 +16747,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpCompare"
-    // InternalTableDSL.g:6312:1: entryRuleOpCompare returns [String current=null] : iv_ruleOpCompare= ruleOpCompare EOF ;
+    // InternalTableDSL.g:5782:1: entryRuleOpCompare returns [String current=null] : iv_ruleOpCompare= ruleOpCompare EOF ;
     public final String entryRuleOpCompare() throws RecognitionException {
         String current = null;
 
@@ -18129,8 +16755,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:6312:49: (iv_ruleOpCompare= ruleOpCompare EOF )
-            // InternalTableDSL.g:6313:2: iv_ruleOpCompare= ruleOpCompare EOF
+            // InternalTableDSL.g:5782:49: (iv_ruleOpCompare= ruleOpCompare EOF )
+            // InternalTableDSL.g:5783:2: iv_ruleOpCompare= ruleOpCompare EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpCompareRule()); 
@@ -18161,7 +16787,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpCompare"
-    // InternalTableDSL.g:6319:1: ruleOpCompare returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) ;
+    // InternalTableDSL.g:5789:1: ruleOpCompare returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) ;
     public final AntlrDatatypeRuleToken ruleOpCompare() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -18171,54 +16797,54 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:6325:2: ( (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) )
-            // InternalTableDSL.g:6326:2: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
+            // InternalTableDSL.g:5795:2: ( (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) )
+            // InternalTableDSL.g:5796:2: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
             {
-            // InternalTableDSL.g:6326:2: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
-            int alt74=4;
+            // InternalTableDSL.g:5796:2: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
+            int alt69=4;
             switch ( input.LA(1) ) {
-            case 117:
+            case 114:
                 {
-                alt74=1;
+                alt69=1;
                 }
                 break;
-            case 115:
+            case 112:
                 {
-                int LA74_2 = input.LA(2);
+                int LA69_2 = input.LA(2);
 
-                if ( (LA74_2==EOF||(LA74_2>=RULE_ID && LA74_2<=RULE_STRING)||(LA74_2>=RULE_INT && LA74_2<=RULE_DECIMAL)||LA74_2==16||(LA74_2>=94 && LA74_2<=98)||LA74_2==103||(LA74_2>=107 && LA74_2<=108)||LA74_2==115||LA74_2==134||LA74_2==140||LA74_2==142||(LA74_2>=146 && LA74_2<=148)||(LA74_2>=151 && LA74_2<=160)||LA74_2==162) ) {
-                    alt74=4;
+                if ( (LA69_2==EOF||(LA69_2>=RULE_ID && LA69_2<=RULE_STRING)||(LA69_2>=RULE_INT && LA69_2<=RULE_DECIMAL)||LA69_2==16||(LA69_2>=91 && LA69_2<=95)||LA69_2==100||(LA69_2>=104 && LA69_2<=105)||LA69_2==112||LA69_2==131||LA69_2==137||LA69_2==139||(LA69_2>=143 && LA69_2<=145)||(LA69_2>=148 && LA69_2<=157)||LA69_2==159) ) {
+                    alt69=4;
                 }
-                else if ( (LA74_2==106) ) {
-                    alt74=2;
+                else if ( (LA69_2==103) ) {
+                    alt69=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 74, 2, input);
+                        new NoViableAltException("", 69, 2, input);
 
                     throw nvae;
                 }
                 }
                 break;
-            case 116:
+            case 113:
                 {
-                alt74=3;
+                alt69=3;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 74, 0, input);
+                    new NoViableAltException("", 69, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt74) {
+            switch (alt69) {
                 case 1 :
-                    // InternalTableDSL.g:6327:3: kw= '>='
+                    // InternalTableDSL.g:5797:3: kw= '>='
                     {
-                    kw=(Token)match(input,117,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,114,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -18229,19 +16855,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:6333:3: (kw= '<' kw= '=' )
+                    // InternalTableDSL.g:5803:3: (kw= '<' kw= '=' )
                     {
-                    // InternalTableDSL.g:6333:3: (kw= '<' kw= '=' )
-                    // InternalTableDSL.g:6334:4: kw= '<' kw= '='
+                    // InternalTableDSL.g:5803:3: (kw= '<' kw= '=' )
+                    // InternalTableDSL.g:5804:4: kw= '<' kw= '='
                     {
-                    kw=(Token)match(input,115,FOLLOW_65); if (state.failed) return current;
+                    kw=(Token)match(input,112,FOLLOW_64); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
                       				newLeafNode(kw, grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0());
                       			
                     }
-                    kw=(Token)match(input,106,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,103,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
@@ -18255,9 +16881,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:6346:3: kw= '>'
+                    // InternalTableDSL.g:5816:3: kw= '>'
                     {
-                    kw=(Token)match(input,116,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,113,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -18268,9 +16894,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:6352:3: kw= '<'
+                    // InternalTableDSL.g:5822:3: kw= '<'
                     {
-                    kw=(Token)match(input,115,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,112,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -18305,7 +16931,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXOtherOperatorExpression"
-    // InternalTableDSL.g:6361:1: entryRuleXOtherOperatorExpression returns [EObject current=null] : iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF ;
+    // InternalTableDSL.g:5831:1: entryRuleXOtherOperatorExpression returns [EObject current=null] : iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF ;
     public final EObject entryRuleXOtherOperatorExpression() throws RecognitionException {
         EObject current = null;
 
@@ -18313,8 +16939,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:6361:65: (iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF )
-            // InternalTableDSL.g:6362:2: iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF
+            // InternalTableDSL.g:5831:65: (iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF )
+            // InternalTableDSL.g:5832:2: iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXOtherOperatorExpressionRule()); 
@@ -18345,7 +16971,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXOtherOperatorExpression"
-    // InternalTableDSL.g:6368:1: ruleXOtherOperatorExpression returns [EObject current=null] : (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) ;
+    // InternalTableDSL.g:5838:1: ruleXOtherOperatorExpression returns [EObject current=null] : (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) ;
     public final EObject ruleXOtherOperatorExpression() throws RecognitionException {
         EObject current = null;
 
@@ -18358,18 +16984,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:6374:2: ( (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) )
-            // InternalTableDSL.g:6375:2: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
+            // InternalTableDSL.g:5844:2: ( (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) )
+            // InternalTableDSL.g:5845:2: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
             {
-            // InternalTableDSL.g:6375:2: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
-            // InternalTableDSL.g:6376:3: this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
+            // InternalTableDSL.g:5845:2: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
+            // InternalTableDSL.g:5846:3: this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getXAdditiveExpressionParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_80);
+            pushFollow(FOLLOW_79);
             this_XAdditiveExpression_0=ruleXAdditiveExpression();
 
             state._fsp--;
@@ -18380,23 +17006,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalTableDSL.g:6384:3: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
-            loop75:
+            // InternalTableDSL.g:5854:3: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
+            loop70:
             do {
-                int alt75=2;
-                alt75 = dfa75.predict(input);
-                switch (alt75) {
+                int alt70=2;
+                alt70 = dfa70.predict(input);
+                switch (alt70) {
             	case 1 :
-            	    // InternalTableDSL.g:6385:4: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
+            	    // InternalTableDSL.g:5855:4: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
             	    {
-            	    // InternalTableDSL.g:6385:4: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) )
-            	    // InternalTableDSL.g:6386:5: ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) )
+            	    // InternalTableDSL.g:5855:4: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) )
+            	    // InternalTableDSL.g:5856:5: ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) )
             	    {
-            	    // InternalTableDSL.g:6396:5: ( () ( ( ruleOpOther ) ) )
-            	    // InternalTableDSL.g:6397:6: () ( ( ruleOpOther ) )
+            	    // InternalTableDSL.g:5866:5: ( () ( ( ruleOpOther ) ) )
+            	    // InternalTableDSL.g:5867:6: () ( ( ruleOpOther ) )
             	    {
-            	    // InternalTableDSL.g:6397:6: ()
-            	    // InternalTableDSL.g:6398:7: 
+            	    // InternalTableDSL.g:5867:6: ()
+            	    // InternalTableDSL.g:5868:7: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -18408,11 +17034,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:6404:6: ( ( ruleOpOther ) )
-            	    // InternalTableDSL.g:6405:7: ( ruleOpOther )
+            	    // InternalTableDSL.g:5874:6: ( ( ruleOpOther ) )
+            	    // InternalTableDSL.g:5875:7: ( ruleOpOther )
             	    {
-            	    // InternalTableDSL.g:6405:7: ( ruleOpOther )
-            	    // InternalTableDSL.g:6406:8: ruleOpOther
+            	    // InternalTableDSL.g:5875:7: ( ruleOpOther )
+            	    // InternalTableDSL.g:5876:8: ruleOpOther
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -18426,7 +17052,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      								newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0());
             	      							
             	    }
-            	    pushFollow(FOLLOW_66);
+            	    pushFollow(FOLLOW_65);
             	    ruleOpOther();
 
             	    state._fsp--;
@@ -18448,18 +17074,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:6422:4: ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
-            	    // InternalTableDSL.g:6423:5: (lv_rightOperand_3_0= ruleXAdditiveExpression )
+            	    // InternalTableDSL.g:5892:4: ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
+            	    // InternalTableDSL.g:5893:5: (lv_rightOperand_3_0= ruleXAdditiveExpression )
             	    {
-            	    // InternalTableDSL.g:6423:5: (lv_rightOperand_3_0= ruleXAdditiveExpression )
-            	    // InternalTableDSL.g:6424:6: lv_rightOperand_3_0= ruleXAdditiveExpression
+            	    // InternalTableDSL.g:5893:5: (lv_rightOperand_3_0= ruleXAdditiveExpression )
+            	    // InternalTableDSL.g:5894:6: lv_rightOperand_3_0= ruleXAdditiveExpression
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandXAdditiveExpressionParserRuleCall_1_1_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_80);
+            	    pushFollow(FOLLOW_79);
             	    lv_rightOperand_3_0=ruleXAdditiveExpression();
 
             	    state._fsp--;
@@ -18488,7 +17114,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop75;
+            	    break loop70;
                 }
             } while (true);
 
@@ -18517,7 +17143,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpOther"
-    // InternalTableDSL.g:6446:1: entryRuleOpOther returns [String current=null] : iv_ruleOpOther= ruleOpOther EOF ;
+    // InternalTableDSL.g:5916:1: entryRuleOpOther returns [String current=null] : iv_ruleOpOther= ruleOpOther EOF ;
     public final String entryRuleOpOther() throws RecognitionException {
         String current = null;
 
@@ -18525,8 +17151,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:6446:47: (iv_ruleOpOther= ruleOpOther EOF )
-            // InternalTableDSL.g:6447:2: iv_ruleOpOther= ruleOpOther EOF
+            // InternalTableDSL.g:5916:47: (iv_ruleOpOther= ruleOpOther EOF )
+            // InternalTableDSL.g:5917:2: iv_ruleOpOther= ruleOpOther EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpOtherRule()); 
@@ -18557,7 +17183,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpOther"
-    // InternalTableDSL.g:6453:1: ruleOpOther returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) ;
+    // InternalTableDSL.g:5923:1: ruleOpOther returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) ;
     public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -18567,17 +17193,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:6459:2: ( (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) )
-            // InternalTableDSL.g:6460:2: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
+            // InternalTableDSL.g:5929:2: ( (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) )
+            // InternalTableDSL.g:5930:2: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
             {
-            // InternalTableDSL.g:6460:2: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
-            int alt78=9;
-            alt78 = dfa78.predict(input);
-            switch (alt78) {
+            // InternalTableDSL.g:5930:2: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
+            int alt73=9;
+            alt73 = dfa73.predict(input);
+            switch (alt73) {
                 case 1 :
-                    // InternalTableDSL.g:6461:3: kw= '->'
+                    // InternalTableDSL.g:5931:3: kw= '->'
                     {
-                    kw=(Token)match(input,125,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,122,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -18588,9 +17214,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:6467:3: kw= '..<'
+                    // InternalTableDSL.g:5937:3: kw= '..<'
                     {
-                    kw=(Token)match(input,126,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,123,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -18601,19 +17227,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:6473:3: (kw= '>' kw= '..' )
+                    // InternalTableDSL.g:5943:3: (kw= '>' kw= '..' )
                     {
-                    // InternalTableDSL.g:6473:3: (kw= '>' kw= '..' )
-                    // InternalTableDSL.g:6474:4: kw= '>' kw= '..'
+                    // InternalTableDSL.g:5943:3: (kw= '>' kw= '..' )
+                    // InternalTableDSL.g:5944:4: kw= '>' kw= '..'
                     {
-                    kw=(Token)match(input,116,FOLLOW_81); if (state.failed) return current;
+                    kw=(Token)match(input,113,FOLLOW_80); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
                       				newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0());
                       			
                     }
-                    kw=(Token)match(input,127,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,124,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
@@ -18627,9 +17253,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:6486:3: kw= '..'
+                    // InternalTableDSL.g:5956:3: kw= '..'
                     {
-                    kw=(Token)match(input,127,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,124,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -18640,9 +17266,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:6492:3: kw= '=>'
+                    // InternalTableDSL.g:5962:3: kw= '=>'
                     {
-                    kw=(Token)match(input,128,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,125,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -18653,35 +17279,35 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 6 :
-                    // InternalTableDSL.g:6498:3: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
+                    // InternalTableDSL.g:5968:3: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
                     {
-                    // InternalTableDSL.g:6498:3: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
-                    // InternalTableDSL.g:6499:4: kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
+                    // InternalTableDSL.g:5968:3: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
+                    // InternalTableDSL.g:5969:4: kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
                     {
-                    kw=(Token)match(input,116,FOLLOW_82); if (state.failed) return current;
+                    kw=(Token)match(input,113,FOLLOW_81); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
                       				newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0());
                       			
                     }
-                    // InternalTableDSL.g:6504:4: ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
-                    int alt76=2;
-                    int LA76_0 = input.LA(1);
+                    // InternalTableDSL.g:5974:4: ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
+                    int alt71=2;
+                    int LA71_0 = input.LA(1);
 
-                    if ( (LA76_0==116) ) {
-                        int LA76_1 = input.LA(2);
+                    if ( (LA71_0==113) ) {
+                        int LA71_1 = input.LA(2);
 
-                        if ( (LA76_1==EOF||(LA76_1>=RULE_ID && LA76_1<=RULE_STRING)||(LA76_1>=RULE_INT && LA76_1<=RULE_DECIMAL)||LA76_1==16||(LA76_1>=94 && LA76_1<=98)||LA76_1==103||(LA76_1>=107 && LA76_1<=108)||LA76_1==115||LA76_1==134||LA76_1==140||LA76_1==142||(LA76_1>=146 && LA76_1<=148)||(LA76_1>=151 && LA76_1<=160)||LA76_1==162) ) {
-                            alt76=2;
+                        if ( (LA71_1==EOF||(LA71_1>=RULE_ID && LA71_1<=RULE_STRING)||(LA71_1>=RULE_INT && LA71_1<=RULE_DECIMAL)||LA71_1==16||(LA71_1>=91 && LA71_1<=95)||LA71_1==100||(LA71_1>=104 && LA71_1<=105)||LA71_1==112||LA71_1==131||LA71_1==137||LA71_1==139||(LA71_1>=143 && LA71_1<=145)||(LA71_1>=148 && LA71_1<=157)||LA71_1==159) ) {
+                            alt71=2;
                         }
-                        else if ( (LA76_1==116) && (synpred14_InternalTableDSL())) {
-                            alt76=1;
+                        else if ( (LA71_1==113) && (synpred14_InternalTableDSL())) {
+                            alt71=1;
                         }
                         else {
                             if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
-                                new NoViableAltException("", 76, 1, input);
+                                new NoViableAltException("", 71, 1, input);
 
                             throw nvae;
                         }
@@ -18689,28 +17315,28 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     else {
                         if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
-                            new NoViableAltException("", 76, 0, input);
+                            new NoViableAltException("", 71, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt76) {
+                    switch (alt71) {
                         case 1 :
-                            // InternalTableDSL.g:6505:5: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
+                            // InternalTableDSL.g:5975:5: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
                             {
-                            // InternalTableDSL.g:6505:5: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
-                            // InternalTableDSL.g:6506:6: ( ( '>' '>' ) )=> (kw= '>' kw= '>' )
+                            // InternalTableDSL.g:5975:5: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
+                            // InternalTableDSL.g:5976:6: ( ( '>' '>' ) )=> (kw= '>' kw= '>' )
                             {
-                            // InternalTableDSL.g:6511:6: (kw= '>' kw= '>' )
-                            // InternalTableDSL.g:6512:7: kw= '>' kw= '>'
+                            // InternalTableDSL.g:5981:6: (kw= '>' kw= '>' )
+                            // InternalTableDSL.g:5982:7: kw= '>' kw= '>'
                             {
-                            kw=(Token)match(input,116,FOLLOW_82); if (state.failed) return current;
+                            kw=(Token)match(input,113,FOLLOW_81); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               							current.merge(kw);
                               							newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0());
                               						
                             }
-                            kw=(Token)match(input,116,FOLLOW_2); if (state.failed) return current;
+                            kw=(Token)match(input,113,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               							current.merge(kw);
@@ -18727,9 +17353,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // InternalTableDSL.g:6525:5: kw= '>'
+                            // InternalTableDSL.g:5995:5: kw= '>'
                             {
-                            kw=(Token)match(input,116,FOLLOW_2); if (state.failed) return current;
+                            kw=(Token)match(input,113,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               					current.merge(kw);
@@ -18749,67 +17375,67 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 7 :
-                    // InternalTableDSL.g:6533:3: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
+                    // InternalTableDSL.g:6003:3: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
                     {
-                    // InternalTableDSL.g:6533:3: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
-                    // InternalTableDSL.g:6534:4: kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
+                    // InternalTableDSL.g:6003:3: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
+                    // InternalTableDSL.g:6004:4: kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
                     {
-                    kw=(Token)match(input,115,FOLLOW_83); if (state.failed) return current;
+                    kw=(Token)match(input,112,FOLLOW_82); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
                       				newLeafNode(kw, grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0());
                       			
                     }
-                    // InternalTableDSL.g:6539:4: ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
-                    int alt77=3;
-                    int LA77_0 = input.LA(1);
+                    // InternalTableDSL.g:6009:4: ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
+                    int alt72=3;
+                    int LA72_0 = input.LA(1);
 
-                    if ( (LA77_0==115) ) {
-                        int LA77_1 = input.LA(2);
+                    if ( (LA72_0==112) ) {
+                        int LA72_1 = input.LA(2);
 
                         if ( (synpred15_InternalTableDSL()) ) {
-                            alt77=1;
+                            alt72=1;
                         }
                         else if ( (true) ) {
-                            alt77=2;
+                            alt72=2;
                         }
                         else {
                             if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
-                                new NoViableAltException("", 77, 1, input);
+                                new NoViableAltException("", 72, 1, input);
 
                             throw nvae;
                         }
                     }
-                    else if ( (LA77_0==128) ) {
-                        alt77=3;
+                    else if ( (LA72_0==125) ) {
+                        alt72=3;
                     }
                     else {
                         if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
-                            new NoViableAltException("", 77, 0, input);
+                            new NoViableAltException("", 72, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt77) {
+                    switch (alt72) {
                         case 1 :
-                            // InternalTableDSL.g:6540:5: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
+                            // InternalTableDSL.g:6010:5: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
                             {
-                            // InternalTableDSL.g:6540:5: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
-                            // InternalTableDSL.g:6541:6: ( ( '<' '<' ) )=> (kw= '<' kw= '<' )
+                            // InternalTableDSL.g:6010:5: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
+                            // InternalTableDSL.g:6011:6: ( ( '<' '<' ) )=> (kw= '<' kw= '<' )
                             {
-                            // InternalTableDSL.g:6546:6: (kw= '<' kw= '<' )
-                            // InternalTableDSL.g:6547:7: kw= '<' kw= '<'
+                            // InternalTableDSL.g:6016:6: (kw= '<' kw= '<' )
+                            // InternalTableDSL.g:6017:7: kw= '<' kw= '<'
                             {
-                            kw=(Token)match(input,115,FOLLOW_72); if (state.failed) return current;
+                            kw=(Token)match(input,112,FOLLOW_71); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               							current.merge(kw);
                               							newLeafNode(kw, grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0());
                               						
                             }
-                            kw=(Token)match(input,115,FOLLOW_2); if (state.failed) return current;
+                            kw=(Token)match(input,112,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               							current.merge(kw);
@@ -18826,9 +17452,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // InternalTableDSL.g:6560:5: kw= '<'
+                            // InternalTableDSL.g:6030:5: kw= '<'
                             {
-                            kw=(Token)match(input,115,FOLLOW_2); if (state.failed) return current;
+                            kw=(Token)match(input,112,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               					current.merge(kw);
@@ -18839,9 +17465,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 3 :
-                            // InternalTableDSL.g:6566:5: kw= '=>'
+                            // InternalTableDSL.g:6036:5: kw= '=>'
                             {
-                            kw=(Token)match(input,128,FOLLOW_2); if (state.failed) return current;
+                            kw=(Token)match(input,125,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               					current.merge(kw);
@@ -18861,9 +17487,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 8 :
-                    // InternalTableDSL.g:6574:3: kw= '<>'
+                    // InternalTableDSL.g:6044:3: kw= '<>'
                     {
-                    kw=(Token)match(input,129,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,126,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -18874,9 +17500,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 9 :
-                    // InternalTableDSL.g:6580:3: kw= '?:'
+                    // InternalTableDSL.g:6050:3: kw= '?:'
                     {
-                    kw=(Token)match(input,130,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,127,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -18911,7 +17537,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAdditiveExpression"
-    // InternalTableDSL.g:6589:1: entryRuleXAdditiveExpression returns [EObject current=null] : iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF ;
+    // InternalTableDSL.g:6059:1: entryRuleXAdditiveExpression returns [EObject current=null] : iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF ;
     public final EObject entryRuleXAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -18919,8 +17545,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:6589:60: (iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF )
-            // InternalTableDSL.g:6590:2: iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF
+            // InternalTableDSL.g:6059:60: (iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF )
+            // InternalTableDSL.g:6060:2: iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAdditiveExpressionRule()); 
@@ -18951,7 +17577,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAdditiveExpression"
-    // InternalTableDSL.g:6596:1: ruleXAdditiveExpression returns [EObject current=null] : (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) ;
+    // InternalTableDSL.g:6066:1: ruleXAdditiveExpression returns [EObject current=null] : (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) ;
     public final EObject ruleXAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -18964,18 +17590,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:6602:2: ( (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) )
-            // InternalTableDSL.g:6603:2: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
+            // InternalTableDSL.g:6072:2: ( (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) )
+            // InternalTableDSL.g:6073:2: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
             {
-            // InternalTableDSL.g:6603:2: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
-            // InternalTableDSL.g:6604:3: this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
+            // InternalTableDSL.g:6073:2: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
+            // InternalTableDSL.g:6074:3: this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getXMultiplicativeExpressionParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_84);
+            pushFollow(FOLLOW_83);
             this_XMultiplicativeExpression_0=ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -18986,44 +17612,44 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalTableDSL.g:6612:3: ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
-            loop79:
+            // InternalTableDSL.g:6082:3: ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
+            loop74:
             do {
-                int alt79=2;
-                int LA79_0 = input.LA(1);
+                int alt74=2;
+                int LA74_0 = input.LA(1);
 
-                if ( (LA79_0==94) ) {
-                    int LA79_2 = input.LA(2);
+                if ( (LA74_0==91) ) {
+                    int LA74_2 = input.LA(2);
 
                     if ( (synpred16_InternalTableDSL()) ) {
-                        alt79=1;
+                        alt74=1;
                     }
 
 
                 }
-                else if ( (LA79_0==95) ) {
-                    int LA79_3 = input.LA(2);
+                else if ( (LA74_0==92) ) {
+                    int LA74_3 = input.LA(2);
 
                     if ( (synpred16_InternalTableDSL()) ) {
-                        alt79=1;
+                        alt74=1;
                     }
 
 
                 }
 
 
-                switch (alt79) {
+                switch (alt74) {
             	case 1 :
-            	    // InternalTableDSL.g:6613:4: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
+            	    // InternalTableDSL.g:6083:4: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
             	    {
-            	    // InternalTableDSL.g:6613:4: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) )
-            	    // InternalTableDSL.g:6614:5: ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) )
+            	    // InternalTableDSL.g:6083:4: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) )
+            	    // InternalTableDSL.g:6084:5: ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) )
             	    {
-            	    // InternalTableDSL.g:6624:5: ( () ( ( ruleOpAdd ) ) )
-            	    // InternalTableDSL.g:6625:6: () ( ( ruleOpAdd ) )
+            	    // InternalTableDSL.g:6094:5: ( () ( ( ruleOpAdd ) ) )
+            	    // InternalTableDSL.g:6095:6: () ( ( ruleOpAdd ) )
             	    {
-            	    // InternalTableDSL.g:6625:6: ()
-            	    // InternalTableDSL.g:6626:7: 
+            	    // InternalTableDSL.g:6095:6: ()
+            	    // InternalTableDSL.g:6096:7: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -19035,11 +17661,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:6632:6: ( ( ruleOpAdd ) )
-            	    // InternalTableDSL.g:6633:7: ( ruleOpAdd )
+            	    // InternalTableDSL.g:6102:6: ( ( ruleOpAdd ) )
+            	    // InternalTableDSL.g:6103:7: ( ruleOpAdd )
             	    {
-            	    // InternalTableDSL.g:6633:7: ( ruleOpAdd )
-            	    // InternalTableDSL.g:6634:8: ruleOpAdd
+            	    // InternalTableDSL.g:6103:7: ( ruleOpAdd )
+            	    // InternalTableDSL.g:6104:8: ruleOpAdd
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -19053,7 +17679,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      								newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0());
             	      							
             	    }
-            	    pushFollow(FOLLOW_66);
+            	    pushFollow(FOLLOW_65);
             	    ruleOpAdd();
 
             	    state._fsp--;
@@ -19075,18 +17701,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:6650:4: ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
-            	    // InternalTableDSL.g:6651:5: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
+            	    // InternalTableDSL.g:6120:4: ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
+            	    // InternalTableDSL.g:6121:5: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
             	    {
-            	    // InternalTableDSL.g:6651:5: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
-            	    // InternalTableDSL.g:6652:6: lv_rightOperand_3_0= ruleXMultiplicativeExpression
+            	    // InternalTableDSL.g:6121:5: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
+            	    // InternalTableDSL.g:6122:6: lv_rightOperand_3_0= ruleXMultiplicativeExpression
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getRightOperandXMultiplicativeExpressionParserRuleCall_1_1_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_84);
+            	    pushFollow(FOLLOW_83);
             	    lv_rightOperand_3_0=ruleXMultiplicativeExpression();
 
             	    state._fsp--;
@@ -19115,7 +17741,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop79;
+            	    break loop74;
                 }
             } while (true);
 
@@ -19144,7 +17770,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpAdd"
-    // InternalTableDSL.g:6674:1: entryRuleOpAdd returns [String current=null] : iv_ruleOpAdd= ruleOpAdd EOF ;
+    // InternalTableDSL.g:6144:1: entryRuleOpAdd returns [String current=null] : iv_ruleOpAdd= ruleOpAdd EOF ;
     public final String entryRuleOpAdd() throws RecognitionException {
         String current = null;
 
@@ -19152,8 +17778,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:6674:45: (iv_ruleOpAdd= ruleOpAdd EOF )
-            // InternalTableDSL.g:6675:2: iv_ruleOpAdd= ruleOpAdd EOF
+            // InternalTableDSL.g:6144:45: (iv_ruleOpAdd= ruleOpAdd EOF )
+            // InternalTableDSL.g:6145:2: iv_ruleOpAdd= ruleOpAdd EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpAddRule()); 
@@ -19184,7 +17810,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpAdd"
-    // InternalTableDSL.g:6681:1: ruleOpAdd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+' | kw= '-' ) ;
+    // InternalTableDSL.g:6151:1: ruleOpAdd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+' | kw= '-' ) ;
     public final AntlrDatatypeRuleToken ruleOpAdd() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -19194,31 +17820,31 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:6687:2: ( (kw= '+' | kw= '-' ) )
-            // InternalTableDSL.g:6688:2: (kw= '+' | kw= '-' )
+            // InternalTableDSL.g:6157:2: ( (kw= '+' | kw= '-' ) )
+            // InternalTableDSL.g:6158:2: (kw= '+' | kw= '-' )
             {
-            // InternalTableDSL.g:6688:2: (kw= '+' | kw= '-' )
-            int alt80=2;
-            int LA80_0 = input.LA(1);
+            // InternalTableDSL.g:6158:2: (kw= '+' | kw= '-' )
+            int alt75=2;
+            int LA75_0 = input.LA(1);
 
-            if ( (LA80_0==94) ) {
-                alt80=1;
+            if ( (LA75_0==91) ) {
+                alt75=1;
             }
-            else if ( (LA80_0==95) ) {
-                alt80=2;
+            else if ( (LA75_0==92) ) {
+                alt75=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 80, 0, input);
+                    new NoViableAltException("", 75, 0, input);
 
                 throw nvae;
             }
-            switch (alt80) {
+            switch (alt75) {
                 case 1 :
-                    // InternalTableDSL.g:6689:3: kw= '+'
+                    // InternalTableDSL.g:6159:3: kw= '+'
                     {
-                    kw=(Token)match(input,94,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,91,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -19229,9 +17855,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:6695:3: kw= '-'
+                    // InternalTableDSL.g:6165:3: kw= '-'
                     {
-                    kw=(Token)match(input,95,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,92,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -19266,7 +17892,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXMultiplicativeExpression"
-    // InternalTableDSL.g:6704:1: entryRuleXMultiplicativeExpression returns [EObject current=null] : iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF ;
+    // InternalTableDSL.g:6174:1: entryRuleXMultiplicativeExpression returns [EObject current=null] : iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF ;
     public final EObject entryRuleXMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -19274,8 +17900,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:6704:66: (iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF )
-            // InternalTableDSL.g:6705:2: iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF
+            // InternalTableDSL.g:6174:66: (iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF )
+            // InternalTableDSL.g:6175:2: iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXMultiplicativeExpressionRule()); 
@@ -19306,7 +17932,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXMultiplicativeExpression"
-    // InternalTableDSL.g:6711:1: ruleXMultiplicativeExpression returns [EObject current=null] : (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) ;
+    // InternalTableDSL.g:6181:1: ruleXMultiplicativeExpression returns [EObject current=null] : (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) ;
     public final EObject ruleXMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -19319,18 +17945,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:6717:2: ( (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) )
-            // InternalTableDSL.g:6718:2: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
+            // InternalTableDSL.g:6187:2: ( (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) )
+            // InternalTableDSL.g:6188:2: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
             {
-            // InternalTableDSL.g:6718:2: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
-            // InternalTableDSL.g:6719:3: this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
+            // InternalTableDSL.g:6188:2: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
+            // InternalTableDSL.g:6189:3: this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getXUnaryOperationParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_85);
+            pushFollow(FOLLOW_84);
             this_XUnaryOperation_0=ruleXUnaryOperation();
 
             state._fsp--;
@@ -19341,50 +17967,50 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalTableDSL.g:6727:3: ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
-            loop81:
+            // InternalTableDSL.g:6197:3: ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
+            loop76:
             do {
-                int alt81=2;
+                int alt76=2;
                 switch ( input.LA(1) ) {
-                case 99:
+                case 96:
                     {
-                    int LA81_2 = input.LA(2);
+                    int LA76_2 = input.LA(2);
 
                     if ( (synpred17_InternalTableDSL()) ) {
-                        alt81=1;
+                        alt76=1;
                     }
 
 
                     }
                     break;
-                case 131:
+                case 128:
                     {
-                    int LA81_3 = input.LA(2);
+                    int LA76_3 = input.LA(2);
 
                     if ( (synpred17_InternalTableDSL()) ) {
-                        alt81=1;
+                        alt76=1;
                     }
 
 
                     }
                     break;
-                case 132:
+                case 129:
                     {
-                    int LA81_4 = input.LA(2);
+                    int LA76_4 = input.LA(2);
 
                     if ( (synpred17_InternalTableDSL()) ) {
-                        alt81=1;
+                        alt76=1;
                     }
 
 
                     }
                     break;
-                case 133:
+                case 130:
                     {
-                    int LA81_5 = input.LA(2);
+                    int LA76_5 = input.LA(2);
 
                     if ( (synpred17_InternalTableDSL()) ) {
-                        alt81=1;
+                        alt76=1;
                     }
 
 
@@ -19393,18 +18019,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                 }
 
-                switch (alt81) {
+                switch (alt76) {
             	case 1 :
-            	    // InternalTableDSL.g:6728:4: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
+            	    // InternalTableDSL.g:6198:4: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
             	    {
-            	    // InternalTableDSL.g:6728:4: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) )
-            	    // InternalTableDSL.g:6729:5: ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) )
+            	    // InternalTableDSL.g:6198:4: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) )
+            	    // InternalTableDSL.g:6199:5: ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) )
             	    {
-            	    // InternalTableDSL.g:6739:5: ( () ( ( ruleOpMulti ) ) )
-            	    // InternalTableDSL.g:6740:6: () ( ( ruleOpMulti ) )
+            	    // InternalTableDSL.g:6209:5: ( () ( ( ruleOpMulti ) ) )
+            	    // InternalTableDSL.g:6210:6: () ( ( ruleOpMulti ) )
             	    {
-            	    // InternalTableDSL.g:6740:6: ()
-            	    // InternalTableDSL.g:6741:7: 
+            	    // InternalTableDSL.g:6210:6: ()
+            	    // InternalTableDSL.g:6211:7: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -19416,11 +18042,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:6747:6: ( ( ruleOpMulti ) )
-            	    // InternalTableDSL.g:6748:7: ( ruleOpMulti )
+            	    // InternalTableDSL.g:6217:6: ( ( ruleOpMulti ) )
+            	    // InternalTableDSL.g:6218:7: ( ruleOpMulti )
             	    {
-            	    // InternalTableDSL.g:6748:7: ( ruleOpMulti )
-            	    // InternalTableDSL.g:6749:8: ruleOpMulti
+            	    // InternalTableDSL.g:6218:7: ( ruleOpMulti )
+            	    // InternalTableDSL.g:6219:8: ruleOpMulti
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -19434,7 +18060,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      								newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0());
             	      							
             	    }
-            	    pushFollow(FOLLOW_66);
+            	    pushFollow(FOLLOW_65);
             	    ruleOpMulti();
 
             	    state._fsp--;
@@ -19456,18 +18082,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:6765:4: ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
-            	    // InternalTableDSL.g:6766:5: (lv_rightOperand_3_0= ruleXUnaryOperation )
+            	    // InternalTableDSL.g:6235:4: ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
+            	    // InternalTableDSL.g:6236:5: (lv_rightOperand_3_0= ruleXUnaryOperation )
             	    {
-            	    // InternalTableDSL.g:6766:5: (lv_rightOperand_3_0= ruleXUnaryOperation )
-            	    // InternalTableDSL.g:6767:6: lv_rightOperand_3_0= ruleXUnaryOperation
+            	    // InternalTableDSL.g:6236:5: (lv_rightOperand_3_0= ruleXUnaryOperation )
+            	    // InternalTableDSL.g:6237:6: lv_rightOperand_3_0= ruleXUnaryOperation
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandXUnaryOperationParserRuleCall_1_1_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_85);
+            	    pushFollow(FOLLOW_84);
             	    lv_rightOperand_3_0=ruleXUnaryOperation();
 
             	    state._fsp--;
@@ -19496,7 +18122,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop81;
+            	    break loop76;
                 }
             } while (true);
 
@@ -19525,7 +18151,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpMulti"
-    // InternalTableDSL.g:6789:1: entryRuleOpMulti returns [String current=null] : iv_ruleOpMulti= ruleOpMulti EOF ;
+    // InternalTableDSL.g:6259:1: entryRuleOpMulti returns [String current=null] : iv_ruleOpMulti= ruleOpMulti EOF ;
     public final String entryRuleOpMulti() throws RecognitionException {
         String current = null;
 
@@ -19533,8 +18159,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:6789:47: (iv_ruleOpMulti= ruleOpMulti EOF )
-            // InternalTableDSL.g:6790:2: iv_ruleOpMulti= ruleOpMulti EOF
+            // InternalTableDSL.g:6259:47: (iv_ruleOpMulti= ruleOpMulti EOF )
+            // InternalTableDSL.g:6260:2: iv_ruleOpMulti= ruleOpMulti EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpMultiRule()); 
@@ -19565,7 +18191,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpMulti"
-    // InternalTableDSL.g:6796:1: ruleOpMulti returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) ;
+    // InternalTableDSL.g:6266:1: ruleOpMulti returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) ;
     public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -19575,45 +18201,45 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:6802:2: ( (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) )
-            // InternalTableDSL.g:6803:2: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
+            // InternalTableDSL.g:6272:2: ( (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) )
+            // InternalTableDSL.g:6273:2: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
             {
-            // InternalTableDSL.g:6803:2: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
-            int alt82=4;
+            // InternalTableDSL.g:6273:2: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
+            int alt77=4;
             switch ( input.LA(1) ) {
-            case 99:
+            case 96:
                 {
-                alt82=1;
+                alt77=1;
                 }
                 break;
-            case 131:
+            case 128:
                 {
-                alt82=2;
+                alt77=2;
                 }
                 break;
-            case 132:
+            case 129:
                 {
-                alt82=3;
+                alt77=3;
                 }
                 break;
-            case 133:
+            case 130:
                 {
-                alt82=4;
+                alt77=4;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 82, 0, input);
+                    new NoViableAltException("", 77, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt82) {
+            switch (alt77) {
                 case 1 :
-                    // InternalTableDSL.g:6804:3: kw= '*'
+                    // InternalTableDSL.g:6274:3: kw= '*'
                     {
-                    kw=(Token)match(input,99,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,96,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -19624,9 +18250,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:6810:3: kw= '**'
+                    // InternalTableDSL.g:6280:3: kw= '**'
                     {
-                    kw=(Token)match(input,131,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,128,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -19637,9 +18263,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:6816:3: kw= '/'
+                    // InternalTableDSL.g:6286:3: kw= '/'
                     {
-                    kw=(Token)match(input,132,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,129,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -19650,9 +18276,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:6822:3: kw= '%'
+                    // InternalTableDSL.g:6292:3: kw= '%'
                     {
-                    kw=(Token)match(input,133,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,130,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -19687,7 +18313,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXUnaryOperation"
-    // InternalTableDSL.g:6831:1: entryRuleXUnaryOperation returns [EObject current=null] : iv_ruleXUnaryOperation= ruleXUnaryOperation EOF ;
+    // InternalTableDSL.g:6301:1: entryRuleXUnaryOperation returns [EObject current=null] : iv_ruleXUnaryOperation= ruleXUnaryOperation EOF ;
     public final EObject entryRuleXUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -19695,8 +18321,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:6831:56: (iv_ruleXUnaryOperation= ruleXUnaryOperation EOF )
-            // InternalTableDSL.g:6832:2: iv_ruleXUnaryOperation= ruleXUnaryOperation EOF
+            // InternalTableDSL.g:6301:56: (iv_ruleXUnaryOperation= ruleXUnaryOperation EOF )
+            // InternalTableDSL.g:6302:2: iv_ruleXUnaryOperation= ruleXUnaryOperation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXUnaryOperationRule()); 
@@ -19727,7 +18353,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXUnaryOperation"
-    // InternalTableDSL.g:6838:1: ruleXUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) ;
+    // InternalTableDSL.g:6308:1: ruleXUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) ;
     public final EObject ruleXUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -19740,35 +18366,35 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:6844:2: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) )
-            // InternalTableDSL.g:6845:2: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
+            // InternalTableDSL.g:6314:2: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) )
+            // InternalTableDSL.g:6315:2: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
             {
-            // InternalTableDSL.g:6845:2: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
-            int alt83=2;
-            int LA83_0 = input.LA(1);
+            // InternalTableDSL.g:6315:2: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
+            int alt78=2;
+            int LA78_0 = input.LA(1);
 
-            if ( ((LA83_0>=94 && LA83_0<=95)||LA83_0==134) ) {
-                alt83=1;
+            if ( ((LA78_0>=91 && LA78_0<=92)||LA78_0==131) ) {
+                alt78=1;
             }
-            else if ( ((LA83_0>=RULE_ID && LA83_0<=RULE_STRING)||(LA83_0>=RULE_INT && LA83_0<=RULE_DECIMAL)||LA83_0==16||(LA83_0>=96 && LA83_0<=98)||LA83_0==103||(LA83_0>=107 && LA83_0<=108)||LA83_0==115||LA83_0==140||LA83_0==142||(LA83_0>=146 && LA83_0<=148)||(LA83_0>=151 && LA83_0<=160)||LA83_0==162) ) {
-                alt83=2;
+            else if ( ((LA78_0>=RULE_ID && LA78_0<=RULE_STRING)||(LA78_0>=RULE_INT && LA78_0<=RULE_DECIMAL)||LA78_0==16||(LA78_0>=93 && LA78_0<=95)||LA78_0==100||(LA78_0>=104 && LA78_0<=105)||LA78_0==112||LA78_0==137||LA78_0==139||(LA78_0>=143 && LA78_0<=145)||(LA78_0>=148 && LA78_0<=157)||LA78_0==159) ) {
+                alt78=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 83, 0, input);
+                    new NoViableAltException("", 78, 0, input);
 
                 throw nvae;
             }
-            switch (alt83) {
+            switch (alt78) {
                 case 1 :
-                    // InternalTableDSL.g:6846:3: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
+                    // InternalTableDSL.g:6316:3: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
                     {
-                    // InternalTableDSL.g:6846:3: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
-                    // InternalTableDSL.g:6847:4: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) )
+                    // InternalTableDSL.g:6316:3: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
+                    // InternalTableDSL.g:6317:4: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) )
                     {
-                    // InternalTableDSL.g:6847:4: ()
-                    // InternalTableDSL.g:6848:5: 
+                    // InternalTableDSL.g:6317:4: ()
+                    // InternalTableDSL.g:6318:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -19780,11 +18406,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:6854:4: ( ( ruleOpUnary ) )
-                    // InternalTableDSL.g:6855:5: ( ruleOpUnary )
+                    // InternalTableDSL.g:6324:4: ( ( ruleOpUnary ) )
+                    // InternalTableDSL.g:6325:5: ( ruleOpUnary )
                     {
-                    // InternalTableDSL.g:6855:5: ( ruleOpUnary )
-                    // InternalTableDSL.g:6856:6: ruleOpUnary
+                    // InternalTableDSL.g:6325:5: ( ruleOpUnary )
+                    // InternalTableDSL.g:6326:6: ruleOpUnary
                     {
                     if ( state.backtracking==0 ) {
 
@@ -19798,7 +18424,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       						newCompositeNode(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0());
                       					
                     }
-                    pushFollow(FOLLOW_66);
+                    pushFollow(FOLLOW_65);
                     ruleOpUnary();
 
                     state._fsp--;
@@ -19814,11 +18440,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:6870:4: ( (lv_operand_2_0= ruleXUnaryOperation ) )
-                    // InternalTableDSL.g:6871:5: (lv_operand_2_0= ruleXUnaryOperation )
+                    // InternalTableDSL.g:6340:4: ( (lv_operand_2_0= ruleXUnaryOperation ) )
+                    // InternalTableDSL.g:6341:5: (lv_operand_2_0= ruleXUnaryOperation )
                     {
-                    // InternalTableDSL.g:6871:5: (lv_operand_2_0= ruleXUnaryOperation )
-                    // InternalTableDSL.g:6872:6: lv_operand_2_0= ruleXUnaryOperation
+                    // InternalTableDSL.g:6341:5: (lv_operand_2_0= ruleXUnaryOperation )
+                    // InternalTableDSL.g:6342:6: lv_operand_2_0= ruleXUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
 
@@ -19856,7 +18482,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:6891:3: this_XCastedExpression_3= ruleXCastedExpression
+                    // InternalTableDSL.g:6361:3: this_XCastedExpression_3= ruleXCastedExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -19902,7 +18528,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpUnary"
-    // InternalTableDSL.g:6903:1: entryRuleOpUnary returns [String current=null] : iv_ruleOpUnary= ruleOpUnary EOF ;
+    // InternalTableDSL.g:6373:1: entryRuleOpUnary returns [String current=null] : iv_ruleOpUnary= ruleOpUnary EOF ;
     public final String entryRuleOpUnary() throws RecognitionException {
         String current = null;
 
@@ -19910,8 +18536,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:6903:47: (iv_ruleOpUnary= ruleOpUnary EOF )
-            // InternalTableDSL.g:6904:2: iv_ruleOpUnary= ruleOpUnary EOF
+            // InternalTableDSL.g:6373:47: (iv_ruleOpUnary= ruleOpUnary EOF )
+            // InternalTableDSL.g:6374:2: iv_ruleOpUnary= ruleOpUnary EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpUnaryRule()); 
@@ -19942,7 +18568,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpUnary"
-    // InternalTableDSL.g:6910:1: ruleOpUnary returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '!' | kw= '-' | kw= '+' ) ;
+    // InternalTableDSL.g:6380:1: ruleOpUnary returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '!' | kw= '-' | kw= '+' ) ;
     public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -19952,40 +18578,40 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:6916:2: ( (kw= '!' | kw= '-' | kw= '+' ) )
-            // InternalTableDSL.g:6917:2: (kw= '!' | kw= '-' | kw= '+' )
+            // InternalTableDSL.g:6386:2: ( (kw= '!' | kw= '-' | kw= '+' ) )
+            // InternalTableDSL.g:6387:2: (kw= '!' | kw= '-' | kw= '+' )
             {
-            // InternalTableDSL.g:6917:2: (kw= '!' | kw= '-' | kw= '+' )
-            int alt84=3;
+            // InternalTableDSL.g:6387:2: (kw= '!' | kw= '-' | kw= '+' )
+            int alt79=3;
             switch ( input.LA(1) ) {
-            case 134:
+            case 131:
                 {
-                alt84=1;
+                alt79=1;
                 }
                 break;
-            case 95:
+            case 92:
                 {
-                alt84=2;
+                alt79=2;
                 }
                 break;
-            case 94:
+            case 91:
                 {
-                alt84=3;
+                alt79=3;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 84, 0, input);
+                    new NoViableAltException("", 79, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt84) {
+            switch (alt79) {
                 case 1 :
-                    // InternalTableDSL.g:6918:3: kw= '!'
+                    // InternalTableDSL.g:6388:3: kw= '!'
                     {
-                    kw=(Token)match(input,134,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,131,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -19996,9 +18622,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:6924:3: kw= '-'
+                    // InternalTableDSL.g:6394:3: kw= '-'
                     {
-                    kw=(Token)match(input,95,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,92,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -20009,9 +18635,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:6930:3: kw= '+'
+                    // InternalTableDSL.g:6400:3: kw= '+'
                     {
-                    kw=(Token)match(input,94,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,91,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -20046,7 +18672,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXCastedExpression"
-    // InternalTableDSL.g:6939:1: entryRuleXCastedExpression returns [EObject current=null] : iv_ruleXCastedExpression= ruleXCastedExpression EOF ;
+    // InternalTableDSL.g:6409:1: entryRuleXCastedExpression returns [EObject current=null] : iv_ruleXCastedExpression= ruleXCastedExpression EOF ;
     public final EObject entryRuleXCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -20054,8 +18680,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:6939:58: (iv_ruleXCastedExpression= ruleXCastedExpression EOF )
-            // InternalTableDSL.g:6940:2: iv_ruleXCastedExpression= ruleXCastedExpression EOF
+            // InternalTableDSL.g:6409:58: (iv_ruleXCastedExpression= ruleXCastedExpression EOF )
+            // InternalTableDSL.g:6410:2: iv_ruleXCastedExpression= ruleXCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCastedExpressionRule()); 
@@ -20086,7 +18712,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXCastedExpression"
-    // InternalTableDSL.g:6946:1: ruleXCastedExpression returns [EObject current=null] : (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) ;
+    // InternalTableDSL.g:6416:1: ruleXCastedExpression returns [EObject current=null] : (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) ;
     public final EObject ruleXCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -20100,18 +18726,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:6952:2: ( (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) )
-            // InternalTableDSL.g:6953:2: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
+            // InternalTableDSL.g:6422:2: ( (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) )
+            // InternalTableDSL.g:6423:2: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
             {
-            // InternalTableDSL.g:6953:2: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
-            // InternalTableDSL.g:6954:3: this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
+            // InternalTableDSL.g:6423:2: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
+            // InternalTableDSL.g:6424:3: this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXCastedExpressionAccess().getXPostfixOperationParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_86);
+            pushFollow(FOLLOW_85);
             this_XPostfixOperation_0=ruleXPostfixOperation();
 
             state._fsp--;
@@ -20122,35 +18748,35 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalTableDSL.g:6962:3: ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
-            loop85:
+            // InternalTableDSL.g:6432:3: ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
+            loop80:
             do {
-                int alt85=2;
-                int LA85_0 = input.LA(1);
+                int alt80=2;
+                int LA80_0 = input.LA(1);
 
-                if ( (LA85_0==20) ) {
-                    int LA85_2 = input.LA(2);
+                if ( (LA80_0==20) ) {
+                    int LA80_2 = input.LA(2);
 
                     if ( (synpred18_InternalTableDSL()) ) {
-                        alt85=1;
+                        alt80=1;
                     }
 
 
                 }
 
 
-                switch (alt85) {
+                switch (alt80) {
             	case 1 :
-            	    // InternalTableDSL.g:6963:4: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalTableDSL.g:6433:4: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
             	    {
-            	    // InternalTableDSL.g:6963:4: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) )
-            	    // InternalTableDSL.g:6964:5: ( ( () 'as' ) )=> ( () otherlv_2= 'as' )
+            	    // InternalTableDSL.g:6433:4: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) )
+            	    // InternalTableDSL.g:6434:5: ( ( () 'as' ) )=> ( () otherlv_2= 'as' )
             	    {
-            	    // InternalTableDSL.g:6970:5: ( () otherlv_2= 'as' )
-            	    // InternalTableDSL.g:6971:6: () otherlv_2= 'as'
+            	    // InternalTableDSL.g:6440:5: ( () otherlv_2= 'as' )
+            	    // InternalTableDSL.g:6441:6: () otherlv_2= 'as'
             	    {
-            	    // InternalTableDSL.g:6971:6: ()
-            	    // InternalTableDSL.g:6972:7: 
+            	    // InternalTableDSL.g:6441:6: ()
+            	    // InternalTableDSL.g:6442:7: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -20162,7 +18788,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,20,FOLLOW_79); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,20,FOLLOW_78); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      						newLeafNode(otherlv_2, grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1());
@@ -20174,18 +18800,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:6984:4: ( (lv_type_3_0= ruleJvmTypeReference ) )
-            	    // InternalTableDSL.g:6985:5: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalTableDSL.g:6454:4: ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalTableDSL.g:6455:5: (lv_type_3_0= ruleJvmTypeReference )
             	    {
-            	    // InternalTableDSL.g:6985:5: (lv_type_3_0= ruleJvmTypeReference )
-            	    // InternalTableDSL.g:6986:6: lv_type_3_0= ruleJvmTypeReference
+            	    // InternalTableDSL.g:6455:5: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalTableDSL.g:6456:6: lv_type_3_0= ruleJvmTypeReference
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXCastedExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_1_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_86);
+            	    pushFollow(FOLLOW_85);
             	    lv_type_3_0=ruleJvmTypeReference();
 
             	    state._fsp--;
@@ -20214,7 +18840,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop85;
+            	    break loop80;
                 }
             } while (true);
 
@@ -20243,7 +18869,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXPostfixOperation"
-    // InternalTableDSL.g:7008:1: entryRuleXPostfixOperation returns [EObject current=null] : iv_ruleXPostfixOperation= ruleXPostfixOperation EOF ;
+    // InternalTableDSL.g:6478:1: entryRuleXPostfixOperation returns [EObject current=null] : iv_ruleXPostfixOperation= ruleXPostfixOperation EOF ;
     public final EObject entryRuleXPostfixOperation() throws RecognitionException {
         EObject current = null;
 
@@ -20251,8 +18877,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:7008:58: (iv_ruleXPostfixOperation= ruleXPostfixOperation EOF )
-            // InternalTableDSL.g:7009:2: iv_ruleXPostfixOperation= ruleXPostfixOperation EOF
+            // InternalTableDSL.g:6478:58: (iv_ruleXPostfixOperation= ruleXPostfixOperation EOF )
+            // InternalTableDSL.g:6479:2: iv_ruleXPostfixOperation= ruleXPostfixOperation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXPostfixOperationRule()); 
@@ -20283,7 +18909,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXPostfixOperation"
-    // InternalTableDSL.g:7015:1: ruleXPostfixOperation returns [EObject current=null] : (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) ;
+    // InternalTableDSL.g:6485:1: ruleXPostfixOperation returns [EObject current=null] : (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) ;
     public final EObject ruleXPostfixOperation() throws RecognitionException {
         EObject current = null;
 
@@ -20294,18 +18920,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:7021:2: ( (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) )
-            // InternalTableDSL.g:7022:2: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
+            // InternalTableDSL.g:6491:2: ( (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) )
+            // InternalTableDSL.g:6492:2: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
             {
-            // InternalTableDSL.g:7022:2: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
-            // InternalTableDSL.g:7023:3: this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
+            // InternalTableDSL.g:6492:2: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
+            // InternalTableDSL.g:6493:3: this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXPostfixOperationAccess().getXMemberFeatureCallParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_87);
+            pushFollow(FOLLOW_86);
             this_XMemberFeatureCall_0=ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -20316,33 +18942,33 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalTableDSL.g:7031:3: ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
-            int alt86=2;
-            int LA86_0 = input.LA(1);
+            // InternalTableDSL.g:6501:3: ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
+            int alt81=2;
+            int LA81_0 = input.LA(1);
 
-            if ( (LA86_0==135) ) {
-                int LA86_1 = input.LA(2);
+            if ( (LA81_0==132) ) {
+                int LA81_1 = input.LA(2);
 
                 if ( (synpred19_InternalTableDSL()) ) {
-                    alt86=1;
+                    alt81=1;
                 }
             }
-            else if ( (LA86_0==136) ) {
-                int LA86_2 = input.LA(2);
+            else if ( (LA81_0==133) ) {
+                int LA81_2 = input.LA(2);
 
                 if ( (synpred19_InternalTableDSL()) ) {
-                    alt86=1;
+                    alt81=1;
                 }
             }
-            switch (alt86) {
+            switch (alt81) {
                 case 1 :
-                    // InternalTableDSL.g:7032:4: ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) )
+                    // InternalTableDSL.g:6502:4: ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) )
                     {
-                    // InternalTableDSL.g:7042:4: ( () ( ( ruleOpPostfix ) ) )
-                    // InternalTableDSL.g:7043:5: () ( ( ruleOpPostfix ) )
+                    // InternalTableDSL.g:6512:4: ( () ( ( ruleOpPostfix ) ) )
+                    // InternalTableDSL.g:6513:5: () ( ( ruleOpPostfix ) )
                     {
-                    // InternalTableDSL.g:7043:5: ()
-                    // InternalTableDSL.g:7044:6: 
+                    // InternalTableDSL.g:6513:5: ()
+                    // InternalTableDSL.g:6514:6: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -20354,11 +18980,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:7050:5: ( ( ruleOpPostfix ) )
-                    // InternalTableDSL.g:7051:6: ( ruleOpPostfix )
+                    // InternalTableDSL.g:6520:5: ( ( ruleOpPostfix ) )
+                    // InternalTableDSL.g:6521:6: ( ruleOpPostfix )
                     {
-                    // InternalTableDSL.g:7051:6: ( ruleOpPostfix )
-                    // InternalTableDSL.g:7052:7: ruleOpPostfix
+                    // InternalTableDSL.g:6521:6: ( ruleOpPostfix )
+                    // InternalTableDSL.g:6522:7: ruleOpPostfix
                     {
                     if ( state.backtracking==0 ) {
 
@@ -20422,7 +19048,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpPostfix"
-    // InternalTableDSL.g:7072:1: entryRuleOpPostfix returns [String current=null] : iv_ruleOpPostfix= ruleOpPostfix EOF ;
+    // InternalTableDSL.g:6542:1: entryRuleOpPostfix returns [String current=null] : iv_ruleOpPostfix= ruleOpPostfix EOF ;
     public final String entryRuleOpPostfix() throws RecognitionException {
         String current = null;
 
@@ -20430,8 +19056,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:7072:49: (iv_ruleOpPostfix= ruleOpPostfix EOF )
-            // InternalTableDSL.g:7073:2: iv_ruleOpPostfix= ruleOpPostfix EOF
+            // InternalTableDSL.g:6542:49: (iv_ruleOpPostfix= ruleOpPostfix EOF )
+            // InternalTableDSL.g:6543:2: iv_ruleOpPostfix= ruleOpPostfix EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpPostfixRule()); 
@@ -20462,7 +19088,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpPostfix"
-    // InternalTableDSL.g:7079:1: ruleOpPostfix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '++' | kw= '--' ) ;
+    // InternalTableDSL.g:6549:1: ruleOpPostfix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '++' | kw= '--' ) ;
     public final AntlrDatatypeRuleToken ruleOpPostfix() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -20472,31 +19098,31 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:7085:2: ( (kw= '++' | kw= '--' ) )
-            // InternalTableDSL.g:7086:2: (kw= '++' | kw= '--' )
+            // InternalTableDSL.g:6555:2: ( (kw= '++' | kw= '--' ) )
+            // InternalTableDSL.g:6556:2: (kw= '++' | kw= '--' )
             {
-            // InternalTableDSL.g:7086:2: (kw= '++' | kw= '--' )
-            int alt87=2;
-            int LA87_0 = input.LA(1);
+            // InternalTableDSL.g:6556:2: (kw= '++' | kw= '--' )
+            int alt82=2;
+            int LA82_0 = input.LA(1);
 
-            if ( (LA87_0==135) ) {
-                alt87=1;
+            if ( (LA82_0==132) ) {
+                alt82=1;
             }
-            else if ( (LA87_0==136) ) {
-                alt87=2;
+            else if ( (LA82_0==133) ) {
+                alt82=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 87, 0, input);
+                    new NoViableAltException("", 82, 0, input);
 
                 throw nvae;
             }
-            switch (alt87) {
+            switch (alt82) {
                 case 1 :
-                    // InternalTableDSL.g:7087:3: kw= '++'
+                    // InternalTableDSL.g:6557:3: kw= '++'
                     {
-                    kw=(Token)match(input,135,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,132,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -20507,9 +19133,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:7093:3: kw= '--'
+                    // InternalTableDSL.g:6563:3: kw= '--'
                     {
-                    kw=(Token)match(input,136,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,133,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -20544,7 +19170,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXMemberFeatureCall"
-    // InternalTableDSL.g:7102:1: entryRuleXMemberFeatureCall returns [EObject current=null] : iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF ;
+    // InternalTableDSL.g:6572:1: entryRuleXMemberFeatureCall returns [EObject current=null] : iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF ;
     public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -20552,8 +19178,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:7102:59: (iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF )
-            // InternalTableDSL.g:7103:2: iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF
+            // InternalTableDSL.g:6572:59: (iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF )
+            // InternalTableDSL.g:6573:2: iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXMemberFeatureCallRule()); 
@@ -20584,7 +19210,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXMemberFeatureCall"
-    // InternalTableDSL.g:7109:1: ruleXMemberFeatureCall returns [EObject current=null] : (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) ;
+    // InternalTableDSL.g:6579:1: ruleXMemberFeatureCall returns [EObject current=null] : (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) ;
     public final EObject ruleXMemberFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -20620,18 +19246,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:7115:2: ( (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) )
-            // InternalTableDSL.g:7116:2: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
+            // InternalTableDSL.g:6585:2: ( (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) )
+            // InternalTableDSL.g:6586:2: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
             {
-            // InternalTableDSL.g:7116:2: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
-            // InternalTableDSL.g:7117:3: this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
+            // InternalTableDSL.g:6586:2: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
+            // InternalTableDSL.g:6587:3: this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getXPrimaryExpressionParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_88);
+            pushFollow(FOLLOW_87);
             this_XPrimaryExpression_0=ruleXPrimaryExpression();
 
             state._fsp--;
@@ -20642,45 +19268,45 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalTableDSL.g:7125:3: ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
-            loop96:
+            // InternalTableDSL.g:6595:3: ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
+            loop91:
             do {
-                int alt96=3;
+                int alt91=3;
                 switch ( input.LA(1) ) {
-                case 78:
+                case 74:
                     {
-                    int LA96_2 = input.LA(2);
+                    int LA91_2 = input.LA(2);
 
                     if ( (synpred20_InternalTableDSL()) ) {
-                        alt96=1;
+                        alt91=1;
                     }
                     else if ( (synpred21_InternalTableDSL()) ) {
-                        alt96=2;
+                        alt91=2;
                     }
 
 
                     }
                     break;
-                case 137:
+                case 134:
                     {
-                    int LA96_3 = input.LA(2);
+                    int LA91_3 = input.LA(2);
 
                     if ( (synpred20_InternalTableDSL()) ) {
-                        alt96=1;
+                        alt91=1;
                     }
                     else if ( (synpred21_InternalTableDSL()) ) {
-                        alt96=2;
+                        alt91=2;
                     }
 
 
                     }
                     break;
-                case 138:
+                case 135:
                     {
-                    int LA96_4 = input.LA(2);
+                    int LA91_4 = input.LA(2);
 
                     if ( (synpred21_InternalTableDSL()) ) {
-                        alt96=2;
+                        alt91=2;
                     }
 
 
@@ -20689,21 +19315,21 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                 }
 
-                switch (alt96) {
+                switch (alt91) {
             	case 1 :
-            	    // InternalTableDSL.g:7126:4: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
+            	    // InternalTableDSL.g:6596:4: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
             	    {
-            	    // InternalTableDSL.g:7126:4: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
-            	    // InternalTableDSL.g:7127:5: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) )
+            	    // InternalTableDSL.g:6596:4: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
+            	    // InternalTableDSL.g:6597:5: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) )
             	    {
-            	    // InternalTableDSL.g:7127:5: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
-            	    // InternalTableDSL.g:7128:6: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+            	    // InternalTableDSL.g:6597:5: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
+            	    // InternalTableDSL.g:6598:6: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
             	    {
-            	    // InternalTableDSL.g:7148:6: ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
-            	    // InternalTableDSL.g:7149:7: () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
+            	    // InternalTableDSL.g:6618:6: ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+            	    // InternalTableDSL.g:6619:7: () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
             	    {
-            	    // InternalTableDSL.g:7149:7: ()
-            	    // InternalTableDSL.g:7150:8: 
+            	    // InternalTableDSL.g:6619:7: ()
+            	    // InternalTableDSL.g:6620:8: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -20715,28 +19341,28 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:7156:7: (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) )
-            	    int alt88=2;
-            	    int LA88_0 = input.LA(1);
+            	    // InternalTableDSL.g:6626:7: (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) )
+            	    int alt83=2;
+            	    int LA83_0 = input.LA(1);
 
-            	    if ( (LA88_0==78) ) {
-            	        alt88=1;
+            	    if ( (LA83_0==74) ) {
+            	        alt83=1;
             	    }
-            	    else if ( (LA88_0==137) ) {
-            	        alt88=2;
+            	    else if ( (LA83_0==134) ) {
+            	        alt83=2;
             	    }
             	    else {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        NoViableAltException nvae =
-            	            new NoViableAltException("", 88, 0, input);
+            	            new NoViableAltException("", 83, 0, input);
 
             	        throw nvae;
             	    }
-            	    switch (alt88) {
+            	    switch (alt83) {
             	        case 1 :
-            	            // InternalTableDSL.g:7157:8: otherlv_2= '.'
+            	            // InternalTableDSL.g:6627:8: otherlv_2= '.'
             	            {
-            	            otherlv_2=(Token)match(input,78,FOLLOW_89); if (state.failed) return current;
+            	            otherlv_2=(Token)match(input,74,FOLLOW_88); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              								newLeafNode(otherlv_2, grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_0_0_0_1_0());
@@ -20746,15 +19372,15 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	            }
             	            break;
             	        case 2 :
-            	            // InternalTableDSL.g:7162:8: ( (lv_explicitStatic_3_0= '::' ) )
+            	            // InternalTableDSL.g:6632:8: ( (lv_explicitStatic_3_0= '::' ) )
             	            {
-            	            // InternalTableDSL.g:7162:8: ( (lv_explicitStatic_3_0= '::' ) )
-            	            // InternalTableDSL.g:7163:9: (lv_explicitStatic_3_0= '::' )
+            	            // InternalTableDSL.g:6632:8: ( (lv_explicitStatic_3_0= '::' ) )
+            	            // InternalTableDSL.g:6633:9: (lv_explicitStatic_3_0= '::' )
             	            {
-            	            // InternalTableDSL.g:7163:9: (lv_explicitStatic_3_0= '::' )
-            	            // InternalTableDSL.g:7164:10: lv_explicitStatic_3_0= '::'
+            	            // InternalTableDSL.g:6633:9: (lv_explicitStatic_3_0= '::' )
+            	            // InternalTableDSL.g:6634:10: lv_explicitStatic_3_0= '::'
             	            {
-            	            lv_explicitStatic_3_0=(Token)match(input,137,FOLLOW_89); if (state.failed) return current;
+            	            lv_explicitStatic_3_0=(Token)match(input,134,FOLLOW_88); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              										newLeafNode(lv_explicitStatic_3_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0());
@@ -20780,11 +19406,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:7177:7: ( ( ruleFeatureCallID ) )
-            	    // InternalTableDSL.g:7178:8: ( ruleFeatureCallID )
+            	    // InternalTableDSL.g:6647:7: ( ( ruleFeatureCallID ) )
+            	    // InternalTableDSL.g:6648:8: ( ruleFeatureCallID )
             	    {
-            	    // InternalTableDSL.g:7178:8: ( ruleFeatureCallID )
-            	    // InternalTableDSL.g:7179:9: ruleFeatureCallID
+            	    // InternalTableDSL.g:6648:8: ( ruleFeatureCallID )
+            	    // InternalTableDSL.g:6649:9: ruleFeatureCallID
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -20798,7 +19424,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      									newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_0_2_0());
             	      								
             	    }
-            	    pushFollow(FOLLOW_65);
+            	    pushFollow(FOLLOW_64);
             	    ruleFeatureCallID();
 
             	    state._fsp--;
@@ -20819,7 +19445,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      							newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getOpSingleAssignParserRuleCall_1_0_0_0_3());
             	      						
             	    }
-            	    pushFollow(FOLLOW_66);
+            	    pushFollow(FOLLOW_65);
             	    ruleOpSingleAssign();
 
             	    state._fsp--;
@@ -20835,18 +19461,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:7202:5: ( (lv_value_6_0= ruleXAssignment ) )
-            	    // InternalTableDSL.g:7203:6: (lv_value_6_0= ruleXAssignment )
+            	    // InternalTableDSL.g:6672:5: ( (lv_value_6_0= ruleXAssignment ) )
+            	    // InternalTableDSL.g:6673:6: (lv_value_6_0= ruleXAssignment )
             	    {
-            	    // InternalTableDSL.g:7203:6: (lv_value_6_0= ruleXAssignment )
-            	    // InternalTableDSL.g:7204:7: lv_value_6_0= ruleXAssignment
+            	    // InternalTableDSL.g:6673:6: (lv_value_6_0= ruleXAssignment )
+            	    // InternalTableDSL.g:6674:7: lv_value_6_0= ruleXAssignment
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      							newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getValueXAssignmentParserRuleCall_1_0_1_0());
             	      						
             	    }
-            	    pushFollow(FOLLOW_88);
+            	    pushFollow(FOLLOW_87);
             	    lv_value_6_0=ruleXAssignment();
 
             	    state._fsp--;
@@ -20877,19 +19503,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // InternalTableDSL.g:7223:4: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
+            	    // InternalTableDSL.g:6693:4: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
             	    {
-            	    // InternalTableDSL.g:7223:4: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
-            	    // InternalTableDSL.g:7224:5: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
+            	    // InternalTableDSL.g:6693:4: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
+            	    // InternalTableDSL.g:6694:5: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
             	    {
-            	    // InternalTableDSL.g:7224:5: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) )
-            	    // InternalTableDSL.g:7225:6: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
+            	    // InternalTableDSL.g:6694:5: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) )
+            	    // InternalTableDSL.g:6695:6: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
             	    {
-            	    // InternalTableDSL.g:7245:6: ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
-            	    // InternalTableDSL.g:7246:7: () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
+            	    // InternalTableDSL.g:6715:6: ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
+            	    // InternalTableDSL.g:6716:7: () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
             	    {
-            	    // InternalTableDSL.g:7246:7: ()
-            	    // InternalTableDSL.g:7247:8: 
+            	    // InternalTableDSL.g:6716:7: ()
+            	    // InternalTableDSL.g:6717:8: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -20901,37 +19527,37 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:7253:7: (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
-            	    int alt89=3;
+            	    // InternalTableDSL.g:6723:7: (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
+            	    int alt84=3;
             	    switch ( input.LA(1) ) {
-            	    case 78:
+            	    case 74:
             	        {
-            	        alt89=1;
+            	        alt84=1;
             	        }
             	        break;
-            	    case 138:
+            	    case 135:
             	        {
-            	        alt89=2;
+            	        alt84=2;
             	        }
             	        break;
-            	    case 137:
+            	    case 134:
             	        {
-            	        alt89=3;
+            	        alt84=3;
             	        }
             	        break;
             	    default:
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        NoViableAltException nvae =
-            	            new NoViableAltException("", 89, 0, input);
+            	            new NoViableAltException("", 84, 0, input);
 
             	        throw nvae;
             	    }
 
-            	    switch (alt89) {
+            	    switch (alt84) {
             	        case 1 :
-            	            // InternalTableDSL.g:7254:8: otherlv_8= '.'
+            	            // InternalTableDSL.g:6724:8: otherlv_8= '.'
             	            {
-            	            otherlv_8=(Token)match(input,78,FOLLOW_90); if (state.failed) return current;
+            	            otherlv_8=(Token)match(input,74,FOLLOW_89); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              								newLeafNode(otherlv_8, grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_1_0_0_1_0());
@@ -20941,15 +19567,15 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	            }
             	            break;
             	        case 2 :
-            	            // InternalTableDSL.g:7259:8: ( (lv_nullSafe_9_0= '?.' ) )
+            	            // InternalTableDSL.g:6729:8: ( (lv_nullSafe_9_0= '?.' ) )
             	            {
-            	            // InternalTableDSL.g:7259:8: ( (lv_nullSafe_9_0= '?.' ) )
-            	            // InternalTableDSL.g:7260:9: (lv_nullSafe_9_0= '?.' )
+            	            // InternalTableDSL.g:6729:8: ( (lv_nullSafe_9_0= '?.' ) )
+            	            // InternalTableDSL.g:6730:9: (lv_nullSafe_9_0= '?.' )
             	            {
-            	            // InternalTableDSL.g:7260:9: (lv_nullSafe_9_0= '?.' )
-            	            // InternalTableDSL.g:7261:10: lv_nullSafe_9_0= '?.'
+            	            // InternalTableDSL.g:6730:9: (lv_nullSafe_9_0= '?.' )
+            	            // InternalTableDSL.g:6731:10: lv_nullSafe_9_0= '?.'
             	            {
-            	            lv_nullSafe_9_0=(Token)match(input,138,FOLLOW_90); if (state.failed) return current;
+            	            lv_nullSafe_9_0=(Token)match(input,135,FOLLOW_89); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              										newLeafNode(lv_nullSafe_9_0, grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0());
@@ -20973,15 +19599,15 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	            }
             	            break;
             	        case 3 :
-            	            // InternalTableDSL.g:7274:8: ( (lv_explicitStatic_10_0= '::' ) )
+            	            // InternalTableDSL.g:6744:8: ( (lv_explicitStatic_10_0= '::' ) )
             	            {
-            	            // InternalTableDSL.g:7274:8: ( (lv_explicitStatic_10_0= '::' ) )
-            	            // InternalTableDSL.g:7275:9: (lv_explicitStatic_10_0= '::' )
+            	            // InternalTableDSL.g:6744:8: ( (lv_explicitStatic_10_0= '::' ) )
+            	            // InternalTableDSL.g:6745:9: (lv_explicitStatic_10_0= '::' )
             	            {
-            	            // InternalTableDSL.g:7275:9: (lv_explicitStatic_10_0= '::' )
-            	            // InternalTableDSL.g:7276:10: lv_explicitStatic_10_0= '::'
+            	            // InternalTableDSL.g:6745:9: (lv_explicitStatic_10_0= '::' )
+            	            // InternalTableDSL.g:6746:10: lv_explicitStatic_10_0= '::'
             	            {
-            	            lv_explicitStatic_10_0=(Token)match(input,137,FOLLOW_90); if (state.failed) return current;
+            	            lv_explicitStatic_10_0=(Token)match(input,134,FOLLOW_89); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              										newLeafNode(lv_explicitStatic_10_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0());
@@ -21013,35 +19639,35 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:7291:5: (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )?
-            	    int alt91=2;
-            	    int LA91_0 = input.LA(1);
+            	    // InternalTableDSL.g:6761:5: (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )?
+            	    int alt86=2;
+            	    int LA86_0 = input.LA(1);
 
-            	    if ( (LA91_0==115) ) {
-            	        alt91=1;
+            	    if ( (LA86_0==112) ) {
+            	        alt86=1;
             	    }
-            	    switch (alt91) {
+            	    switch (alt86) {
             	        case 1 :
-            	            // InternalTableDSL.g:7292:6: otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>'
+            	            // InternalTableDSL.g:6762:6: otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>'
             	            {
-            	            otherlv_11=(Token)match(input,115,FOLLOW_91); if (state.failed) return current;
+            	            otherlv_11=(Token)match(input,112,FOLLOW_90); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              						newLeafNode(otherlv_11, grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0());
             	              					
             	            }
-            	            // InternalTableDSL.g:7296:6: ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) )
-            	            // InternalTableDSL.g:7297:7: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
+            	            // InternalTableDSL.g:6766:6: ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) )
+            	            // InternalTableDSL.g:6767:7: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
             	            {
-            	            // InternalTableDSL.g:7297:7: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
-            	            // InternalTableDSL.g:7298:8: lv_typeArguments_12_0= ruleJvmArgumentTypeReference
+            	            // InternalTableDSL.g:6767:7: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
+            	            // InternalTableDSL.g:6768:8: lv_typeArguments_12_0= ruleJvmArgumentTypeReference
             	            {
             	            if ( state.backtracking==0 ) {
 
             	              								newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_1_0());
             	              							
             	            }
-            	            pushFollow(FOLLOW_92);
+            	            pushFollow(FOLLOW_91);
             	            lv_typeArguments_12_0=ruleJvmArgumentTypeReference();
 
             	            state._fsp--;
@@ -21065,39 +19691,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	            }
 
-            	            // InternalTableDSL.g:7315:6: (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )*
-            	            loop90:
+            	            // InternalTableDSL.g:6785:6: (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )*
+            	            loop85:
             	            do {
-            	                int alt90=2;
-            	                int LA90_0 = input.LA(1);
+            	                int alt85=2;
+            	                int LA85_0 = input.LA(1);
 
-            	                if ( (LA90_0==104) ) {
-            	                    alt90=1;
+            	                if ( (LA85_0==101) ) {
+            	                    alt85=1;
             	                }
 
 
-            	                switch (alt90) {
+            	                switch (alt85) {
             	            	case 1 :
-            	            	    // InternalTableDSL.g:7316:7: otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
+            	            	    // InternalTableDSL.g:6786:7: otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
             	            	    {
-            	            	    otherlv_13=(Token)match(input,104,FOLLOW_91); if (state.failed) return current;
+            	            	    otherlv_13=(Token)match(input,101,FOLLOW_90); if (state.failed) return current;
             	            	    if ( state.backtracking==0 ) {
 
             	            	      							newLeafNode(otherlv_13, grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0());
             	            	      						
             	            	    }
-            	            	    // InternalTableDSL.g:7320:7: ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
-            	            	    // InternalTableDSL.g:7321:8: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
+            	            	    // InternalTableDSL.g:6790:7: ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
+            	            	    // InternalTableDSL.g:6791:8: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
             	            	    {
-            	            	    // InternalTableDSL.g:7321:8: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
-            	            	    // InternalTableDSL.g:7322:9: lv_typeArguments_14_0= ruleJvmArgumentTypeReference
+            	            	    // InternalTableDSL.g:6791:8: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
+            	            	    // InternalTableDSL.g:6792:9: lv_typeArguments_14_0= ruleJvmArgumentTypeReference
             	            	    {
             	            	    if ( state.backtracking==0 ) {
 
             	            	      									newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_2_1_0());
             	            	      								
             	            	    }
-            	            	    pushFollow(FOLLOW_92);
+            	            	    pushFollow(FOLLOW_91);
             	            	    lv_typeArguments_14_0=ruleJvmArgumentTypeReference();
 
             	            	    state._fsp--;
@@ -21126,11 +19752,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	            	    break;
 
             	            	default :
-            	            	    break loop90;
+            	            	    break loop85;
             	                }
             	            } while (true);
 
-            	            otherlv_15=(Token)match(input,116,FOLLOW_90); if (state.failed) return current;
+            	            otherlv_15=(Token)match(input,113,FOLLOW_89); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              						newLeafNode(otherlv_15, grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3());
@@ -21142,11 +19768,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:7345:5: ( ( ruleIdOrSuper ) )
-            	    // InternalTableDSL.g:7346:6: ( ruleIdOrSuper )
+            	    // InternalTableDSL.g:6815:5: ( ( ruleIdOrSuper ) )
+            	    // InternalTableDSL.g:6816:6: ( ruleIdOrSuper )
             	    {
-            	    // InternalTableDSL.g:7346:6: ( ruleIdOrSuper )
-            	    // InternalTableDSL.g:7347:7: ruleIdOrSuper
+            	    // InternalTableDSL.g:6816:6: ( ruleIdOrSuper )
+            	    // InternalTableDSL.g:6817:7: ruleIdOrSuper
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -21160,7 +19786,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      							newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_2_0());
             	      						
             	    }
-            	    pushFollow(FOLLOW_93);
+            	    pushFollow(FOLLOW_92);
             	    ruleIdOrSuper();
 
             	    state._fsp--;
@@ -21176,20 +19802,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:7361:5: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?
-            	    int alt94=2;
-            	    alt94 = dfa94.predict(input);
-            	    switch (alt94) {
+            	    // InternalTableDSL.g:6831:5: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?
+            	    int alt89=2;
+            	    alt89 = dfa89.predict(input);
+            	    switch (alt89) {
             	        case 1 :
-            	            // InternalTableDSL.g:7362:6: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')'
+            	            // InternalTableDSL.g:6832:6: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')'
             	            {
-            	            // InternalTableDSL.g:7362:6: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) )
-            	            // InternalTableDSL.g:7363:7: ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' )
+            	            // InternalTableDSL.g:6832:6: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) )
+            	            // InternalTableDSL.g:6833:7: ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' )
             	            {
-            	            // InternalTableDSL.g:7367:7: (lv_explicitOperationCall_17_0= '(' )
-            	            // InternalTableDSL.g:7368:8: lv_explicitOperationCall_17_0= '('
+            	            // InternalTableDSL.g:6837:7: (lv_explicitOperationCall_17_0= '(' )
+            	            // InternalTableDSL.g:6838:8: lv_explicitOperationCall_17_0= '('
             	            {
-            	            lv_explicitOperationCall_17_0=(Token)match(input,103,FOLLOW_94); if (state.failed) return current;
+            	            lv_explicitOperationCall_17_0=(Token)match(input,100,FOLLOW_93); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              								newLeafNode(lv_explicitOperationCall_17_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0());
@@ -21209,25 +19835,25 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	            }
 
-            	            // InternalTableDSL.g:7380:6: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?
-            	            int alt93=3;
-            	            alt93 = dfa93.predict(input);
-            	            switch (alt93) {
+            	            // InternalTableDSL.g:6850:6: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?
+            	            int alt88=3;
+            	            alt88 = dfa88.predict(input);
+            	            switch (alt88) {
             	                case 1 :
-            	                    // InternalTableDSL.g:7381:7: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
+            	                    // InternalTableDSL.g:6851:7: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
             	                    {
-            	                    // InternalTableDSL.g:7381:7: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
-            	                    // InternalTableDSL.g:7382:8: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure )
+            	                    // InternalTableDSL.g:6851:7: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
+            	                    // InternalTableDSL.g:6852:8: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure )
             	                    {
-            	                    // InternalTableDSL.g:7407:8: (lv_memberCallArguments_18_0= ruleXShortClosure )
-            	                    // InternalTableDSL.g:7408:9: lv_memberCallArguments_18_0= ruleXShortClosure
+            	                    // InternalTableDSL.g:6877:8: (lv_memberCallArguments_18_0= ruleXShortClosure )
+            	                    // InternalTableDSL.g:6878:9: lv_memberCallArguments_18_0= ruleXShortClosure
             	                    {
             	                    if ( state.backtracking==0 ) {
 
             	                      									newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXShortClosureParserRuleCall_1_1_3_1_0_0());
             	                      								
             	                    }
-            	                    pushFollow(FOLLOW_64);
+            	                    pushFollow(FOLLOW_63);
             	                    lv_memberCallArguments_18_0=ruleXShortClosure();
 
             	                    state._fsp--;
@@ -21255,23 +19881,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	                    }
             	                    break;
             	                case 2 :
-            	                    // InternalTableDSL.g:7426:7: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
+            	                    // InternalTableDSL.g:6896:7: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
             	                    {
-            	                    // InternalTableDSL.g:7426:7: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
-            	                    // InternalTableDSL.g:7427:8: ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
+            	                    // InternalTableDSL.g:6896:7: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
+            	                    // InternalTableDSL.g:6897:8: ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
             	                    {
-            	                    // InternalTableDSL.g:7427:8: ( (lv_memberCallArguments_19_0= ruleXExpression ) )
-            	                    // InternalTableDSL.g:7428:9: (lv_memberCallArguments_19_0= ruleXExpression )
+            	                    // InternalTableDSL.g:6897:8: ( (lv_memberCallArguments_19_0= ruleXExpression ) )
+            	                    // InternalTableDSL.g:6898:9: (lv_memberCallArguments_19_0= ruleXExpression )
             	                    {
-            	                    // InternalTableDSL.g:7428:9: (lv_memberCallArguments_19_0= ruleXExpression )
-            	                    // InternalTableDSL.g:7429:10: lv_memberCallArguments_19_0= ruleXExpression
+            	                    // InternalTableDSL.g:6898:9: (lv_memberCallArguments_19_0= ruleXExpression )
+            	                    // InternalTableDSL.g:6899:10: lv_memberCallArguments_19_0= ruleXExpression
             	                    {
             	                    if ( state.backtracking==0 ) {
 
             	                      										newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_0_0());
             	                      									
             	                    }
-            	                    pushFollow(FOLLOW_63);
+            	                    pushFollow(FOLLOW_62);
             	                    lv_memberCallArguments_19_0=ruleXExpression();
 
             	                    state._fsp--;
@@ -21295,39 +19921,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	                    }
 
-            	                    // InternalTableDSL.g:7446:8: (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
-            	                    loop92:
+            	                    // InternalTableDSL.g:6916:8: (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
+            	                    loop87:
             	                    do {
-            	                        int alt92=2;
-            	                        int LA92_0 = input.LA(1);
+            	                        int alt87=2;
+            	                        int LA87_0 = input.LA(1);
 
-            	                        if ( (LA92_0==104) ) {
-            	                            alt92=1;
+            	                        if ( (LA87_0==101) ) {
+            	                            alt87=1;
             	                        }
 
 
-            	                        switch (alt92) {
+            	                        switch (alt87) {
             	                    	case 1 :
-            	                    	    // InternalTableDSL.g:7447:9: otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) )
+            	                    	    // InternalTableDSL.g:6917:9: otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) )
             	                    	    {
-            	                    	    otherlv_20=(Token)match(input,104,FOLLOW_66); if (state.failed) return current;
+            	                    	    otherlv_20=(Token)match(input,101,FOLLOW_65); if (state.failed) return current;
             	                    	    if ( state.backtracking==0 ) {
 
             	                    	      									newLeafNode(otherlv_20, grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0());
             	                    	      								
             	                    	    }
-            	                    	    // InternalTableDSL.g:7451:9: ( (lv_memberCallArguments_21_0= ruleXExpression ) )
-            	                    	    // InternalTableDSL.g:7452:10: (lv_memberCallArguments_21_0= ruleXExpression )
+            	                    	    // InternalTableDSL.g:6921:9: ( (lv_memberCallArguments_21_0= ruleXExpression ) )
+            	                    	    // InternalTableDSL.g:6922:10: (lv_memberCallArguments_21_0= ruleXExpression )
             	                    	    {
-            	                    	    // InternalTableDSL.g:7452:10: (lv_memberCallArguments_21_0= ruleXExpression )
-            	                    	    // InternalTableDSL.g:7453:11: lv_memberCallArguments_21_0= ruleXExpression
+            	                    	    // InternalTableDSL.g:6922:10: (lv_memberCallArguments_21_0= ruleXExpression )
+            	                    	    // InternalTableDSL.g:6923:11: lv_memberCallArguments_21_0= ruleXExpression
             	                    	    {
             	                    	    if ( state.backtracking==0 ) {
 
             	                    	      											newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_1_1_0());
             	                    	      										
             	                    	    }
-            	                    	    pushFollow(FOLLOW_63);
+            	                    	    pushFollow(FOLLOW_62);
             	                    	    lv_memberCallArguments_21_0=ruleXExpression();
 
             	                    	    state._fsp--;
@@ -21356,7 +19982,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	                    	    break;
 
             	                    	default :
-            	                    	    break loop92;
+            	                    	    break loop87;
             	                        }
             	                    } while (true);
 
@@ -21369,7 +19995,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	            }
 
-            	            otherlv_22=(Token)match(input,105,FOLLOW_95); if (state.failed) return current;
+            	            otherlv_22=(Token)match(input,102,FOLLOW_94); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              						newLeafNode(otherlv_22, grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2());
@@ -21381,22 +20007,22 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:7478:5: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
-            	    int alt95=2;
-            	    alt95 = dfa95.predict(input);
-            	    switch (alt95) {
+            	    // InternalTableDSL.g:6948:5: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
+            	    int alt90=2;
+            	    alt90 = dfa90.predict(input);
+            	    switch (alt90) {
             	        case 1 :
-            	            // InternalTableDSL.g:7479:6: ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure )
+            	            // InternalTableDSL.g:6949:6: ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure )
             	            {
-            	            // InternalTableDSL.g:7485:6: (lv_memberCallArguments_23_0= ruleXClosure )
-            	            // InternalTableDSL.g:7486:7: lv_memberCallArguments_23_0= ruleXClosure
+            	            // InternalTableDSL.g:6955:6: (lv_memberCallArguments_23_0= ruleXClosure )
+            	            // InternalTableDSL.g:6956:7: lv_memberCallArguments_23_0= ruleXClosure
             	            {
             	            if ( state.backtracking==0 ) {
 
             	              							newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXClosureParserRuleCall_1_1_4_0());
             	              						
             	            }
-            	            pushFollow(FOLLOW_88);
+            	            pushFollow(FOLLOW_87);
             	            lv_memberCallArguments_23_0=ruleXClosure();
 
             	            state._fsp--;
@@ -21431,7 +20057,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop96;
+            	    break loop91;
                 }
             } while (true);
 
@@ -21460,7 +20086,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXPrimaryExpression"
-    // InternalTableDSL.g:7509:1: entryRuleXPrimaryExpression returns [EObject current=null] : iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF ;
+    // InternalTableDSL.g:6979:1: entryRuleXPrimaryExpression returns [EObject current=null] : iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF ;
     public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -21468,8 +20094,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:7509:59: (iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF )
-            // InternalTableDSL.g:7510:2: iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF
+            // InternalTableDSL.g:6979:59: (iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF )
+            // InternalTableDSL.g:6980:2: iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXPrimaryExpressionRule()); 
@@ -21500,7 +20126,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXPrimaryExpression"
-    // InternalTableDSL.g:7516:1: ruleXPrimaryExpression returns [EObject current=null] : (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression ) ;
+    // InternalTableDSL.g:6986:1: ruleXPrimaryExpression returns [EObject current=null] : (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression ) ;
     public final EObject ruleXPrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -21539,15 +20165,15 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:7522:2: ( (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression ) )
-            // InternalTableDSL.g:7523:2: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )
+            // InternalTableDSL.g:6992:2: ( (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression ) )
+            // InternalTableDSL.g:6993:2: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )
             {
-            // InternalTableDSL.g:7523:2: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )
-            int alt97=15;
-            alt97 = dfa97.predict(input);
-            switch (alt97) {
+            // InternalTableDSL.g:6993:2: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )
+            int alt92=15;
+            alt92 = dfa92.predict(input);
+            switch (alt92) {
                 case 1 :
-                    // InternalTableDSL.g:7524:3: this_XConstructorCall_0= ruleXConstructorCall
+                    // InternalTableDSL.g:6994:3: this_XConstructorCall_0= ruleXConstructorCall
                     {
                     if ( state.backtracking==0 ) {
 
@@ -21569,7 +20195,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:7533:3: this_XBlockExpression_1= ruleXBlockExpression
+                    // InternalTableDSL.g:7003:3: this_XBlockExpression_1= ruleXBlockExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -21591,7 +20217,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:7542:3: this_XSwitchExpression_2= ruleXSwitchExpression
+                    // InternalTableDSL.g:7012:3: this_XSwitchExpression_2= ruleXSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -21613,10 +20239,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:7551:3: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
+                    // InternalTableDSL.g:7021:3: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
                     {
-                    // InternalTableDSL.g:7551:3: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
-                    // InternalTableDSL.g:7552:4: ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression
+                    // InternalTableDSL.g:7021:3: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
+                    // InternalTableDSL.g:7022:4: ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -21641,7 +20267,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:7569:3: this_XFeatureCall_4= ruleXFeatureCall
+                    // InternalTableDSL.g:7039:3: this_XFeatureCall_4= ruleXFeatureCall
                     {
                     if ( state.backtracking==0 ) {
 
@@ -21663,7 +20289,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 6 :
-                    // InternalTableDSL.g:7578:3: this_XLiteral_5= ruleXLiteral
+                    // InternalTableDSL.g:7048:3: this_XLiteral_5= ruleXLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -21685,7 +20311,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 7 :
-                    // InternalTableDSL.g:7587:3: this_XIfExpression_6= ruleXIfExpression
+                    // InternalTableDSL.g:7057:3: this_XIfExpression_6= ruleXIfExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -21707,10 +20333,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 8 :
-                    // InternalTableDSL.g:7596:3: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
+                    // InternalTableDSL.g:7066:3: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
                     {
-                    // InternalTableDSL.g:7596:3: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
-                    // InternalTableDSL.g:7597:4: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression
+                    // InternalTableDSL.g:7066:3: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
+                    // InternalTableDSL.g:7067:4: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -21735,7 +20361,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 9 :
-                    // InternalTableDSL.g:7620:3: this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression
+                    // InternalTableDSL.g:7090:3: this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -21757,7 +20383,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 10 :
-                    // InternalTableDSL.g:7629:3: this_XWhileExpression_9= ruleXWhileExpression
+                    // InternalTableDSL.g:7099:3: this_XWhileExpression_9= ruleXWhileExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -21779,7 +20405,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 11 :
-                    // InternalTableDSL.g:7638:3: this_XDoWhileExpression_10= ruleXDoWhileExpression
+                    // InternalTableDSL.g:7108:3: this_XDoWhileExpression_10= ruleXDoWhileExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -21801,7 +20427,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 12 :
-                    // InternalTableDSL.g:7647:3: this_XThrowExpression_11= ruleXThrowExpression
+                    // InternalTableDSL.g:7117:3: this_XThrowExpression_11= ruleXThrowExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -21823,7 +20449,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 13 :
-                    // InternalTableDSL.g:7656:3: this_XReturnExpression_12= ruleXReturnExpression
+                    // InternalTableDSL.g:7126:3: this_XReturnExpression_12= ruleXReturnExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -21845,7 +20471,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 14 :
-                    // InternalTableDSL.g:7665:3: this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression
+                    // InternalTableDSL.g:7135:3: this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -21867,7 +20493,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 15 :
-                    // InternalTableDSL.g:7674:3: this_XParenthesizedExpression_14= ruleXParenthesizedExpression
+                    // InternalTableDSL.g:7144:3: this_XParenthesizedExpression_14= ruleXParenthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -21913,7 +20539,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXLiteral"
-    // InternalTableDSL.g:7686:1: entryRuleXLiteral returns [EObject current=null] : iv_ruleXLiteral= ruleXLiteral EOF ;
+    // InternalTableDSL.g:7156:1: entryRuleXLiteral returns [EObject current=null] : iv_ruleXLiteral= ruleXLiteral EOF ;
     public final EObject entryRuleXLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21921,8 +20547,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:7686:49: (iv_ruleXLiteral= ruleXLiteral EOF )
-            // InternalTableDSL.g:7687:2: iv_ruleXLiteral= ruleXLiteral EOF
+            // InternalTableDSL.g:7156:49: (iv_ruleXLiteral= ruleXLiteral EOF )
+            // InternalTableDSL.g:7157:2: iv_ruleXLiteral= ruleXLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXLiteralRule()); 
@@ -21953,7 +20579,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXLiteral"
-    // InternalTableDSL.g:7693:1: ruleXLiteral returns [EObject current=null] : (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) ;
+    // InternalTableDSL.g:7163:1: ruleXLiteral returns [EObject current=null] : (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) ;
     public final EObject ruleXLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21976,44 +20602,44 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:7699:2: ( (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) )
-            // InternalTableDSL.g:7700:2: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
+            // InternalTableDSL.g:7169:2: ( (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) )
+            // InternalTableDSL.g:7170:2: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
             {
-            // InternalTableDSL.g:7700:2: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
-            int alt98=7;
-            int LA98_0 = input.LA(1);
+            // InternalTableDSL.g:7170:2: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
+            int alt93=7;
+            int LA93_0 = input.LA(1);
 
-            if ( (LA98_0==107) ) {
-                alt98=1;
+            if ( (LA93_0==104) ) {
+                alt93=1;
             }
-            else if ( (LA98_0==108) && (synpred27_InternalTableDSL())) {
-                alt98=2;
+            else if ( (LA93_0==105) && (synpred27_InternalTableDSL())) {
+                alt93=2;
             }
-            else if ( ((LA98_0>=154 && LA98_0<=155)) ) {
-                alt98=3;
+            else if ( ((LA93_0>=151 && LA93_0<=152)) ) {
+                alt93=3;
             }
-            else if ( ((LA98_0>=RULE_INT && LA98_0<=RULE_DECIMAL)) ) {
-                alt98=4;
+            else if ( ((LA93_0>=RULE_INT && LA93_0<=RULE_DECIMAL)) ) {
+                alt93=4;
             }
-            else if ( (LA98_0==156) ) {
-                alt98=5;
+            else if ( (LA93_0==153) ) {
+                alt93=5;
             }
-            else if ( (LA98_0==RULE_STRING) ) {
-                alt98=6;
+            else if ( (LA93_0==RULE_STRING) ) {
+                alt93=6;
             }
-            else if ( (LA98_0==157) ) {
-                alt98=7;
+            else if ( (LA93_0==154) ) {
+                alt93=7;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 98, 0, input);
+                    new NoViableAltException("", 93, 0, input);
 
                 throw nvae;
             }
-            switch (alt98) {
+            switch (alt93) {
                 case 1 :
-                    // InternalTableDSL.g:7701:3: this_XCollectionLiteral_0= ruleXCollectionLiteral
+                    // InternalTableDSL.g:7171:3: this_XCollectionLiteral_0= ruleXCollectionLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -22035,10 +20661,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:7710:3: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
+                    // InternalTableDSL.g:7180:3: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
                     {
-                    // InternalTableDSL.g:7710:3: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
-                    // InternalTableDSL.g:7711:4: ( ( () '[' ) )=>this_XClosure_1= ruleXClosure
+                    // InternalTableDSL.g:7180:3: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
+                    // InternalTableDSL.g:7181:4: ( ( () '[' ) )=>this_XClosure_1= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
 
@@ -22063,7 +20689,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:7727:3: this_XBooleanLiteral_2= ruleXBooleanLiteral
+                    // InternalTableDSL.g:7197:3: this_XBooleanLiteral_2= ruleXBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -22085,7 +20711,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:7736:3: this_XNumberLiteral_3= ruleXNumberLiteral
+                    // InternalTableDSL.g:7206:3: this_XNumberLiteral_3= ruleXNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -22107,7 +20733,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:7745:3: this_XNullLiteral_4= ruleXNullLiteral
+                    // InternalTableDSL.g:7215:3: this_XNullLiteral_4= ruleXNullLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -22129,7 +20755,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 6 :
-                    // InternalTableDSL.g:7754:3: this_XStringLiteral_5= ruleXStringLiteral
+                    // InternalTableDSL.g:7224:3: this_XStringLiteral_5= ruleXStringLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -22151,7 +20777,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 7 :
-                    // InternalTableDSL.g:7763:3: this_XTypeLiteral_6= ruleXTypeLiteral
+                    // InternalTableDSL.g:7233:3: this_XTypeLiteral_6= ruleXTypeLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -22197,7 +20823,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXCollectionLiteral"
-    // InternalTableDSL.g:7775:1: entryRuleXCollectionLiteral returns [EObject current=null] : iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF ;
+    // InternalTableDSL.g:7245:1: entryRuleXCollectionLiteral returns [EObject current=null] : iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF ;
     public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -22205,8 +20831,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:7775:59: (iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF )
-            // InternalTableDSL.g:7776:2: iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF
+            // InternalTableDSL.g:7245:59: (iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF )
+            // InternalTableDSL.g:7246:2: iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCollectionLiteralRule()); 
@@ -22237,7 +20863,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXCollectionLiteral"
-    // InternalTableDSL.g:7782:1: ruleXCollectionLiteral returns [EObject current=null] : (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) ;
+    // InternalTableDSL.g:7252:1: ruleXCollectionLiteral returns [EObject current=null] : (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) ;
     public final EObject ruleXCollectionLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -22250,26 +20876,26 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:7788:2: ( (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) )
-            // InternalTableDSL.g:7789:2: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
+            // InternalTableDSL.g:7258:2: ( (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) )
+            // InternalTableDSL.g:7259:2: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
             {
-            // InternalTableDSL.g:7789:2: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
-            int alt99=2;
-            int LA99_0 = input.LA(1);
+            // InternalTableDSL.g:7259:2: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
+            int alt94=2;
+            int LA94_0 = input.LA(1);
 
-            if ( (LA99_0==107) ) {
-                int LA99_1 = input.LA(2);
+            if ( (LA94_0==104) ) {
+                int LA94_1 = input.LA(2);
 
-                if ( (LA99_1==16) ) {
-                    alt99=1;
+                if ( (LA94_1==105) ) {
+                    alt94=2;
                 }
-                else if ( (LA99_1==108) ) {
-                    alt99=2;
+                else if ( (LA94_1==16) ) {
+                    alt94=1;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 99, 1, input);
+                        new NoViableAltException("", 94, 1, input);
 
                     throw nvae;
                 }
@@ -22277,13 +20903,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 99, 0, input);
+                    new NoViableAltException("", 94, 0, input);
 
                 throw nvae;
             }
-            switch (alt99) {
+            switch (alt94) {
                 case 1 :
-                    // InternalTableDSL.g:7790:3: this_XSetLiteral_0= ruleXSetLiteral
+                    // InternalTableDSL.g:7260:3: this_XSetLiteral_0= ruleXSetLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -22305,7 +20931,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:7799:3: this_XListLiteral_1= ruleXListLiteral
+                    // InternalTableDSL.g:7269:3: this_XListLiteral_1= ruleXListLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -22351,7 +20977,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXSetLiteral"
-    // InternalTableDSL.g:7811:1: entryRuleXSetLiteral returns [EObject current=null] : iv_ruleXSetLiteral= ruleXSetLiteral EOF ;
+    // InternalTableDSL.g:7281:1: entryRuleXSetLiteral returns [EObject current=null] : iv_ruleXSetLiteral= ruleXSetLiteral EOF ;
     public final EObject entryRuleXSetLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -22359,8 +20985,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:7811:52: (iv_ruleXSetLiteral= ruleXSetLiteral EOF )
-            // InternalTableDSL.g:7812:2: iv_ruleXSetLiteral= ruleXSetLiteral EOF
+            // InternalTableDSL.g:7281:52: (iv_ruleXSetLiteral= ruleXSetLiteral EOF )
+            // InternalTableDSL.g:7282:2: iv_ruleXSetLiteral= ruleXSetLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSetLiteralRule()); 
@@ -22391,7 +21017,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXSetLiteral"
-    // InternalTableDSL.g:7818:1: ruleXSetLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) ;
+    // InternalTableDSL.g:7288:1: ruleXSetLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) ;
     public final EObject ruleXSetLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -22408,14 +21034,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:7824:2: ( ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) )
-            // InternalTableDSL.g:7825:2: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
+            // InternalTableDSL.g:7294:2: ( ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) )
+            // InternalTableDSL.g:7295:2: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
             {
-            // InternalTableDSL.g:7825:2: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
-            // InternalTableDSL.g:7826:3: () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}'
+            // InternalTableDSL.g:7295:2: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
+            // InternalTableDSL.g:7296:3: () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}'
             {
-            // InternalTableDSL.g:7826:3: ()
-            // InternalTableDSL.g:7827:4: 
+            // InternalTableDSL.g:7296:3: ()
+            // InternalTableDSL.g:7297:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -22427,41 +21053,41 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,107,FOLLOW_22); if (state.failed) return current;
+            otherlv_1=(Token)match(input,104,FOLLOW_21); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,16,FOLLOW_96); if (state.failed) return current;
+            otherlv_2=(Token)match(input,16,FOLLOW_95); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2());
               		
             }
-            // InternalTableDSL.g:7841:3: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
-            int alt101=2;
-            int LA101_0 = input.LA(1);
+            // InternalTableDSL.g:7311:3: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
+            int alt96=2;
+            int LA96_0 = input.LA(1);
 
-            if ( ((LA101_0>=RULE_ID && LA101_0<=RULE_STRING)||(LA101_0>=RULE_INT && LA101_0<=RULE_DECIMAL)||LA101_0==16||(LA101_0>=94 && LA101_0<=98)||LA101_0==103||(LA101_0>=107 && LA101_0<=108)||LA101_0==115||LA101_0==134||LA101_0==140||LA101_0==142||(LA101_0>=146 && LA101_0<=148)||(LA101_0>=151 && LA101_0<=160)||LA101_0==162) ) {
-                alt101=1;
+            if ( ((LA96_0>=RULE_ID && LA96_0<=RULE_STRING)||(LA96_0>=RULE_INT && LA96_0<=RULE_DECIMAL)||LA96_0==16||(LA96_0>=91 && LA96_0<=95)||LA96_0==100||(LA96_0>=104 && LA96_0<=105)||LA96_0==112||LA96_0==131||LA96_0==137||LA96_0==139||(LA96_0>=143 && LA96_0<=145)||(LA96_0>=148 && LA96_0<=157)||LA96_0==159) ) {
+                alt96=1;
             }
-            switch (alt101) {
+            switch (alt96) {
                 case 1 :
-                    // InternalTableDSL.g:7842:4: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalTableDSL.g:7312:4: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     {
-                    // InternalTableDSL.g:7842:4: ( (lv_elements_3_0= ruleXExpression ) )
-                    // InternalTableDSL.g:7843:5: (lv_elements_3_0= ruleXExpression )
+                    // InternalTableDSL.g:7312:4: ( (lv_elements_3_0= ruleXExpression ) )
+                    // InternalTableDSL.g:7313:5: (lv_elements_3_0= ruleXExpression )
                     {
-                    // InternalTableDSL.g:7843:5: (lv_elements_3_0= ruleXExpression )
-                    // InternalTableDSL.g:7844:6: lv_elements_3_0= ruleXExpression
+                    // InternalTableDSL.g:7313:5: (lv_elements_3_0= ruleXExpression )
+                    // InternalTableDSL.g:7314:6: lv_elements_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0());
                       					
                     }
-                    pushFollow(FOLLOW_97);
+                    pushFollow(FOLLOW_96);
                     lv_elements_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -22485,39 +21111,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:7861:4: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
-                    loop100:
+                    // InternalTableDSL.g:7331:4: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    loop95:
                     do {
-                        int alt100=2;
-                        int LA100_0 = input.LA(1);
+                        int alt95=2;
+                        int LA95_0 = input.LA(1);
 
-                        if ( (LA100_0==104) ) {
-                            alt100=1;
+                        if ( (LA95_0==101) ) {
+                            alt95=1;
                         }
 
 
-                        switch (alt100) {
+                        switch (alt95) {
                     	case 1 :
-                    	    // InternalTableDSL.g:7862:5: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalTableDSL.g:7332:5: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,104,FOLLOW_66); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,101,FOLLOW_65); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      					newLeafNode(otherlv_4, grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0());
                     	      				
                     	    }
-                    	    // InternalTableDSL.g:7866:5: ( (lv_elements_5_0= ruleXExpression ) )
-                    	    // InternalTableDSL.g:7867:6: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalTableDSL.g:7336:5: ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalTableDSL.g:7337:6: (lv_elements_5_0= ruleXExpression )
                     	    {
-                    	    // InternalTableDSL.g:7867:6: (lv_elements_5_0= ruleXExpression )
-                    	    // InternalTableDSL.g:7868:7: lv_elements_5_0= ruleXExpression
+                    	    // InternalTableDSL.g:7337:6: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalTableDSL.g:7338:7: lv_elements_5_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      							newCompositeNode(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_97);
+                    	    pushFollow(FOLLOW_96);
                     	    lv_elements_5_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -22546,7 +21172,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop100;
+                    	    break loop95;
                         }
                     } while (true);
 
@@ -22587,7 +21213,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXListLiteral"
-    // InternalTableDSL.g:7895:1: entryRuleXListLiteral returns [EObject current=null] : iv_ruleXListLiteral= ruleXListLiteral EOF ;
+    // InternalTableDSL.g:7365:1: entryRuleXListLiteral returns [EObject current=null] : iv_ruleXListLiteral= ruleXListLiteral EOF ;
     public final EObject entryRuleXListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -22595,8 +21221,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:7895:53: (iv_ruleXListLiteral= ruleXListLiteral EOF )
-            // InternalTableDSL.g:7896:2: iv_ruleXListLiteral= ruleXListLiteral EOF
+            // InternalTableDSL.g:7365:53: (iv_ruleXListLiteral= ruleXListLiteral EOF )
+            // InternalTableDSL.g:7366:2: iv_ruleXListLiteral= ruleXListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXListLiteralRule()); 
@@ -22627,7 +21253,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXListLiteral"
-    // InternalTableDSL.g:7902:1: ruleXListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) ;
+    // InternalTableDSL.g:7372:1: ruleXListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) ;
     public final EObject ruleXListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -22644,14 +21270,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:7908:2: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) )
-            // InternalTableDSL.g:7909:2: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
+            // InternalTableDSL.g:7378:2: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) )
+            // InternalTableDSL.g:7379:2: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
             {
-            // InternalTableDSL.g:7909:2: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
-            // InternalTableDSL.g:7910:3: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']'
+            // InternalTableDSL.g:7379:2: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
+            // InternalTableDSL.g:7380:3: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']'
             {
-            // InternalTableDSL.g:7910:3: ()
-            // InternalTableDSL.g:7911:4: 
+            // InternalTableDSL.g:7380:3: ()
+            // InternalTableDSL.g:7381:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -22663,41 +21289,41 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,107,FOLLOW_67); if (state.failed) return current;
+            otherlv_1=(Token)match(input,104,FOLLOW_66); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,108,FOLLOW_68); if (state.failed) return current;
+            otherlv_2=(Token)match(input,105,FOLLOW_67); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2());
               		
             }
-            // InternalTableDSL.g:7925:3: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
-            int alt103=2;
-            int LA103_0 = input.LA(1);
+            // InternalTableDSL.g:7395:3: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
+            int alt98=2;
+            int LA98_0 = input.LA(1);
 
-            if ( ((LA103_0>=RULE_ID && LA103_0<=RULE_STRING)||(LA103_0>=RULE_INT && LA103_0<=RULE_DECIMAL)||LA103_0==16||(LA103_0>=94 && LA103_0<=98)||LA103_0==103||(LA103_0>=107 && LA103_0<=108)||LA103_0==115||LA103_0==134||LA103_0==140||LA103_0==142||(LA103_0>=146 && LA103_0<=148)||(LA103_0>=151 && LA103_0<=160)||LA103_0==162) ) {
-                alt103=1;
+            if ( ((LA98_0>=RULE_ID && LA98_0<=RULE_STRING)||(LA98_0>=RULE_INT && LA98_0<=RULE_DECIMAL)||LA98_0==16||(LA98_0>=91 && LA98_0<=95)||LA98_0==100||(LA98_0>=104 && LA98_0<=105)||LA98_0==112||LA98_0==131||LA98_0==137||LA98_0==139||(LA98_0>=143 && LA98_0<=145)||(LA98_0>=148 && LA98_0<=157)||LA98_0==159) ) {
+                alt98=1;
             }
-            switch (alt103) {
+            switch (alt98) {
                 case 1 :
-                    // InternalTableDSL.g:7926:4: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalTableDSL.g:7396:4: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     {
-                    // InternalTableDSL.g:7926:4: ( (lv_elements_3_0= ruleXExpression ) )
-                    // InternalTableDSL.g:7927:5: (lv_elements_3_0= ruleXExpression )
+                    // InternalTableDSL.g:7396:4: ( (lv_elements_3_0= ruleXExpression ) )
+                    // InternalTableDSL.g:7397:5: (lv_elements_3_0= ruleXExpression )
                     {
-                    // InternalTableDSL.g:7927:5: (lv_elements_3_0= ruleXExpression )
-                    // InternalTableDSL.g:7928:6: lv_elements_3_0= ruleXExpression
+                    // InternalTableDSL.g:7397:5: (lv_elements_3_0= ruleXExpression )
+                    // InternalTableDSL.g:7398:6: lv_elements_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0());
                       					
                     }
-                    pushFollow(FOLLOW_69);
+                    pushFollow(FOLLOW_68);
                     lv_elements_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -22721,39 +21347,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:7945:4: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
-                    loop102:
+                    // InternalTableDSL.g:7415:4: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    loop97:
                     do {
-                        int alt102=2;
-                        int LA102_0 = input.LA(1);
+                        int alt97=2;
+                        int LA97_0 = input.LA(1);
 
-                        if ( (LA102_0==104) ) {
-                            alt102=1;
+                        if ( (LA97_0==101) ) {
+                            alt97=1;
                         }
 
 
-                        switch (alt102) {
+                        switch (alt97) {
                     	case 1 :
-                    	    // InternalTableDSL.g:7946:5: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalTableDSL.g:7416:5: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,104,FOLLOW_66); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,101,FOLLOW_65); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      					newLeafNode(otherlv_4, grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0());
                     	      				
                     	    }
-                    	    // InternalTableDSL.g:7950:5: ( (lv_elements_5_0= ruleXExpression ) )
-                    	    // InternalTableDSL.g:7951:6: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalTableDSL.g:7420:5: ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalTableDSL.g:7421:6: (lv_elements_5_0= ruleXExpression )
                     	    {
-                    	    // InternalTableDSL.g:7951:6: (lv_elements_5_0= ruleXExpression )
-                    	    // InternalTableDSL.g:7952:7: lv_elements_5_0= ruleXExpression
+                    	    // InternalTableDSL.g:7421:6: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalTableDSL.g:7422:7: lv_elements_5_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      							newCompositeNode(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_69);
+                    	    pushFollow(FOLLOW_68);
                     	    lv_elements_5_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -22782,7 +21408,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop102;
+                    	    break loop97;
                         }
                     } while (true);
 
@@ -22792,7 +21418,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,109,FOLLOW_2); if (state.failed) return current;
+            otherlv_6=(Token)match(input,106,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_6, grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4());
@@ -22823,7 +21449,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXClosure"
-    // InternalTableDSL.g:7979:1: entryRuleXClosure returns [EObject current=null] : iv_ruleXClosure= ruleXClosure EOF ;
+    // InternalTableDSL.g:7449:1: entryRuleXClosure returns [EObject current=null] : iv_ruleXClosure= ruleXClosure EOF ;
     public final EObject entryRuleXClosure() throws RecognitionException {
         EObject current = null;
 
@@ -22831,8 +21457,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:7979:49: (iv_ruleXClosure= ruleXClosure EOF )
-            // InternalTableDSL.g:7980:2: iv_ruleXClosure= ruleXClosure EOF
+            // InternalTableDSL.g:7449:49: (iv_ruleXClosure= ruleXClosure EOF )
+            // InternalTableDSL.g:7450:2: iv_ruleXClosure= ruleXClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXClosureRule()); 
@@ -22863,7 +21489,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXClosure"
-    // InternalTableDSL.g:7986:1: ruleXClosure returns [EObject current=null] : ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) ;
+    // InternalTableDSL.g:7456:1: ruleXClosure returns [EObject current=null] : ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) ;
     public final EObject ruleXClosure() throws RecognitionException {
         EObject current = null;
 
@@ -22882,20 +21508,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:7992:2: ( ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) )
-            // InternalTableDSL.g:7993:2: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
+            // InternalTableDSL.g:7462:2: ( ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) )
+            // InternalTableDSL.g:7463:2: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
             {
-            // InternalTableDSL.g:7993:2: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
-            // InternalTableDSL.g:7994:3: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']'
+            // InternalTableDSL.g:7463:2: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
+            // InternalTableDSL.g:7464:3: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']'
             {
-            // InternalTableDSL.g:7994:3: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) )
-            // InternalTableDSL.g:7995:4: ( ( () '[' ) )=> ( () otherlv_1= '[' )
+            // InternalTableDSL.g:7464:3: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) )
+            // InternalTableDSL.g:7465:4: ( ( () '[' ) )=> ( () otherlv_1= '[' )
             {
-            // InternalTableDSL.g:8001:4: ( () otherlv_1= '[' )
-            // InternalTableDSL.g:8002:5: () otherlv_1= '['
+            // InternalTableDSL.g:7471:4: ( () otherlv_1= '[' )
+            // InternalTableDSL.g:7472:5: () otherlv_1= '['
             {
-            // InternalTableDSL.g:8002:5: ()
-            // InternalTableDSL.g:8003:6: 
+            // InternalTableDSL.g:7472:5: ()
+            // InternalTableDSL.g:7473:6: 
             {
             if ( state.backtracking==0 ) {
 
@@ -22907,7 +21533,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,108,FOLLOW_98); if (state.failed) return current;
+            otherlv_1=(Token)match(input,105,FOLLOW_97); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(otherlv_1, grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1());
@@ -22919,39 +21545,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:8015:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?
-            int alt106=2;
-            alt106 = dfa106.predict(input);
-            switch (alt106) {
+            // InternalTableDSL.g:7485:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?
+            int alt101=2;
+            alt101 = dfa101.predict(input);
+            switch (alt101) {
                 case 1 :
-                    // InternalTableDSL.g:8016:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
+                    // InternalTableDSL.g:7486:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
                     {
-                    // InternalTableDSL.g:8039:4: ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
-                    // InternalTableDSL.g:8040:5: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) )
+                    // InternalTableDSL.g:7509:4: ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
+                    // InternalTableDSL.g:7510:5: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) )
                     {
-                    // InternalTableDSL.g:8040:5: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )?
-                    int alt105=2;
-                    int LA105_0 = input.LA(1);
+                    // InternalTableDSL.g:7510:5: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )?
+                    int alt100=2;
+                    int LA100_0 = input.LA(1);
 
-                    if ( (LA105_0==RULE_ID||LA105_0==103||LA105_0==128) ) {
-                        alt105=1;
+                    if ( (LA100_0==RULE_ID||LA100_0==100||LA100_0==125) ) {
+                        alt100=1;
                     }
-                    switch (alt105) {
+                    switch (alt100) {
                         case 1 :
-                            // InternalTableDSL.g:8041:6: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
+                            // InternalTableDSL.g:7511:6: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
                             {
-                            // InternalTableDSL.g:8041:6: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) )
-                            // InternalTableDSL.g:8042:7: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
+                            // InternalTableDSL.g:7511:6: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) )
+                            // InternalTableDSL.g:7512:7: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
                             {
-                            // InternalTableDSL.g:8042:7: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
-                            // InternalTableDSL.g:8043:8: lv_declaredFormalParameters_2_0= ruleJvmFormalParameter
+                            // InternalTableDSL.g:7512:7: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
+                            // InternalTableDSL.g:7513:8: lv_declaredFormalParameters_2_0= ruleJvmFormalParameter
                             {
                             if ( state.backtracking==0 ) {
 
                               								newCompositeNode(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_0_0());
                               							
                             }
-                            pushFollow(FOLLOW_99);
+                            pushFollow(FOLLOW_98);
                             lv_declaredFormalParameters_2_0=ruleJvmFormalParameter();
 
                             state._fsp--;
@@ -22975,39 +21601,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalTableDSL.g:8060:6: (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
-                            loop104:
+                            // InternalTableDSL.g:7530:6: (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
+                            loop99:
                             do {
-                                int alt104=2;
-                                int LA104_0 = input.LA(1);
+                                int alt99=2;
+                                int LA99_0 = input.LA(1);
 
-                                if ( (LA104_0==104) ) {
-                                    alt104=1;
+                                if ( (LA99_0==101) ) {
+                                    alt99=1;
                                 }
 
 
-                                switch (alt104) {
+                                switch (alt99) {
                             	case 1 :
-                            	    // InternalTableDSL.g:8061:7: otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
+                            	    // InternalTableDSL.g:7531:7: otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
                             	    {
-                            	    otherlv_3=(Token)match(input,104,FOLLOW_79); if (state.failed) return current;
+                            	    otherlv_3=(Token)match(input,101,FOLLOW_78); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      							newLeafNode(otherlv_3, grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0());
                             	      						
                             	    }
-                            	    // InternalTableDSL.g:8065:7: ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
-                            	    // InternalTableDSL.g:8066:8: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
+                            	    // InternalTableDSL.g:7535:7: ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
+                            	    // InternalTableDSL.g:7536:8: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
                             	    {
-                            	    // InternalTableDSL.g:8066:8: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
-                            	    // InternalTableDSL.g:8067:9: lv_declaredFormalParameters_4_0= ruleJvmFormalParameter
+                            	    // InternalTableDSL.g:7536:8: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
+                            	    // InternalTableDSL.g:7537:9: lv_declaredFormalParameters_4_0= ruleJvmFormalParameter
                             	    {
                             	    if ( state.backtracking==0 ) {
 
                             	      									newCompositeNode(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_1_1_0());
                             	      								
                             	    }
-                            	    pushFollow(FOLLOW_99);
+                            	    pushFollow(FOLLOW_98);
                             	    lv_declaredFormalParameters_4_0=ruleJvmFormalParameter();
 
                             	    state._fsp--;
@@ -23036,7 +21662,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    break loop104;
+                            	    break loop99;
                                 }
                             } while (true);
 
@@ -23046,13 +21672,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:8086:5: ( (lv_explicitSyntax_5_0= '|' ) )
-                    // InternalTableDSL.g:8087:6: (lv_explicitSyntax_5_0= '|' )
+                    // InternalTableDSL.g:7556:5: ( (lv_explicitSyntax_5_0= '|' ) )
+                    // InternalTableDSL.g:7557:6: (lv_explicitSyntax_5_0= '|' )
                     {
-                    // InternalTableDSL.g:8087:6: (lv_explicitSyntax_5_0= '|' )
-                    // InternalTableDSL.g:8088:7: lv_explicitSyntax_5_0= '|'
+                    // InternalTableDSL.g:7557:6: (lv_explicitSyntax_5_0= '|' )
+                    // InternalTableDSL.g:7558:7: lv_explicitSyntax_5_0= '|'
                     {
-                    lv_explicitSyntax_5_0=(Token)match(input,139,FOLLOW_100); if (state.failed) return current;
+                    lv_explicitSyntax_5_0=(Token)match(input,136,FOLLOW_99); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       							newLeafNode(lv_explicitSyntax_5_0, grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0());
@@ -23081,18 +21707,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:8102:3: ( (lv_expression_6_0= ruleXExpressionInClosure ) )
-            // InternalTableDSL.g:8103:4: (lv_expression_6_0= ruleXExpressionInClosure )
+            // InternalTableDSL.g:7572:3: ( (lv_expression_6_0= ruleXExpressionInClosure ) )
+            // InternalTableDSL.g:7573:4: (lv_expression_6_0= ruleXExpressionInClosure )
             {
-            // InternalTableDSL.g:8103:4: (lv_expression_6_0= ruleXExpressionInClosure )
-            // InternalTableDSL.g:8104:5: lv_expression_6_0= ruleXExpressionInClosure
+            // InternalTableDSL.g:7573:4: (lv_expression_6_0= ruleXExpressionInClosure )
+            // InternalTableDSL.g:7574:5: lv_expression_6_0= ruleXExpressionInClosure
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXClosureAccess().getExpressionXExpressionInClosureParserRuleCall_2_0());
               				
             }
-            pushFollow(FOLLOW_101);
+            pushFollow(FOLLOW_100);
             lv_expression_6_0=ruleXExpressionInClosure();
 
             state._fsp--;
@@ -23116,7 +21742,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_7=(Token)match(input,109,FOLLOW_2); if (state.failed) return current;
+            otherlv_7=(Token)match(input,106,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_7, grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3());
@@ -23147,7 +21773,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXExpressionInClosure"
-    // InternalTableDSL.g:8129:1: entryRuleXExpressionInClosure returns [EObject current=null] : iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF ;
+    // InternalTableDSL.g:7599:1: entryRuleXExpressionInClosure returns [EObject current=null] : iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF ;
     public final EObject entryRuleXExpressionInClosure() throws RecognitionException {
         EObject current = null;
 
@@ -23155,8 +21781,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:8129:61: (iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF )
-            // InternalTableDSL.g:8130:2: iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF
+            // InternalTableDSL.g:7599:61: (iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF )
+            // InternalTableDSL.g:7600:2: iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionInClosureRule()); 
@@ -23187,7 +21813,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXExpressionInClosure"
-    // InternalTableDSL.g:8136:1: ruleXExpressionInClosure returns [EObject current=null] : ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) ;
+    // InternalTableDSL.g:7606:1: ruleXExpressionInClosure returns [EObject current=null] : ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) ;
     public final EObject ruleXExpressionInClosure() throws RecognitionException {
         EObject current = null;
 
@@ -23199,14 +21825,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:8142:2: ( ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) )
-            // InternalTableDSL.g:8143:2: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
+            // InternalTableDSL.g:7612:2: ( ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) )
+            // InternalTableDSL.g:7613:2: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
             {
-            // InternalTableDSL.g:8143:2: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
-            // InternalTableDSL.g:8144:3: () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
+            // InternalTableDSL.g:7613:2: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
+            // InternalTableDSL.g:7614:3: () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
             {
-            // InternalTableDSL.g:8144:3: ()
-            // InternalTableDSL.g:8145:4: 
+            // InternalTableDSL.g:7614:3: ()
+            // InternalTableDSL.g:7615:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -23218,33 +21844,33 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:8151:3: ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
-            loop108:
+            // InternalTableDSL.g:7621:3: ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
+            loop103:
             do {
-                int alt108=2;
-                int LA108_0 = input.LA(1);
+                int alt103=2;
+                int LA103_0 = input.LA(1);
 
-                if ( ((LA108_0>=RULE_ID && LA108_0<=RULE_STRING)||(LA108_0>=RULE_INT && LA108_0<=RULE_DECIMAL)||LA108_0==16||(LA108_0>=94 && LA108_0<=98)||LA108_0==103||(LA108_0>=107 && LA108_0<=108)||LA108_0==115||LA108_0==134||LA108_0==140||LA108_0==142||(LA108_0>=146 && LA108_0<=160)||LA108_0==162) ) {
-                    alt108=1;
+                if ( ((LA103_0>=RULE_ID && LA103_0<=RULE_STRING)||(LA103_0>=RULE_INT && LA103_0<=RULE_DECIMAL)||LA103_0==16||(LA103_0>=91 && LA103_0<=95)||LA103_0==100||(LA103_0>=104 && LA103_0<=105)||LA103_0==112||LA103_0==131||LA103_0==137||LA103_0==139||(LA103_0>=143 && LA103_0<=157)||LA103_0==159) ) {
+                    alt103=1;
                 }
 
 
-                switch (alt108) {
+                switch (alt103) {
             	case 1 :
-            	    // InternalTableDSL.g:8152:4: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )?
+            	    // InternalTableDSL.g:7622:4: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )?
             	    {
-            	    // InternalTableDSL.g:8152:4: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) )
-            	    // InternalTableDSL.g:8153:5: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalTableDSL.g:7622:4: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) )
+            	    // InternalTableDSL.g:7623:5: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
             	    {
-            	    // InternalTableDSL.g:8153:5: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
-            	    // InternalTableDSL.g:8154:6: lv_expressions_1_0= ruleXExpressionOrVarDeclaration
+            	    // InternalTableDSL.g:7623:5: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalTableDSL.g:7624:6: lv_expressions_1_0= ruleXExpressionOrVarDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXExpressionInClosureAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_1_0_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_102);
+            	    pushFollow(FOLLOW_101);
             	    lv_expressions_1_0=ruleXExpressionOrVarDeclaration();
 
             	    state._fsp--;
@@ -23268,18 +21894,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:8171:4: (otherlv_2= ';' )?
-            	    int alt107=2;
-            	    int LA107_0 = input.LA(1);
+            	    // InternalTableDSL.g:7641:4: (otherlv_2= ';' )?
+            	    int alt102=2;
+            	    int LA102_0 = input.LA(1);
 
-            	    if ( (LA107_0==101) ) {
-            	        alt107=1;
+            	    if ( (LA102_0==98) ) {
+            	        alt102=1;
             	    }
-            	    switch (alt107) {
+            	    switch (alt102) {
             	        case 1 :
-            	            // InternalTableDSL.g:8172:5: otherlv_2= ';'
+            	            // InternalTableDSL.g:7642:5: otherlv_2= ';'
             	            {
-            	            otherlv_2=(Token)match(input,101,FOLLOW_103); if (state.failed) return current;
+            	            otherlv_2=(Token)match(input,98,FOLLOW_102); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              					newLeafNode(otherlv_2, grammarAccess.getXExpressionInClosureAccess().getSemicolonKeyword_1_1());
@@ -23296,7 +21922,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop108;
+            	    break loop103;
                 }
             } while (true);
 
@@ -23325,7 +21951,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXShortClosure"
-    // InternalTableDSL.g:8182:1: entryRuleXShortClosure returns [EObject current=null] : iv_ruleXShortClosure= ruleXShortClosure EOF ;
+    // InternalTableDSL.g:7652:1: entryRuleXShortClosure returns [EObject current=null] : iv_ruleXShortClosure= ruleXShortClosure EOF ;
     public final EObject entryRuleXShortClosure() throws RecognitionException {
         EObject current = null;
 
@@ -23333,8 +21959,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:8182:54: (iv_ruleXShortClosure= ruleXShortClosure EOF )
-            // InternalTableDSL.g:8183:2: iv_ruleXShortClosure= ruleXShortClosure EOF
+            // InternalTableDSL.g:7652:54: (iv_ruleXShortClosure= ruleXShortClosure EOF )
+            // InternalTableDSL.g:7653:2: iv_ruleXShortClosure= ruleXShortClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXShortClosureRule()); 
@@ -23365,7 +21991,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXShortClosure"
-    // InternalTableDSL.g:8189:1: ruleXShortClosure returns [EObject current=null] : ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) ;
+    // InternalTableDSL.g:7659:1: ruleXShortClosure returns [EObject current=null] : ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) ;
     public final EObject ruleXShortClosure() throws RecognitionException {
         EObject current = null;
 
@@ -23382,20 +22008,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:8195:2: ( ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) )
-            // InternalTableDSL.g:8196:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalTableDSL.g:7665:2: ( ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) )
+            // InternalTableDSL.g:7666:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
             {
-            // InternalTableDSL.g:8196:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
-            // InternalTableDSL.g:8197:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalTableDSL.g:7666:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalTableDSL.g:7667:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) )
             {
-            // InternalTableDSL.g:8197:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) )
-            // InternalTableDSL.g:8198:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
+            // InternalTableDSL.g:7667:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) )
+            // InternalTableDSL.g:7668:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
             {
-            // InternalTableDSL.g:8223:4: ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
-            // InternalTableDSL.g:8224:5: () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) )
+            // InternalTableDSL.g:7693:4: ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
+            // InternalTableDSL.g:7694:5: () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) )
             {
-            // InternalTableDSL.g:8224:5: ()
-            // InternalTableDSL.g:8225:6: 
+            // InternalTableDSL.g:7694:5: ()
+            // InternalTableDSL.g:7695:6: 
             {
             if ( state.backtracking==0 ) {
 
@@ -23407,29 +22033,29 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:8231:5: ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )?
-            int alt110=2;
-            int LA110_0 = input.LA(1);
+            // InternalTableDSL.g:7701:5: ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )?
+            int alt105=2;
+            int LA105_0 = input.LA(1);
 
-            if ( (LA110_0==RULE_ID||LA110_0==103||LA110_0==128) ) {
-                alt110=1;
+            if ( (LA105_0==RULE_ID||LA105_0==100||LA105_0==125) ) {
+                alt105=1;
             }
-            switch (alt110) {
+            switch (alt105) {
                 case 1 :
-                    // InternalTableDSL.g:8232:6: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
+                    // InternalTableDSL.g:7702:6: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
                     {
-                    // InternalTableDSL.g:8232:6: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) )
-                    // InternalTableDSL.g:8233:7: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
+                    // InternalTableDSL.g:7702:6: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) )
+                    // InternalTableDSL.g:7703:7: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
                     {
-                    // InternalTableDSL.g:8233:7: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
-                    // InternalTableDSL.g:8234:8: lv_declaredFormalParameters_1_0= ruleJvmFormalParameter
+                    // InternalTableDSL.g:7703:7: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
+                    // InternalTableDSL.g:7704:8: lv_declaredFormalParameters_1_0= ruleJvmFormalParameter
                     {
                     if ( state.backtracking==0 ) {
 
                       								newCompositeNode(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_0_0());
                       							
                     }
-                    pushFollow(FOLLOW_99);
+                    pushFollow(FOLLOW_98);
                     lv_declaredFormalParameters_1_0=ruleJvmFormalParameter();
 
                     state._fsp--;
@@ -23453,39 +22079,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:8251:6: (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
-                    loop109:
+                    // InternalTableDSL.g:7721:6: (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
+                    loop104:
                     do {
-                        int alt109=2;
-                        int LA109_0 = input.LA(1);
+                        int alt104=2;
+                        int LA104_0 = input.LA(1);
 
-                        if ( (LA109_0==104) ) {
-                            alt109=1;
+                        if ( (LA104_0==101) ) {
+                            alt104=1;
                         }
 
 
-                        switch (alt109) {
+                        switch (alt104) {
                     	case 1 :
-                    	    // InternalTableDSL.g:8252:7: otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
+                    	    // InternalTableDSL.g:7722:7: otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
                     	    {
-                    	    otherlv_2=(Token)match(input,104,FOLLOW_79); if (state.failed) return current;
+                    	    otherlv_2=(Token)match(input,101,FOLLOW_78); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      							newLeafNode(otherlv_2, grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0());
                     	      						
                     	    }
-                    	    // InternalTableDSL.g:8256:7: ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
-                    	    // InternalTableDSL.g:8257:8: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
+                    	    // InternalTableDSL.g:7726:7: ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
+                    	    // InternalTableDSL.g:7727:8: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
                     	    {
-                    	    // InternalTableDSL.g:8257:8: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
-                    	    // InternalTableDSL.g:8258:9: lv_declaredFormalParameters_3_0= ruleJvmFormalParameter
+                    	    // InternalTableDSL.g:7727:8: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
+                    	    // InternalTableDSL.g:7728:9: lv_declaredFormalParameters_3_0= ruleJvmFormalParameter
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      									newCompositeNode(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_1_1_0());
                     	      								
                     	    }
-                    	    pushFollow(FOLLOW_99);
+                    	    pushFollow(FOLLOW_98);
                     	    lv_declaredFormalParameters_3_0=ruleJvmFormalParameter();
 
                     	    state._fsp--;
@@ -23514,7 +22140,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop109;
+                    	    break loop104;
                         }
                     } while (true);
 
@@ -23524,13 +22150,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:8277:5: ( (lv_explicitSyntax_4_0= '|' ) )
-            // InternalTableDSL.g:8278:6: (lv_explicitSyntax_4_0= '|' )
+            // InternalTableDSL.g:7747:5: ( (lv_explicitSyntax_4_0= '|' ) )
+            // InternalTableDSL.g:7748:6: (lv_explicitSyntax_4_0= '|' )
             {
-            // InternalTableDSL.g:8278:6: (lv_explicitSyntax_4_0= '|' )
-            // InternalTableDSL.g:8279:7: lv_explicitSyntax_4_0= '|'
+            // InternalTableDSL.g:7748:6: (lv_explicitSyntax_4_0= '|' )
+            // InternalTableDSL.g:7749:7: lv_explicitSyntax_4_0= '|'
             {
-            lv_explicitSyntax_4_0=(Token)match(input,139,FOLLOW_66); if (state.failed) return current;
+            lv_explicitSyntax_4_0=(Token)match(input,136,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               							newLeafNode(lv_explicitSyntax_4_0, grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0());
@@ -23556,11 +22182,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:8293:3: ( (lv_expression_5_0= ruleXExpression ) )
-            // InternalTableDSL.g:8294:4: (lv_expression_5_0= ruleXExpression )
+            // InternalTableDSL.g:7763:3: ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalTableDSL.g:7764:4: (lv_expression_5_0= ruleXExpression )
             {
-            // InternalTableDSL.g:8294:4: (lv_expression_5_0= ruleXExpression )
-            // InternalTableDSL.g:8295:5: lv_expression_5_0= ruleXExpression
+            // InternalTableDSL.g:7764:4: (lv_expression_5_0= ruleXExpression )
+            // InternalTableDSL.g:7765:5: lv_expression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -23616,7 +22242,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXParenthesizedExpression"
-    // InternalTableDSL.g:8316:1: entryRuleXParenthesizedExpression returns [EObject current=null] : iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF ;
+    // InternalTableDSL.g:7786:1: entryRuleXParenthesizedExpression returns [EObject current=null] : iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF ;
     public final EObject entryRuleXParenthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -23624,8 +22250,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:8316:65: (iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF )
-            // InternalTableDSL.g:8317:2: iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF
+            // InternalTableDSL.g:7786:65: (iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF )
+            // InternalTableDSL.g:7787:2: iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXParenthesizedExpressionRule()); 
@@ -23656,7 +22282,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXParenthesizedExpression"
-    // InternalTableDSL.g:8323:1: ruleXParenthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) ;
+    // InternalTableDSL.g:7793:1: ruleXParenthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) ;
     public final EObject ruleXParenthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -23669,13 +22295,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:8329:2: ( (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) )
-            // InternalTableDSL.g:8330:2: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
+            // InternalTableDSL.g:7799:2: ( (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) )
+            // InternalTableDSL.g:7800:2: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
             {
-            // InternalTableDSL.g:8330:2: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
-            // InternalTableDSL.g:8331:3: otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')'
+            // InternalTableDSL.g:7800:2: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
+            // InternalTableDSL.g:7801:3: otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')'
             {
-            otherlv_0=(Token)match(input,103,FOLLOW_66); if (state.failed) return current;
+            otherlv_0=(Token)match(input,100,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0());
@@ -23686,7 +22312,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			newCompositeNode(grammarAccess.getXParenthesizedExpressionAccess().getXExpressionParserRuleCall_1());
               		
             }
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_63);
             this_XExpression_1=ruleXExpression();
 
             state._fsp--;
@@ -23697,7 +22323,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            otherlv_2=(Token)match(input,105,FOLLOW_2); if (state.failed) return current;
+            otherlv_2=(Token)match(input,102,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2());
@@ -23728,7 +22354,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXIfExpression"
-    // InternalTableDSL.g:8351:1: entryRuleXIfExpression returns [EObject current=null] : iv_ruleXIfExpression= ruleXIfExpression EOF ;
+    // InternalTableDSL.g:7821:1: entryRuleXIfExpression returns [EObject current=null] : iv_ruleXIfExpression= ruleXIfExpression EOF ;
     public final EObject entryRuleXIfExpression() throws RecognitionException {
         EObject current = null;
 
@@ -23736,8 +22362,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:8351:54: (iv_ruleXIfExpression= ruleXIfExpression EOF )
-            // InternalTableDSL.g:8352:2: iv_ruleXIfExpression= ruleXIfExpression EOF
+            // InternalTableDSL.g:7821:54: (iv_ruleXIfExpression= ruleXIfExpression EOF )
+            // InternalTableDSL.g:7822:2: iv_ruleXIfExpression= ruleXIfExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXIfExpressionRule()); 
@@ -23768,7 +22394,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXIfExpression"
-    // InternalTableDSL.g:8358:1: ruleXIfExpression returns [EObject current=null] : ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) ;
+    // InternalTableDSL.g:7828:1: ruleXIfExpression returns [EObject current=null] : ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) ;
     public final EObject ruleXIfExpression() throws RecognitionException {
         EObject current = null;
 
@@ -23787,14 +22413,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:8364:2: ( ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) )
-            // InternalTableDSL.g:8365:2: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
+            // InternalTableDSL.g:7834:2: ( ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) )
+            // InternalTableDSL.g:7835:2: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
             {
-            // InternalTableDSL.g:8365:2: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
-            // InternalTableDSL.g:8366:3: () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
+            // InternalTableDSL.g:7835:2: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
+            // InternalTableDSL.g:7836:3: () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
             {
-            // InternalTableDSL.g:8366:3: ()
-            // InternalTableDSL.g:8367:4: 
+            // InternalTableDSL.g:7836:3: ()
+            // InternalTableDSL.g:7837:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -23806,30 +22432,30 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,140,FOLLOW_104); if (state.failed) return current;
+            otherlv_1=(Token)match(input,137,FOLLOW_103); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXIfExpressionAccess().getIfKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,103,FOLLOW_66); if (state.failed) return current;
+            otherlv_2=(Token)match(input,100,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2());
               		
             }
-            // InternalTableDSL.g:8381:3: ( (lv_if_3_0= ruleXExpression ) )
-            // InternalTableDSL.g:8382:4: (lv_if_3_0= ruleXExpression )
+            // InternalTableDSL.g:7851:3: ( (lv_if_3_0= ruleXExpression ) )
+            // InternalTableDSL.g:7852:4: (lv_if_3_0= ruleXExpression )
             {
-            // InternalTableDSL.g:8382:4: (lv_if_3_0= ruleXExpression )
-            // InternalTableDSL.g:8383:5: lv_if_3_0= ruleXExpression
+            // InternalTableDSL.g:7852:4: (lv_if_3_0= ruleXExpression )
+            // InternalTableDSL.g:7853:5: lv_if_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXIfExpressionAccess().getIfXExpressionParserRuleCall_3_0());
               				
             }
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_63);
             lv_if_3_0=ruleXExpression();
 
             state._fsp--;
@@ -23853,24 +22479,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,105,FOLLOW_66); if (state.failed) return current;
+            otherlv_4=(Token)match(input,102,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_4, grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4());
               		
             }
-            // InternalTableDSL.g:8404:3: ( (lv_then_5_0= ruleXExpression ) )
-            // InternalTableDSL.g:8405:4: (lv_then_5_0= ruleXExpression )
+            // InternalTableDSL.g:7874:3: ( (lv_then_5_0= ruleXExpression ) )
+            // InternalTableDSL.g:7875:4: (lv_then_5_0= ruleXExpression )
             {
-            // InternalTableDSL.g:8405:4: (lv_then_5_0= ruleXExpression )
-            // InternalTableDSL.g:8406:5: lv_then_5_0= ruleXExpression
+            // InternalTableDSL.g:7875:4: (lv_then_5_0= ruleXExpression )
+            // InternalTableDSL.g:7876:5: lv_then_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXIfExpressionAccess().getThenXExpressionParserRuleCall_5_0());
               				
             }
-            pushFollow(FOLLOW_105);
+            pushFollow(FOLLOW_104);
             lv_then_5_0=ruleXExpression();
 
             state._fsp--;
@@ -23894,25 +22520,25 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:8423:3: ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
-            int alt111=2;
-            int LA111_0 = input.LA(1);
+            // InternalTableDSL.g:7893:3: ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
+            int alt106=2;
+            int LA106_0 = input.LA(1);
 
-            if ( (LA111_0==141) ) {
-                int LA111_1 = input.LA(2);
+            if ( (LA106_0==138) ) {
+                int LA106_1 = input.LA(2);
 
                 if ( (synpred31_InternalTableDSL()) ) {
-                    alt111=1;
+                    alt106=1;
                 }
             }
-            switch (alt111) {
+            switch (alt106) {
                 case 1 :
-                    // InternalTableDSL.g:8424:4: ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) )
+                    // InternalTableDSL.g:7894:4: ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) )
                     {
-                    // InternalTableDSL.g:8424:4: ( ( 'else' )=>otherlv_6= 'else' )
-                    // InternalTableDSL.g:8425:5: ( 'else' )=>otherlv_6= 'else'
+                    // InternalTableDSL.g:7894:4: ( ( 'else' )=>otherlv_6= 'else' )
+                    // InternalTableDSL.g:7895:5: ( 'else' )=>otherlv_6= 'else'
                     {
-                    otherlv_6=(Token)match(input,141,FOLLOW_66); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,138,FOLLOW_65); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(otherlv_6, grammarAccess.getXIfExpressionAccess().getElseKeyword_6_0());
@@ -23921,11 +22547,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:8431:4: ( (lv_else_7_0= ruleXExpression ) )
-                    // InternalTableDSL.g:8432:5: (lv_else_7_0= ruleXExpression )
+                    // InternalTableDSL.g:7901:4: ( (lv_else_7_0= ruleXExpression ) )
+                    // InternalTableDSL.g:7902:5: (lv_else_7_0= ruleXExpression )
                     {
-                    // InternalTableDSL.g:8432:5: (lv_else_7_0= ruleXExpression )
-                    // InternalTableDSL.g:8433:6: lv_else_7_0= ruleXExpression
+                    // InternalTableDSL.g:7902:5: (lv_else_7_0= ruleXExpression )
+                    // InternalTableDSL.g:7903:6: lv_else_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -23987,7 +22613,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXSwitchExpression"
-    // InternalTableDSL.g:8455:1: entryRuleXSwitchExpression returns [EObject current=null] : iv_ruleXSwitchExpression= ruleXSwitchExpression EOF ;
+    // InternalTableDSL.g:7925:1: entryRuleXSwitchExpression returns [EObject current=null] : iv_ruleXSwitchExpression= ruleXSwitchExpression EOF ;
     public final EObject entryRuleXSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -23995,8 +22621,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:8455:58: (iv_ruleXSwitchExpression= ruleXSwitchExpression EOF )
-            // InternalTableDSL.g:8456:2: iv_ruleXSwitchExpression= ruleXSwitchExpression EOF
+            // InternalTableDSL.g:7925:58: (iv_ruleXSwitchExpression= ruleXSwitchExpression EOF )
+            // InternalTableDSL.g:7926:2: iv_ruleXSwitchExpression= ruleXSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSwitchExpressionRule()); 
@@ -24027,7 +22653,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXSwitchExpression"
-    // InternalTableDSL.g:8462:1: ruleXSwitchExpression returns [EObject current=null] : ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) ;
+    // InternalTableDSL.g:7932:1: ruleXSwitchExpression returns [EObject current=null] : ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) ;
     public final EObject ruleXSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -24057,14 +22683,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:8468:2: ( ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) )
-            // InternalTableDSL.g:8469:2: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
+            // InternalTableDSL.g:7938:2: ( ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) )
+            // InternalTableDSL.g:7939:2: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
             {
-            // InternalTableDSL.g:8469:2: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
-            // InternalTableDSL.g:8470:3: () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}'
+            // InternalTableDSL.g:7939:2: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
+            // InternalTableDSL.g:7940:3: () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}'
             {
-            // InternalTableDSL.g:8470:3: ()
-            // InternalTableDSL.g:8471:4: 
+            // InternalTableDSL.g:7940:3: ()
+            // InternalTableDSL.g:7941:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -24076,46 +22702,46 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,142,FOLLOW_106); if (state.failed) return current;
+            otherlv_1=(Token)match(input,139,FOLLOW_105); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1());
               		
             }
-            // InternalTableDSL.g:8481:3: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )
-            int alt113=2;
-            alt113 = dfa113.predict(input);
-            switch (alt113) {
+            // InternalTableDSL.g:7951:3: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )
+            int alt108=2;
+            alt108 = dfa108.predict(input);
+            switch (alt108) {
                 case 1 :
-                    // InternalTableDSL.g:8482:4: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
+                    // InternalTableDSL.g:7952:4: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
                     {
-                    // InternalTableDSL.g:8482:4: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
-                    // InternalTableDSL.g:8483:5: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')'
+                    // InternalTableDSL.g:7952:4: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
+                    // InternalTableDSL.g:7953:5: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')'
                     {
-                    // InternalTableDSL.g:8483:5: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
-                    // InternalTableDSL.g:8484:6: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+                    // InternalTableDSL.g:7953:5: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
+                    // InternalTableDSL.g:7954:6: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
                     {
-                    // InternalTableDSL.g:8494:6: (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
-                    // InternalTableDSL.g:8495:7: otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
+                    // InternalTableDSL.g:7964:6: (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+                    // InternalTableDSL.g:7965:7: otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
                     {
-                    otherlv_2=(Token)match(input,103,FOLLOW_79); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,100,FOLLOW_78); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       							newLeafNode(otherlv_2, grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0());
                       						
                     }
-                    // InternalTableDSL.g:8499:7: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
-                    // InternalTableDSL.g:8500:8: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+                    // InternalTableDSL.g:7969:7: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
+                    // InternalTableDSL.g:7970:8: (lv_declaredParam_3_0= ruleJvmFormalParameter )
                     {
-                    // InternalTableDSL.g:8500:8: (lv_declaredParam_3_0= ruleJvmFormalParameter )
-                    // InternalTableDSL.g:8501:9: lv_declaredParam_3_0= ruleJvmFormalParameter
+                    // InternalTableDSL.g:7970:8: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+                    // InternalTableDSL.g:7971:9: lv_declaredParam_3_0= ruleJvmFormalParameter
                     {
                     if ( state.backtracking==0 ) {
 
                       									newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_0_0_0_1_0());
                       								
                     }
-                    pushFollow(FOLLOW_107);
+                    pushFollow(FOLLOW_106);
                     lv_declaredParam_3_0=ruleJvmFormalParameter();
 
                     state._fsp--;
@@ -24139,7 +22765,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_4=(Token)match(input,143,FOLLOW_66); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,140,FOLLOW_65); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       							newLeafNode(otherlv_4, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2());
@@ -24151,18 +22777,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:8524:5: ( (lv_switch_5_0= ruleXExpression ) )
-                    // InternalTableDSL.g:8525:6: (lv_switch_5_0= ruleXExpression )
+                    // InternalTableDSL.g:7994:5: ( (lv_switch_5_0= ruleXExpression ) )
+                    // InternalTableDSL.g:7995:6: (lv_switch_5_0= ruleXExpression )
                     {
-                    // InternalTableDSL.g:8525:6: (lv_switch_5_0= ruleXExpression )
-                    // InternalTableDSL.g:8526:7: lv_switch_5_0= ruleXExpression
+                    // InternalTableDSL.g:7995:6: (lv_switch_5_0= ruleXExpression )
+                    // InternalTableDSL.g:7996:7: lv_switch_5_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
                       							newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_0_1_0());
                       						
                     }
-                    pushFollow(FOLLOW_64);
+                    pushFollow(FOLLOW_63);
                     lv_switch_5_0=ruleXExpression();
 
                     state._fsp--;
@@ -24186,7 +22812,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_6=(Token)match(input,105,FOLLOW_22); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,102,FOLLOW_21); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(otherlv_6, grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2());
@@ -24199,33 +22825,33 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:8549:4: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
+                    // InternalTableDSL.g:8019:4: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
                     {
-                    // InternalTableDSL.g:8549:4: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
-                    // InternalTableDSL.g:8550:5: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) )
+                    // InternalTableDSL.g:8019:4: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
+                    // InternalTableDSL.g:8020:5: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) )
                     {
-                    // InternalTableDSL.g:8550:5: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?
-                    int alt112=2;
-                    alt112 = dfa112.predict(input);
-                    switch (alt112) {
+                    // InternalTableDSL.g:8020:5: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?
+                    int alt107=2;
+                    alt107 = dfa107.predict(input);
+                    switch (alt107) {
                         case 1 :
-                            // InternalTableDSL.g:8551:6: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
+                            // InternalTableDSL.g:8021:6: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
                             {
-                            // InternalTableDSL.g:8560:6: ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
-                            // InternalTableDSL.g:8561:7: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':'
+                            // InternalTableDSL.g:8030:6: ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
+                            // InternalTableDSL.g:8031:7: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':'
                             {
-                            // InternalTableDSL.g:8561:7: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) )
-                            // InternalTableDSL.g:8562:8: (lv_declaredParam_7_0= ruleJvmFormalParameter )
+                            // InternalTableDSL.g:8031:7: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) )
+                            // InternalTableDSL.g:8032:8: (lv_declaredParam_7_0= ruleJvmFormalParameter )
                             {
-                            // InternalTableDSL.g:8562:8: (lv_declaredParam_7_0= ruleJvmFormalParameter )
-                            // InternalTableDSL.g:8563:9: lv_declaredParam_7_0= ruleJvmFormalParameter
+                            // InternalTableDSL.g:8032:8: (lv_declaredParam_7_0= ruleJvmFormalParameter )
+                            // InternalTableDSL.g:8033:9: lv_declaredParam_7_0= ruleJvmFormalParameter
                             {
                             if ( state.backtracking==0 ) {
 
                               									newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_1_0_0_0_0());
                               								
                             }
-                            pushFollow(FOLLOW_107);
+                            pushFollow(FOLLOW_106);
                             lv_declaredParam_7_0=ruleJvmFormalParameter();
 
                             state._fsp--;
@@ -24249,7 +22875,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            otherlv_8=(Token)match(input,143,FOLLOW_66); if (state.failed) return current;
+                            otherlv_8=(Token)match(input,140,FOLLOW_65); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               							newLeafNode(otherlv_8, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1());
@@ -24264,18 +22890,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:8586:5: ( (lv_switch_9_0= ruleXExpression ) )
-                    // InternalTableDSL.g:8587:6: (lv_switch_9_0= ruleXExpression )
+                    // InternalTableDSL.g:8056:5: ( (lv_switch_9_0= ruleXExpression ) )
+                    // InternalTableDSL.g:8057:6: (lv_switch_9_0= ruleXExpression )
                     {
-                    // InternalTableDSL.g:8587:6: (lv_switch_9_0= ruleXExpression )
-                    // InternalTableDSL.g:8588:7: lv_switch_9_0= ruleXExpression
+                    // InternalTableDSL.g:8057:6: (lv_switch_9_0= ruleXExpression )
+                    // InternalTableDSL.g:8058:7: lv_switch_9_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
                       							newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_1_1_0());
                       						
                     }
-                    pushFollow(FOLLOW_22);
+                    pushFollow(FOLLOW_21);
                     lv_switch_9_0=ruleXExpression();
 
                     state._fsp--;
@@ -24308,36 +22934,36 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_10=(Token)match(input,16,FOLLOW_108); if (state.failed) return current;
+            otherlv_10=(Token)match(input,16,FOLLOW_107); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_10, grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3());
               		
             }
-            // InternalTableDSL.g:8611:3: ( (lv_cases_11_0= ruleXCasePart ) )*
-            loop114:
+            // InternalTableDSL.g:8081:3: ( (lv_cases_11_0= ruleXCasePart ) )*
+            loop109:
             do {
-                int alt114=2;
-                int LA114_0 = input.LA(1);
+                int alt109=2;
+                int LA109_0 = input.LA(1);
 
-                if ( (LA114_0==RULE_ID||(LA114_0>=103 && LA114_0<=104)||LA114_0==128||LA114_0==143||LA114_0==145) ) {
-                    alt114=1;
+                if ( (LA109_0==RULE_ID||(LA109_0>=100 && LA109_0<=101)||LA109_0==125||LA109_0==140||LA109_0==142) ) {
+                    alt109=1;
                 }
 
 
-                switch (alt114) {
+                switch (alt109) {
             	case 1 :
-            	    // InternalTableDSL.g:8612:4: (lv_cases_11_0= ruleXCasePart )
+            	    // InternalTableDSL.g:8082:4: (lv_cases_11_0= ruleXCasePart )
             	    {
-            	    // InternalTableDSL.g:8612:4: (lv_cases_11_0= ruleXCasePart )
-            	    // InternalTableDSL.g:8613:5: lv_cases_11_0= ruleXCasePart
+            	    // InternalTableDSL.g:8082:4: (lv_cases_11_0= ruleXCasePart )
+            	    // InternalTableDSL.g:8083:5: lv_cases_11_0= ruleXCasePart
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      					newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getCasesXCasePartParserRuleCall_4_0());
             	      				
             	    }
-            	    pushFollow(FOLLOW_108);
+            	    pushFollow(FOLLOW_107);
             	    lv_cases_11_0=ruleXCasePart();
 
             	    state._fsp--;
@@ -24363,45 +22989,45 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop114;
+            	    break loop109;
                 }
             } while (true);
 
-            // InternalTableDSL.g:8630:3: (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )?
-            int alt115=2;
-            int LA115_0 = input.LA(1);
+            // InternalTableDSL.g:8100:3: (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )?
+            int alt110=2;
+            int LA110_0 = input.LA(1);
 
-            if ( (LA115_0==144) ) {
-                alt115=1;
+            if ( (LA110_0==141) ) {
+                alt110=1;
             }
-            switch (alt115) {
+            switch (alt110) {
                 case 1 :
-                    // InternalTableDSL.g:8631:4: otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) )
+                    // InternalTableDSL.g:8101:4: otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) )
                     {
-                    otherlv_12=(Token)match(input,144,FOLLOW_107); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,141,FOLLOW_106); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_12, grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0());
                       			
                     }
-                    otherlv_13=(Token)match(input,143,FOLLOW_66); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,140,FOLLOW_65); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_13, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1());
                       			
                     }
-                    // InternalTableDSL.g:8639:4: ( (lv_default_14_0= ruleXExpression ) )
-                    // InternalTableDSL.g:8640:5: (lv_default_14_0= ruleXExpression )
+                    // InternalTableDSL.g:8109:4: ( (lv_default_14_0= ruleXExpression ) )
+                    // InternalTableDSL.g:8110:5: (lv_default_14_0= ruleXExpression )
                     {
-                    // InternalTableDSL.g:8640:5: (lv_default_14_0= ruleXExpression )
-                    // InternalTableDSL.g:8641:6: lv_default_14_0= ruleXExpression
+                    // InternalTableDSL.g:8110:5: (lv_default_14_0= ruleXExpression )
+                    // InternalTableDSL.g:8111:6: lv_default_14_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getDefaultXExpressionParserRuleCall_5_2_0());
                       					
                     }
-                    pushFollow(FOLLOW_109);
+                    pushFollow(FOLLOW_108);
                     lv_default_14_0=ruleXExpression();
 
                     state._fsp--;
@@ -24462,7 +23088,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXCasePart"
-    // InternalTableDSL.g:8667:1: entryRuleXCasePart returns [EObject current=null] : iv_ruleXCasePart= ruleXCasePart EOF ;
+    // InternalTableDSL.g:8137:1: entryRuleXCasePart returns [EObject current=null] : iv_ruleXCasePart= ruleXCasePart EOF ;
     public final EObject entryRuleXCasePart() throws RecognitionException {
         EObject current = null;
 
@@ -24470,8 +23096,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:8667:50: (iv_ruleXCasePart= ruleXCasePart EOF )
-            // InternalTableDSL.g:8668:2: iv_ruleXCasePart= ruleXCasePart EOF
+            // InternalTableDSL.g:8137:50: (iv_ruleXCasePart= ruleXCasePart EOF )
+            // InternalTableDSL.g:8138:2: iv_ruleXCasePart= ruleXCasePart EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCasePartRule()); 
@@ -24502,7 +23128,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXCasePart"
-    // InternalTableDSL.g:8674:1: ruleXCasePart returns [EObject current=null] : ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) ;
+    // InternalTableDSL.g:8144:1: ruleXCasePart returns [EObject current=null] : ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) ;
     public final EObject ruleXCasePart() throws RecognitionException {
         EObject current = null;
 
@@ -24520,14 +23146,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:8680:2: ( ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) )
-            // InternalTableDSL.g:8681:2: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
+            // InternalTableDSL.g:8150:2: ( ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) )
+            // InternalTableDSL.g:8151:2: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
             {
-            // InternalTableDSL.g:8681:2: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
-            // InternalTableDSL.g:8682:3: () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
+            // InternalTableDSL.g:8151:2: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
+            // InternalTableDSL.g:8152:3: () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
             {
-            // InternalTableDSL.g:8682:3: ()
-            // InternalTableDSL.g:8683:4: 
+            // InternalTableDSL.g:8152:3: ()
+            // InternalTableDSL.g:8153:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -24539,26 +23165,26 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:8689:3: ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )?
-            int alt116=2;
-            int LA116_0 = input.LA(1);
+            // InternalTableDSL.g:8159:3: ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )?
+            int alt111=2;
+            int LA111_0 = input.LA(1);
 
-            if ( (LA116_0==RULE_ID||LA116_0==103||LA116_0==128) ) {
-                alt116=1;
+            if ( (LA111_0==RULE_ID||LA111_0==100||LA111_0==125) ) {
+                alt111=1;
             }
-            switch (alt116) {
+            switch (alt111) {
                 case 1 :
-                    // InternalTableDSL.g:8690:4: (lv_typeGuard_1_0= ruleJvmTypeReference )
+                    // InternalTableDSL.g:8160:4: (lv_typeGuard_1_0= ruleJvmTypeReference )
                     {
-                    // InternalTableDSL.g:8690:4: (lv_typeGuard_1_0= ruleJvmTypeReference )
-                    // InternalTableDSL.g:8691:5: lv_typeGuard_1_0= ruleJvmTypeReference
+                    // InternalTableDSL.g:8160:4: (lv_typeGuard_1_0= ruleJvmTypeReference )
+                    // InternalTableDSL.g:8161:5: lv_typeGuard_1_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
                       					newCompositeNode(grammarAccess.getXCasePartAccess().getTypeGuardJvmTypeReferenceParserRuleCall_1_0());
                       				
                     }
-                    pushFollow(FOLLOW_110);
+                    pushFollow(FOLLOW_109);
                     lv_typeGuard_1_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -24585,35 +23211,35 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:8708:3: (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )?
-            int alt117=2;
-            int LA117_0 = input.LA(1);
+            // InternalTableDSL.g:8178:3: (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )?
+            int alt112=2;
+            int LA112_0 = input.LA(1);
 
-            if ( (LA117_0==145) ) {
-                alt117=1;
+            if ( (LA112_0==142) ) {
+                alt112=1;
             }
-            switch (alt117) {
+            switch (alt112) {
                 case 1 :
-                    // InternalTableDSL.g:8709:4: otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) )
+                    // InternalTableDSL.g:8179:4: otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) )
                     {
-                    otherlv_2=(Token)match(input,145,FOLLOW_66); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,142,FOLLOW_65); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_2, grammarAccess.getXCasePartAccess().getCaseKeyword_2_0());
                       			
                     }
-                    // InternalTableDSL.g:8713:4: ( (lv_case_3_0= ruleXExpression ) )
-                    // InternalTableDSL.g:8714:5: (lv_case_3_0= ruleXExpression )
+                    // InternalTableDSL.g:8183:4: ( (lv_case_3_0= ruleXExpression ) )
+                    // InternalTableDSL.g:8184:5: (lv_case_3_0= ruleXExpression )
                     {
-                    // InternalTableDSL.g:8714:5: (lv_case_3_0= ruleXExpression )
-                    // InternalTableDSL.g:8715:6: lv_case_3_0= ruleXExpression
+                    // InternalTableDSL.g:8184:5: (lv_case_3_0= ruleXExpression )
+                    // InternalTableDSL.g:8185:6: lv_case_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getXCasePartAccess().getCaseXExpressionParserRuleCall_2_1_0());
                       					
                     }
-                    pushFollow(FOLLOW_111);
+                    pushFollow(FOLLOW_110);
                     lv_case_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -24643,41 +23269,41 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:8733:3: ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
-            int alt118=2;
-            int LA118_0 = input.LA(1);
+            // InternalTableDSL.g:8203:3: ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
+            int alt113=2;
+            int LA113_0 = input.LA(1);
 
-            if ( (LA118_0==143) ) {
-                alt118=1;
+            if ( (LA113_0==140) ) {
+                alt113=1;
             }
-            else if ( (LA118_0==104) ) {
-                alt118=2;
+            else if ( (LA113_0==101) ) {
+                alt113=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 118, 0, input);
+                    new NoViableAltException("", 113, 0, input);
 
                 throw nvae;
             }
-            switch (alt118) {
+            switch (alt113) {
                 case 1 :
-                    // InternalTableDSL.g:8734:4: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
+                    // InternalTableDSL.g:8204:4: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
                     {
-                    // InternalTableDSL.g:8734:4: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
-                    // InternalTableDSL.g:8735:5: otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) )
+                    // InternalTableDSL.g:8204:4: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
+                    // InternalTableDSL.g:8205:5: otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) )
                     {
-                    otherlv_4=(Token)match(input,143,FOLLOW_66); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,140,FOLLOW_65); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(otherlv_4, grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0());
                       				
                     }
-                    // InternalTableDSL.g:8739:5: ( (lv_then_5_0= ruleXExpression ) )
-                    // InternalTableDSL.g:8740:6: (lv_then_5_0= ruleXExpression )
+                    // InternalTableDSL.g:8209:5: ( (lv_then_5_0= ruleXExpression ) )
+                    // InternalTableDSL.g:8210:6: (lv_then_5_0= ruleXExpression )
                     {
-                    // InternalTableDSL.g:8740:6: (lv_then_5_0= ruleXExpression )
-                    // InternalTableDSL.g:8741:7: lv_then_5_0= ruleXExpression
+                    // InternalTableDSL.g:8210:6: (lv_then_5_0= ruleXExpression )
+                    // InternalTableDSL.g:8211:7: lv_then_5_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -24715,15 +23341,15 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:8760:4: ( (lv_fallThrough_6_0= ',' ) )
+                    // InternalTableDSL.g:8230:4: ( (lv_fallThrough_6_0= ',' ) )
                     {
-                    // InternalTableDSL.g:8760:4: ( (lv_fallThrough_6_0= ',' ) )
-                    // InternalTableDSL.g:8761:5: (lv_fallThrough_6_0= ',' )
+                    // InternalTableDSL.g:8230:4: ( (lv_fallThrough_6_0= ',' ) )
+                    // InternalTableDSL.g:8231:5: (lv_fallThrough_6_0= ',' )
                     {
-                    // InternalTableDSL.g:8761:5: (lv_fallThrough_6_0= ',' )
-                    // InternalTableDSL.g:8762:6: lv_fallThrough_6_0= ','
+                    // InternalTableDSL.g:8231:5: (lv_fallThrough_6_0= ',' )
+                    // InternalTableDSL.g:8232:6: lv_fallThrough_6_0= ','
                     {
-                    lv_fallThrough_6_0=(Token)match(input,104,FOLLOW_2); if (state.failed) return current;
+                    lv_fallThrough_6_0=(Token)match(input,101,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(lv_fallThrough_6_0, grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0());
@@ -24774,7 +23400,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXForLoopExpression"
-    // InternalTableDSL.g:8779:1: entryRuleXForLoopExpression returns [EObject current=null] : iv_ruleXForLoopExpression= ruleXForLoopExpression EOF ;
+    // InternalTableDSL.g:8249:1: entryRuleXForLoopExpression returns [EObject current=null] : iv_ruleXForLoopExpression= ruleXForLoopExpression EOF ;
     public final EObject entryRuleXForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -24782,8 +23408,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:8779:59: (iv_ruleXForLoopExpression= ruleXForLoopExpression EOF )
-            // InternalTableDSL.g:8780:2: iv_ruleXForLoopExpression= ruleXForLoopExpression EOF
+            // InternalTableDSL.g:8249:59: (iv_ruleXForLoopExpression= ruleXForLoopExpression EOF )
+            // InternalTableDSL.g:8250:2: iv_ruleXForLoopExpression= ruleXForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXForLoopExpressionRule()); 
@@ -24814,7 +23440,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXForLoopExpression"
-    // InternalTableDSL.g:8786:1: ruleXForLoopExpression returns [EObject current=null] : ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) ;
+    // InternalTableDSL.g:8256:1: ruleXForLoopExpression returns [EObject current=null] : ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) ;
     public final EObject ruleXForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -24833,20 +23459,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:8792:2: ( ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) )
-            // InternalTableDSL.g:8793:2: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
+            // InternalTableDSL.g:8262:2: ( ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) )
+            // InternalTableDSL.g:8263:2: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
             {
-            // InternalTableDSL.g:8793:2: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
-            // InternalTableDSL.g:8794:3: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) )
+            // InternalTableDSL.g:8263:2: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
+            // InternalTableDSL.g:8264:3: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) )
             {
-            // InternalTableDSL.g:8794:3: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
-            // InternalTableDSL.g:8795:4: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+            // InternalTableDSL.g:8264:3: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
+            // InternalTableDSL.g:8265:4: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
             {
-            // InternalTableDSL.g:8808:4: ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
-            // InternalTableDSL.g:8809:5: () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
+            // InternalTableDSL.g:8278:4: ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+            // InternalTableDSL.g:8279:5: () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
             {
-            // InternalTableDSL.g:8809:5: ()
-            // InternalTableDSL.g:8810:6: 
+            // InternalTableDSL.g:8279:5: ()
+            // InternalTableDSL.g:8280:6: 
             {
             if ( state.backtracking==0 ) {
 
@@ -24858,30 +23484,30 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,146,FOLLOW_104); if (state.failed) return current;
+            otherlv_1=(Token)match(input,143,FOLLOW_103); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(otherlv_1, grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1());
               				
             }
-            otherlv_2=(Token)match(input,103,FOLLOW_79); if (state.failed) return current;
+            otherlv_2=(Token)match(input,100,FOLLOW_78); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(otherlv_2, grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2());
               				
             }
-            // InternalTableDSL.g:8824:5: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
-            // InternalTableDSL.g:8825:6: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+            // InternalTableDSL.g:8294:5: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
+            // InternalTableDSL.g:8295:6: (lv_declaredParam_3_0= ruleJvmFormalParameter )
             {
-            // InternalTableDSL.g:8825:6: (lv_declaredParam_3_0= ruleJvmFormalParameter )
-            // InternalTableDSL.g:8826:7: lv_declaredParam_3_0= ruleJvmFormalParameter
+            // InternalTableDSL.g:8295:6: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+            // InternalTableDSL.g:8296:7: lv_declaredParam_3_0= ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
 
               							newCompositeNode(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_0_0_3_0());
               						
             }
-            pushFollow(FOLLOW_107);
+            pushFollow(FOLLOW_106);
             lv_declaredParam_3_0=ruleJvmFormalParameter();
 
             state._fsp--;
@@ -24905,7 +23531,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,143,FOLLOW_66); if (state.failed) return current;
+            otherlv_4=(Token)match(input,140,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(otherlv_4, grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4());
@@ -24917,18 +23543,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:8849:3: ( (lv_forExpression_5_0= ruleXExpression ) )
-            // InternalTableDSL.g:8850:4: (lv_forExpression_5_0= ruleXExpression )
+            // InternalTableDSL.g:8319:3: ( (lv_forExpression_5_0= ruleXExpression ) )
+            // InternalTableDSL.g:8320:4: (lv_forExpression_5_0= ruleXExpression )
             {
-            // InternalTableDSL.g:8850:4: (lv_forExpression_5_0= ruleXExpression )
-            // InternalTableDSL.g:8851:5: lv_forExpression_5_0= ruleXExpression
+            // InternalTableDSL.g:8320:4: (lv_forExpression_5_0= ruleXExpression )
+            // InternalTableDSL.g:8321:5: lv_forExpression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXForLoopExpressionAccess().getForExpressionXExpressionParserRuleCall_1_0());
               				
             }
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_63);
             lv_forExpression_5_0=ruleXExpression();
 
             state._fsp--;
@@ -24952,17 +23578,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,105,FOLLOW_66); if (state.failed) return current;
+            otherlv_6=(Token)match(input,102,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_6, grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2());
               		
             }
-            // InternalTableDSL.g:8872:3: ( (lv_eachExpression_7_0= ruleXExpression ) )
-            // InternalTableDSL.g:8873:4: (lv_eachExpression_7_0= ruleXExpression )
+            // InternalTableDSL.g:8342:3: ( (lv_eachExpression_7_0= ruleXExpression ) )
+            // InternalTableDSL.g:8343:4: (lv_eachExpression_7_0= ruleXExpression )
             {
-            // InternalTableDSL.g:8873:4: (lv_eachExpression_7_0= ruleXExpression )
-            // InternalTableDSL.g:8874:5: lv_eachExpression_7_0= ruleXExpression
+            // InternalTableDSL.g:8343:4: (lv_eachExpression_7_0= ruleXExpression )
+            // InternalTableDSL.g:8344:5: lv_eachExpression_7_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -25018,7 +23644,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXBasicForLoopExpression"
-    // InternalTableDSL.g:8895:1: entryRuleXBasicForLoopExpression returns [EObject current=null] : iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF ;
+    // InternalTableDSL.g:8365:1: entryRuleXBasicForLoopExpression returns [EObject current=null] : iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF ;
     public final EObject entryRuleXBasicForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -25026,8 +23652,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:8895:64: (iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF )
-            // InternalTableDSL.g:8896:2: iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF
+            // InternalTableDSL.g:8365:64: (iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF )
+            // InternalTableDSL.g:8366:2: iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBasicForLoopExpressionRule()); 
@@ -25058,7 +23684,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXBasicForLoopExpression"
-    // InternalTableDSL.g:8902:1: ruleXBasicForLoopExpression returns [EObject current=null] : ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) ;
+    // InternalTableDSL.g:8372:1: ruleXBasicForLoopExpression returns [EObject current=null] : ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) ;
     public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -25086,14 +23712,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:8908:2: ( ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) )
-            // InternalTableDSL.g:8909:2: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
+            // InternalTableDSL.g:8378:2: ( ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) )
+            // InternalTableDSL.g:8379:2: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
             {
-            // InternalTableDSL.g:8909:2: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
-            // InternalTableDSL.g:8910:3: () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) )
+            // InternalTableDSL.g:8379:2: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
+            // InternalTableDSL.g:8380:3: () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) )
             {
-            // InternalTableDSL.g:8910:3: ()
-            // InternalTableDSL.g:8911:4: 
+            // InternalTableDSL.g:8380:3: ()
+            // InternalTableDSL.g:8381:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -25105,41 +23731,41 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,146,FOLLOW_104); if (state.failed) return current;
+            otherlv_1=(Token)match(input,143,FOLLOW_103); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,103,FOLLOW_112); if (state.failed) return current;
+            otherlv_2=(Token)match(input,100,FOLLOW_111); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2());
               		
             }
-            // InternalTableDSL.g:8925:3: ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )?
-            int alt120=2;
-            int LA120_0 = input.LA(1);
+            // InternalTableDSL.g:8395:3: ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )?
+            int alt115=2;
+            int LA115_0 = input.LA(1);
 
-            if ( ((LA120_0>=RULE_ID && LA120_0<=RULE_STRING)||(LA120_0>=RULE_INT && LA120_0<=RULE_DECIMAL)||LA120_0==16||(LA120_0>=94 && LA120_0<=98)||LA120_0==103||(LA120_0>=107 && LA120_0<=108)||LA120_0==115||LA120_0==134||LA120_0==140||LA120_0==142||(LA120_0>=146 && LA120_0<=160)||LA120_0==162) ) {
-                alt120=1;
+            if ( ((LA115_0>=RULE_ID && LA115_0<=RULE_STRING)||(LA115_0>=RULE_INT && LA115_0<=RULE_DECIMAL)||LA115_0==16||(LA115_0>=91 && LA115_0<=95)||LA115_0==100||(LA115_0>=104 && LA115_0<=105)||LA115_0==112||LA115_0==131||LA115_0==137||LA115_0==139||(LA115_0>=143 && LA115_0<=157)||LA115_0==159) ) {
+                alt115=1;
             }
-            switch (alt120) {
+            switch (alt115) {
                 case 1 :
-                    // InternalTableDSL.g:8926:4: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
+                    // InternalTableDSL.g:8396:4: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
                     {
-                    // InternalTableDSL.g:8926:4: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) )
-                    // InternalTableDSL.g:8927:5: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
+                    // InternalTableDSL.g:8396:4: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) )
+                    // InternalTableDSL.g:8397:5: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
                     {
-                    // InternalTableDSL.g:8927:5: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
-                    // InternalTableDSL.g:8928:6: lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration
+                    // InternalTableDSL.g:8397:5: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
+                    // InternalTableDSL.g:8398:6: lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_0_0());
                       					
                     }
-                    pushFollow(FOLLOW_113);
+                    pushFollow(FOLLOW_112);
                     lv_initExpressions_3_0=ruleXExpressionOrVarDeclaration();
 
                     state._fsp--;
@@ -25163,39 +23789,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:8945:4: (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
-                    loop119:
+                    // InternalTableDSL.g:8415:4: (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
+                    loop114:
                     do {
-                        int alt119=2;
-                        int LA119_0 = input.LA(1);
+                        int alt114=2;
+                        int LA114_0 = input.LA(1);
 
-                        if ( (LA119_0==104) ) {
-                            alt119=1;
+                        if ( (LA114_0==101) ) {
+                            alt114=1;
                         }
 
 
-                        switch (alt119) {
+                        switch (alt114) {
                     	case 1 :
-                    	    // InternalTableDSL.g:8946:5: otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
+                    	    // InternalTableDSL.g:8416:5: otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,104,FOLLOW_114); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,101,FOLLOW_113); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      					newLeafNode(otherlv_4, grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0());
                     	      				
                     	    }
-                    	    // InternalTableDSL.g:8950:5: ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
-                    	    // InternalTableDSL.g:8951:6: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
+                    	    // InternalTableDSL.g:8420:5: ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
+                    	    // InternalTableDSL.g:8421:6: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
                     	    {
-                    	    // InternalTableDSL.g:8951:6: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
-                    	    // InternalTableDSL.g:8952:7: lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration
+                    	    // InternalTableDSL.g:8421:6: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
+                    	    // InternalTableDSL.g:8422:7: lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      							newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_1_1_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_113);
+                    	    pushFollow(FOLLOW_112);
                     	    lv_initExpressions_5_0=ruleXExpressionOrVarDeclaration();
 
                     	    state._fsp--;
@@ -25224,7 +23850,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop119;
+                    	    break loop114;
                         }
                     } while (true);
 
@@ -25234,32 +23860,32 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,101,FOLLOW_115); if (state.failed) return current;
+            otherlv_6=(Token)match(input,98,FOLLOW_114); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_6, grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4());
               		
             }
-            // InternalTableDSL.g:8975:3: ( (lv_expression_7_0= ruleXExpression ) )?
-            int alt121=2;
-            int LA121_0 = input.LA(1);
+            // InternalTableDSL.g:8445:3: ( (lv_expression_7_0= ruleXExpression ) )?
+            int alt116=2;
+            int LA116_0 = input.LA(1);
 
-            if ( ((LA121_0>=RULE_ID && LA121_0<=RULE_STRING)||(LA121_0>=RULE_INT && LA121_0<=RULE_DECIMAL)||LA121_0==16||(LA121_0>=94 && LA121_0<=98)||LA121_0==103||(LA121_0>=107 && LA121_0<=108)||LA121_0==115||LA121_0==134||LA121_0==140||LA121_0==142||(LA121_0>=146 && LA121_0<=148)||(LA121_0>=151 && LA121_0<=160)||LA121_0==162) ) {
-                alt121=1;
+            if ( ((LA116_0>=RULE_ID && LA116_0<=RULE_STRING)||(LA116_0>=RULE_INT && LA116_0<=RULE_DECIMAL)||LA116_0==16||(LA116_0>=91 && LA116_0<=95)||LA116_0==100||(LA116_0>=104 && LA116_0<=105)||LA116_0==112||LA116_0==131||LA116_0==137||LA116_0==139||(LA116_0>=143 && LA116_0<=145)||(LA116_0>=148 && LA116_0<=157)||LA116_0==159) ) {
+                alt116=1;
             }
-            switch (alt121) {
+            switch (alt116) {
                 case 1 :
-                    // InternalTableDSL.g:8976:4: (lv_expression_7_0= ruleXExpression )
+                    // InternalTableDSL.g:8446:4: (lv_expression_7_0= ruleXExpression )
                     {
-                    // InternalTableDSL.g:8976:4: (lv_expression_7_0= ruleXExpression )
-                    // InternalTableDSL.g:8977:5: lv_expression_7_0= ruleXExpression
+                    // InternalTableDSL.g:8446:4: (lv_expression_7_0= ruleXExpression )
+                    // InternalTableDSL.g:8447:5: lv_expression_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
                       					newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionXExpressionParserRuleCall_5_0());
                       				
                     }
-                    pushFollow(FOLLOW_116);
+                    pushFollow(FOLLOW_115);
                     lv_expression_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -25286,35 +23912,35 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_8=(Token)match(input,101,FOLLOW_62); if (state.failed) return current;
+            otherlv_8=(Token)match(input,98,FOLLOW_61); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_8, grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6());
               		
             }
-            // InternalTableDSL.g:8998:3: ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )?
-            int alt123=2;
-            int LA123_0 = input.LA(1);
+            // InternalTableDSL.g:8468:3: ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )?
+            int alt118=2;
+            int LA118_0 = input.LA(1);
 
-            if ( ((LA123_0>=RULE_ID && LA123_0<=RULE_STRING)||(LA123_0>=RULE_INT && LA123_0<=RULE_DECIMAL)||LA123_0==16||(LA123_0>=94 && LA123_0<=98)||LA123_0==103||(LA123_0>=107 && LA123_0<=108)||LA123_0==115||LA123_0==134||LA123_0==140||LA123_0==142||(LA123_0>=146 && LA123_0<=148)||(LA123_0>=151 && LA123_0<=160)||LA123_0==162) ) {
-                alt123=1;
+            if ( ((LA118_0>=RULE_ID && LA118_0<=RULE_STRING)||(LA118_0>=RULE_INT && LA118_0<=RULE_DECIMAL)||LA118_0==16||(LA118_0>=91 && LA118_0<=95)||LA118_0==100||(LA118_0>=104 && LA118_0<=105)||LA118_0==112||LA118_0==131||LA118_0==137||LA118_0==139||(LA118_0>=143 && LA118_0<=145)||(LA118_0>=148 && LA118_0<=157)||LA118_0==159) ) {
+                alt118=1;
             }
-            switch (alt123) {
+            switch (alt118) {
                 case 1 :
-                    // InternalTableDSL.g:8999:4: ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
+                    // InternalTableDSL.g:8469:4: ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
                     {
-                    // InternalTableDSL.g:8999:4: ( (lv_updateExpressions_9_0= ruleXExpression ) )
-                    // InternalTableDSL.g:9000:5: (lv_updateExpressions_9_0= ruleXExpression )
+                    // InternalTableDSL.g:8469:4: ( (lv_updateExpressions_9_0= ruleXExpression ) )
+                    // InternalTableDSL.g:8470:5: (lv_updateExpressions_9_0= ruleXExpression )
                     {
-                    // InternalTableDSL.g:9000:5: (lv_updateExpressions_9_0= ruleXExpression )
-                    // InternalTableDSL.g:9001:6: lv_updateExpressions_9_0= ruleXExpression
+                    // InternalTableDSL.g:8470:5: (lv_updateExpressions_9_0= ruleXExpression )
+                    // InternalTableDSL.g:8471:6: lv_updateExpressions_9_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_0_0());
                       					
                     }
-                    pushFollow(FOLLOW_63);
+                    pushFollow(FOLLOW_62);
                     lv_updateExpressions_9_0=ruleXExpression();
 
                     state._fsp--;
@@ -25338,39 +23964,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:9018:4: (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
-                    loop122:
+                    // InternalTableDSL.g:8488:4: (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
+                    loop117:
                     do {
-                        int alt122=2;
-                        int LA122_0 = input.LA(1);
+                        int alt117=2;
+                        int LA117_0 = input.LA(1);
 
-                        if ( (LA122_0==104) ) {
-                            alt122=1;
+                        if ( (LA117_0==101) ) {
+                            alt117=1;
                         }
 
 
-                        switch (alt122) {
+                        switch (alt117) {
                     	case 1 :
-                    	    // InternalTableDSL.g:9019:5: otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) )
+                    	    // InternalTableDSL.g:8489:5: otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_10=(Token)match(input,104,FOLLOW_66); if (state.failed) return current;
+                    	    otherlv_10=(Token)match(input,101,FOLLOW_65); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      					newLeafNode(otherlv_10, grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0());
                     	      				
                     	    }
-                    	    // InternalTableDSL.g:9023:5: ( (lv_updateExpressions_11_0= ruleXExpression ) )
-                    	    // InternalTableDSL.g:9024:6: (lv_updateExpressions_11_0= ruleXExpression )
+                    	    // InternalTableDSL.g:8493:5: ( (lv_updateExpressions_11_0= ruleXExpression ) )
+                    	    // InternalTableDSL.g:8494:6: (lv_updateExpressions_11_0= ruleXExpression )
                     	    {
-                    	    // InternalTableDSL.g:9024:6: (lv_updateExpressions_11_0= ruleXExpression )
-                    	    // InternalTableDSL.g:9025:7: lv_updateExpressions_11_0= ruleXExpression
+                    	    // InternalTableDSL.g:8494:6: (lv_updateExpressions_11_0= ruleXExpression )
+                    	    // InternalTableDSL.g:8495:7: lv_updateExpressions_11_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      							newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_1_1_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_63);
+                    	    pushFollow(FOLLOW_62);
                     	    lv_updateExpressions_11_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -25399,7 +24025,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop122;
+                    	    break loop117;
                         }
                     } while (true);
 
@@ -25409,17 +24035,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_12=(Token)match(input,105,FOLLOW_66); if (state.failed) return current;
+            otherlv_12=(Token)match(input,102,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_12, grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8());
               		
             }
-            // InternalTableDSL.g:9048:3: ( (lv_eachExpression_13_0= ruleXExpression ) )
-            // InternalTableDSL.g:9049:4: (lv_eachExpression_13_0= ruleXExpression )
+            // InternalTableDSL.g:8518:3: ( (lv_eachExpression_13_0= ruleXExpression ) )
+            // InternalTableDSL.g:8519:4: (lv_eachExpression_13_0= ruleXExpression )
             {
-            // InternalTableDSL.g:9049:4: (lv_eachExpression_13_0= ruleXExpression )
-            // InternalTableDSL.g:9050:5: lv_eachExpression_13_0= ruleXExpression
+            // InternalTableDSL.g:8519:4: (lv_eachExpression_13_0= ruleXExpression )
+            // InternalTableDSL.g:8520:5: lv_eachExpression_13_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -25475,7 +24101,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXWhileExpression"
-    // InternalTableDSL.g:9071:1: entryRuleXWhileExpression returns [EObject current=null] : iv_ruleXWhileExpression= ruleXWhileExpression EOF ;
+    // InternalTableDSL.g:8541:1: entryRuleXWhileExpression returns [EObject current=null] : iv_ruleXWhileExpression= ruleXWhileExpression EOF ;
     public final EObject entryRuleXWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -25483,8 +24109,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:9071:57: (iv_ruleXWhileExpression= ruleXWhileExpression EOF )
-            // InternalTableDSL.g:9072:2: iv_ruleXWhileExpression= ruleXWhileExpression EOF
+            // InternalTableDSL.g:8541:57: (iv_ruleXWhileExpression= ruleXWhileExpression EOF )
+            // InternalTableDSL.g:8542:2: iv_ruleXWhileExpression= ruleXWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXWhileExpressionRule()); 
@@ -25515,7 +24141,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXWhileExpression"
-    // InternalTableDSL.g:9078:1: ruleXWhileExpression returns [EObject current=null] : ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) ;
+    // InternalTableDSL.g:8548:1: ruleXWhileExpression returns [EObject current=null] : ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) ;
     public final EObject ruleXWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -25531,14 +24157,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:9084:2: ( ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) )
-            // InternalTableDSL.g:9085:2: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
+            // InternalTableDSL.g:8554:2: ( ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) )
+            // InternalTableDSL.g:8555:2: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
             {
-            // InternalTableDSL.g:9085:2: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
-            // InternalTableDSL.g:9086:3: () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) )
+            // InternalTableDSL.g:8555:2: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
+            // InternalTableDSL.g:8556:3: () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) )
             {
-            // InternalTableDSL.g:9086:3: ()
-            // InternalTableDSL.g:9087:4: 
+            // InternalTableDSL.g:8556:3: ()
+            // InternalTableDSL.g:8557:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -25550,30 +24176,30 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,147,FOLLOW_104); if (state.failed) return current;
+            otherlv_1=(Token)match(input,144,FOLLOW_103); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,103,FOLLOW_66); if (state.failed) return current;
+            otherlv_2=(Token)match(input,100,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2());
               		
             }
-            // InternalTableDSL.g:9101:3: ( (lv_predicate_3_0= ruleXExpression ) )
-            // InternalTableDSL.g:9102:4: (lv_predicate_3_0= ruleXExpression )
+            // InternalTableDSL.g:8571:3: ( (lv_predicate_3_0= ruleXExpression ) )
+            // InternalTableDSL.g:8572:4: (lv_predicate_3_0= ruleXExpression )
             {
-            // InternalTableDSL.g:9102:4: (lv_predicate_3_0= ruleXExpression )
-            // InternalTableDSL.g:9103:5: lv_predicate_3_0= ruleXExpression
+            // InternalTableDSL.g:8572:4: (lv_predicate_3_0= ruleXExpression )
+            // InternalTableDSL.g:8573:5: lv_predicate_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXWhileExpressionAccess().getPredicateXExpressionParserRuleCall_3_0());
               				
             }
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_63);
             lv_predicate_3_0=ruleXExpression();
 
             state._fsp--;
@@ -25597,17 +24223,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,105,FOLLOW_66); if (state.failed) return current;
+            otherlv_4=(Token)match(input,102,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_4, grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4());
               		
             }
-            // InternalTableDSL.g:9124:3: ( (lv_body_5_0= ruleXExpression ) )
-            // InternalTableDSL.g:9125:4: (lv_body_5_0= ruleXExpression )
+            // InternalTableDSL.g:8594:3: ( (lv_body_5_0= ruleXExpression ) )
+            // InternalTableDSL.g:8595:4: (lv_body_5_0= ruleXExpression )
             {
-            // InternalTableDSL.g:9125:4: (lv_body_5_0= ruleXExpression )
-            // InternalTableDSL.g:9126:5: lv_body_5_0= ruleXExpression
+            // InternalTableDSL.g:8595:4: (lv_body_5_0= ruleXExpression )
+            // InternalTableDSL.g:8596:5: lv_body_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -25663,7 +24289,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXDoWhileExpression"
-    // InternalTableDSL.g:9147:1: entryRuleXDoWhileExpression returns [EObject current=null] : iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF ;
+    // InternalTableDSL.g:8617:1: entryRuleXDoWhileExpression returns [EObject current=null] : iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF ;
     public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -25671,8 +24297,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:9147:59: (iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF )
-            // InternalTableDSL.g:9148:2: iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF
+            // InternalTableDSL.g:8617:59: (iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF )
+            // InternalTableDSL.g:8618:2: iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXDoWhileExpressionRule()); 
@@ -25703,7 +24329,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXDoWhileExpression"
-    // InternalTableDSL.g:9154:1: ruleXDoWhileExpression returns [EObject current=null] : ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) ;
+    // InternalTableDSL.g:8624:1: ruleXDoWhileExpression returns [EObject current=null] : ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) ;
     public final EObject ruleXDoWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -25720,14 +24346,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:9160:2: ( ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) )
-            // InternalTableDSL.g:9161:2: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
+            // InternalTableDSL.g:8630:2: ( ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) )
+            // InternalTableDSL.g:8631:2: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
             {
-            // InternalTableDSL.g:9161:2: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
-            // InternalTableDSL.g:9162:3: () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')'
+            // InternalTableDSL.g:8631:2: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
+            // InternalTableDSL.g:8632:3: () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')'
             {
-            // InternalTableDSL.g:9162:3: ()
-            // InternalTableDSL.g:9163:4: 
+            // InternalTableDSL.g:8632:3: ()
+            // InternalTableDSL.g:8633:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -25739,24 +24365,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,148,FOLLOW_66); if (state.failed) return current;
+            otherlv_1=(Token)match(input,145,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1());
               		
             }
-            // InternalTableDSL.g:9173:3: ( (lv_body_2_0= ruleXExpression ) )
-            // InternalTableDSL.g:9174:4: (lv_body_2_0= ruleXExpression )
+            // InternalTableDSL.g:8643:3: ( (lv_body_2_0= ruleXExpression ) )
+            // InternalTableDSL.g:8644:4: (lv_body_2_0= ruleXExpression )
             {
-            // InternalTableDSL.g:9174:4: (lv_body_2_0= ruleXExpression )
-            // InternalTableDSL.g:9175:5: lv_body_2_0= ruleXExpression
+            // InternalTableDSL.g:8644:4: (lv_body_2_0= ruleXExpression )
+            // InternalTableDSL.g:8645:5: lv_body_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXDoWhileExpressionAccess().getBodyXExpressionParserRuleCall_2_0());
               				
             }
-            pushFollow(FOLLOW_117);
+            pushFollow(FOLLOW_116);
             lv_body_2_0=ruleXExpression();
 
             state._fsp--;
@@ -25780,30 +24406,30 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,147,FOLLOW_104); if (state.failed) return current;
+            otherlv_3=(Token)match(input,144,FOLLOW_103); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_3, grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3());
               		
             }
-            otherlv_4=(Token)match(input,103,FOLLOW_66); if (state.failed) return current;
+            otherlv_4=(Token)match(input,100,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_4, grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4());
               		
             }
-            // InternalTableDSL.g:9200:3: ( (lv_predicate_5_0= ruleXExpression ) )
-            // InternalTableDSL.g:9201:4: (lv_predicate_5_0= ruleXExpression )
+            // InternalTableDSL.g:8670:3: ( (lv_predicate_5_0= ruleXExpression ) )
+            // InternalTableDSL.g:8671:4: (lv_predicate_5_0= ruleXExpression )
             {
-            // InternalTableDSL.g:9201:4: (lv_predicate_5_0= ruleXExpression )
-            // InternalTableDSL.g:9202:5: lv_predicate_5_0= ruleXExpression
+            // InternalTableDSL.g:8671:4: (lv_predicate_5_0= ruleXExpression )
+            // InternalTableDSL.g:8672:5: lv_predicate_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXDoWhileExpressionAccess().getPredicateXExpressionParserRuleCall_5_0());
               				
             }
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_63);
             lv_predicate_5_0=ruleXExpression();
 
             state._fsp--;
@@ -25827,7 +24453,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,105,FOLLOW_2); if (state.failed) return current;
+            otherlv_6=(Token)match(input,102,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_6, grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6());
@@ -25858,7 +24484,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXBlockExpression"
-    // InternalTableDSL.g:9227:1: entryRuleXBlockExpression returns [EObject current=null] : iv_ruleXBlockExpression= ruleXBlockExpression EOF ;
+    // InternalTableDSL.g:8697:1: entryRuleXBlockExpression returns [EObject current=null] : iv_ruleXBlockExpression= ruleXBlockExpression EOF ;
     public final EObject entryRuleXBlockExpression() throws RecognitionException {
         EObject current = null;
 
@@ -25866,8 +24492,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:9227:57: (iv_ruleXBlockExpression= ruleXBlockExpression EOF )
-            // InternalTableDSL.g:9228:2: iv_ruleXBlockExpression= ruleXBlockExpression EOF
+            // InternalTableDSL.g:8697:57: (iv_ruleXBlockExpression= ruleXBlockExpression EOF )
+            // InternalTableDSL.g:8698:2: iv_ruleXBlockExpression= ruleXBlockExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBlockExpressionRule()); 
@@ -25898,7 +24524,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXBlockExpression"
-    // InternalTableDSL.g:9234:1: ruleXBlockExpression returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) ;
+    // InternalTableDSL.g:8704:1: ruleXBlockExpression returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) ;
     public final EObject ruleXBlockExpression() throws RecognitionException {
         EObject current = null;
 
@@ -25912,14 +24538,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:9240:2: ( ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) )
-            // InternalTableDSL.g:9241:2: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
+            // InternalTableDSL.g:8710:2: ( ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) )
+            // InternalTableDSL.g:8711:2: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
             {
-            // InternalTableDSL.g:9241:2: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
-            // InternalTableDSL.g:9242:3: () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}'
+            // InternalTableDSL.g:8711:2: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
+            // InternalTableDSL.g:8712:3: () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}'
             {
-            // InternalTableDSL.g:9242:3: ()
-            // InternalTableDSL.g:9243:4: 
+            // InternalTableDSL.g:8712:3: ()
+            // InternalTableDSL.g:8713:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -25931,39 +24557,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,16,FOLLOW_118); if (state.failed) return current;
+            otherlv_1=(Token)match(input,16,FOLLOW_117); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1());
               		
             }
-            // InternalTableDSL.g:9253:3: ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )*
-            loop125:
+            // InternalTableDSL.g:8723:3: ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )*
+            loop120:
             do {
-                int alt125=2;
-                int LA125_0 = input.LA(1);
+                int alt120=2;
+                int LA120_0 = input.LA(1);
 
-                if ( ((LA125_0>=RULE_ID && LA125_0<=RULE_STRING)||(LA125_0>=RULE_INT && LA125_0<=RULE_DECIMAL)||LA125_0==16||(LA125_0>=94 && LA125_0<=98)||LA125_0==103||(LA125_0>=107 && LA125_0<=108)||LA125_0==115||LA125_0==134||LA125_0==140||LA125_0==142||(LA125_0>=146 && LA125_0<=160)||LA125_0==162) ) {
-                    alt125=1;
+                if ( ((LA120_0>=RULE_ID && LA120_0<=RULE_STRING)||(LA120_0>=RULE_INT && LA120_0<=RULE_DECIMAL)||LA120_0==16||(LA120_0>=91 && LA120_0<=95)||LA120_0==100||(LA120_0>=104 && LA120_0<=105)||LA120_0==112||LA120_0==131||LA120_0==137||LA120_0==139||(LA120_0>=143 && LA120_0<=157)||LA120_0==159) ) {
+                    alt120=1;
                 }
 
 
-                switch (alt125) {
+                switch (alt120) {
             	case 1 :
-            	    // InternalTableDSL.g:9254:4: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )?
+            	    // InternalTableDSL.g:8724:4: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )?
             	    {
-            	    // InternalTableDSL.g:9254:4: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) )
-            	    // InternalTableDSL.g:9255:5: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalTableDSL.g:8724:4: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) )
+            	    // InternalTableDSL.g:8725:5: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
             	    {
-            	    // InternalTableDSL.g:9255:5: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
-            	    // InternalTableDSL.g:9256:6: lv_expressions_2_0= ruleXExpressionOrVarDeclaration
+            	    // InternalTableDSL.g:8725:5: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalTableDSL.g:8726:6: lv_expressions_2_0= ruleXExpressionOrVarDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXBlockExpressionAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_2_0_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_119);
+            	    pushFollow(FOLLOW_118);
             	    lv_expressions_2_0=ruleXExpressionOrVarDeclaration();
 
             	    state._fsp--;
@@ -25987,18 +24613,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalTableDSL.g:9273:4: (otherlv_3= ';' )?
-            	    int alt124=2;
-            	    int LA124_0 = input.LA(1);
+            	    // InternalTableDSL.g:8743:4: (otherlv_3= ';' )?
+            	    int alt119=2;
+            	    int LA119_0 = input.LA(1);
 
-            	    if ( (LA124_0==101) ) {
-            	        alt124=1;
+            	    if ( (LA119_0==98) ) {
+            	        alt119=1;
             	    }
-            	    switch (alt124) {
+            	    switch (alt119) {
             	        case 1 :
-            	            // InternalTableDSL.g:9274:5: otherlv_3= ';'
+            	            // InternalTableDSL.g:8744:5: otherlv_3= ';'
             	            {
-            	            otherlv_3=(Token)match(input,101,FOLLOW_118); if (state.failed) return current;
+            	            otherlv_3=(Token)match(input,98,FOLLOW_117); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              					newLeafNode(otherlv_3, grammarAccess.getXBlockExpressionAccess().getSemicolonKeyword_2_1());
@@ -26015,7 +24641,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop125;
+            	    break loop120;
                 }
             } while (true);
 
@@ -26050,7 +24676,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXExpressionOrVarDeclaration"
-    // InternalTableDSL.g:9288:1: entryRuleXExpressionOrVarDeclaration returns [EObject current=null] : iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF ;
+    // InternalTableDSL.g:8758:1: entryRuleXExpressionOrVarDeclaration returns [EObject current=null] : iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF ;
     public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -26058,8 +24684,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:9288:68: (iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF )
-            // InternalTableDSL.g:9289:2: iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF
+            // InternalTableDSL.g:8758:68: (iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF )
+            // InternalTableDSL.g:8759:2: iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionOrVarDeclarationRule()); 
@@ -26090,7 +24716,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXExpressionOrVarDeclaration"
-    // InternalTableDSL.g:9295:1: ruleXExpressionOrVarDeclaration returns [EObject current=null] : (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) ;
+    // InternalTableDSL.g:8765:1: ruleXExpressionOrVarDeclaration returns [EObject current=null] : (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) ;
     public final EObject ruleXExpressionOrVarDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -26103,29 +24729,29 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:9301:2: ( (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) )
-            // InternalTableDSL.g:9302:2: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
+            // InternalTableDSL.g:8771:2: ( (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) )
+            // InternalTableDSL.g:8772:2: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
             {
-            // InternalTableDSL.g:9302:2: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
-            int alt126=2;
-            int LA126_0 = input.LA(1);
+            // InternalTableDSL.g:8772:2: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
+            int alt121=2;
+            int LA121_0 = input.LA(1);
 
-            if ( ((LA126_0>=149 && LA126_0<=150)) ) {
-                alt126=1;
+            if ( ((LA121_0>=146 && LA121_0<=147)) ) {
+                alt121=1;
             }
-            else if ( ((LA126_0>=RULE_ID && LA126_0<=RULE_STRING)||(LA126_0>=RULE_INT && LA126_0<=RULE_DECIMAL)||LA126_0==16||(LA126_0>=94 && LA126_0<=98)||LA126_0==103||(LA126_0>=107 && LA126_0<=108)||LA126_0==115||LA126_0==134||LA126_0==140||LA126_0==142||(LA126_0>=146 && LA126_0<=148)||(LA126_0>=151 && LA126_0<=160)||LA126_0==162) ) {
-                alt126=2;
+            else if ( ((LA121_0>=RULE_ID && LA121_0<=RULE_STRING)||(LA121_0>=RULE_INT && LA121_0<=RULE_DECIMAL)||LA121_0==16||(LA121_0>=91 && LA121_0<=95)||LA121_0==100||(LA121_0>=104 && LA121_0<=105)||LA121_0==112||LA121_0==131||LA121_0==137||LA121_0==139||(LA121_0>=143 && LA121_0<=145)||(LA121_0>=148 && LA121_0<=157)||LA121_0==159) ) {
+                alt121=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 126, 0, input);
+                    new NoViableAltException("", 121, 0, input);
 
                 throw nvae;
             }
-            switch (alt126) {
+            switch (alt121) {
                 case 1 :
-                    // InternalTableDSL.g:9303:3: this_XVariableDeclaration_0= ruleXVariableDeclaration
+                    // InternalTableDSL.g:8773:3: this_XVariableDeclaration_0= ruleXVariableDeclaration
                     {
                     if ( state.backtracking==0 ) {
 
@@ -26147,7 +24773,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:9312:3: this_XExpression_1= ruleXExpression
+                    // InternalTableDSL.g:8782:3: this_XExpression_1= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -26193,7 +24819,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXVariableDeclaration"
-    // InternalTableDSL.g:9324:1: entryRuleXVariableDeclaration returns [EObject current=null] : iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF ;
+    // InternalTableDSL.g:8794:1: entryRuleXVariableDeclaration returns [EObject current=null] : iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF ;
     public final EObject entryRuleXVariableDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -26201,8 +24827,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:9324:61: (iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF )
-            // InternalTableDSL.g:9325:2: iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF
+            // InternalTableDSL.g:8794:61: (iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF )
+            // InternalTableDSL.g:8795:2: iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXVariableDeclarationRule()); 
@@ -26233,7 +24859,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXVariableDeclaration"
-    // InternalTableDSL.g:9331:1: ruleXVariableDeclaration returns [EObject current=null] : ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) ;
+    // InternalTableDSL.g:8801:1: ruleXVariableDeclaration returns [EObject current=null] : ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) ;
     public final EObject ruleXVariableDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -26253,14 +24879,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:9337:2: ( ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) )
-            // InternalTableDSL.g:9338:2: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
+            // InternalTableDSL.g:8807:2: ( ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) )
+            // InternalTableDSL.g:8808:2: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
             {
-            // InternalTableDSL.g:9338:2: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
-            // InternalTableDSL.g:9339:3: () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
+            // InternalTableDSL.g:8808:2: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
+            // InternalTableDSL.g:8809:3: () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
             {
-            // InternalTableDSL.g:9339:3: ()
-            // InternalTableDSL.g:9340:4: 
+            // InternalTableDSL.g:8809:3: ()
+            // InternalTableDSL.g:8810:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -26272,34 +24898,34 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:9346:3: ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' )
-            int alt127=2;
-            int LA127_0 = input.LA(1);
+            // InternalTableDSL.g:8816:3: ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' )
+            int alt122=2;
+            int LA122_0 = input.LA(1);
 
-            if ( (LA127_0==149) ) {
-                alt127=1;
+            if ( (LA122_0==146) ) {
+                alt122=1;
             }
-            else if ( (LA127_0==150) ) {
-                alt127=2;
+            else if ( (LA122_0==147) ) {
+                alt122=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 127, 0, input);
+                    new NoViableAltException("", 122, 0, input);
 
                 throw nvae;
             }
-            switch (alt127) {
+            switch (alt122) {
                 case 1 :
-                    // InternalTableDSL.g:9347:4: ( (lv_writeable_1_0= 'var' ) )
+                    // InternalTableDSL.g:8817:4: ( (lv_writeable_1_0= 'var' ) )
                     {
-                    // InternalTableDSL.g:9347:4: ( (lv_writeable_1_0= 'var' ) )
-                    // InternalTableDSL.g:9348:5: (lv_writeable_1_0= 'var' )
+                    // InternalTableDSL.g:8817:4: ( (lv_writeable_1_0= 'var' ) )
+                    // InternalTableDSL.g:8818:5: (lv_writeable_1_0= 'var' )
                     {
-                    // InternalTableDSL.g:9348:5: (lv_writeable_1_0= 'var' )
-                    // InternalTableDSL.g:9349:6: lv_writeable_1_0= 'var'
+                    // InternalTableDSL.g:8818:5: (lv_writeable_1_0= 'var' )
+                    // InternalTableDSL.g:8819:6: lv_writeable_1_0= 'var'
                     {
-                    lv_writeable_1_0=(Token)match(input,149,FOLLOW_79); if (state.failed) return current;
+                    lv_writeable_1_0=(Token)match(input,146,FOLLOW_78); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(lv_writeable_1_0, grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0());
@@ -26323,9 +24949,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:9362:4: otherlv_2= 'val'
+                    // InternalTableDSL.g:8832:4: otherlv_2= 'val'
                     {
-                    otherlv_2=(Token)match(input,150,FOLLOW_79); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,147,FOLLOW_78); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_2, grammarAccess.getXVariableDeclarationAccess().getValKeyword_1_1());
@@ -26337,55 +24963,55 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:9367:3: ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) )
-            int alt128=2;
-            int LA128_0 = input.LA(1);
+            // InternalTableDSL.g:8837:3: ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) )
+            int alt123=2;
+            int LA123_0 = input.LA(1);
 
-            if ( (LA128_0==RULE_ID) ) {
-                int LA128_1 = input.LA(2);
+            if ( (LA123_0==RULE_ID) ) {
+                int LA123_1 = input.LA(2);
 
                 if ( (synpred35_InternalTableDSL()) ) {
-                    alt128=1;
+                    alt123=1;
                 }
                 else if ( (true) ) {
-                    alt128=2;
+                    alt123=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 128, 1, input);
+                        new NoViableAltException("", 123, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA128_0==103) && (synpred35_InternalTableDSL())) {
-                alt128=1;
+            else if ( (LA123_0==100) && (synpred35_InternalTableDSL())) {
+                alt123=1;
             }
-            else if ( (LA128_0==128) && (synpred35_InternalTableDSL())) {
-                alt128=1;
+            else if ( (LA123_0==125) && (synpred35_InternalTableDSL())) {
+                alt123=1;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 128, 0, input);
+                    new NoViableAltException("", 123, 0, input);
 
                 throw nvae;
             }
-            switch (alt128) {
+            switch (alt123) {
                 case 1 :
-                    // InternalTableDSL.g:9368:4: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
+                    // InternalTableDSL.g:8838:4: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
                     {
-                    // InternalTableDSL.g:9368:4: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
-                    // InternalTableDSL.g:9369:5: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
+                    // InternalTableDSL.g:8838:4: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
+                    // InternalTableDSL.g:8839:5: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
                     {
-                    // InternalTableDSL.g:9382:5: ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
-                    // InternalTableDSL.g:9383:6: ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) )
+                    // InternalTableDSL.g:8852:5: ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
+                    // InternalTableDSL.g:8853:6: ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) )
                     {
-                    // InternalTableDSL.g:9383:6: ( (lv_type_3_0= ruleJvmTypeReference ) )
-                    // InternalTableDSL.g:9384:7: (lv_type_3_0= ruleJvmTypeReference )
+                    // InternalTableDSL.g:8853:6: ( (lv_type_3_0= ruleJvmTypeReference ) )
+                    // InternalTableDSL.g:8854:7: (lv_type_3_0= ruleJvmTypeReference )
                     {
-                    // InternalTableDSL.g:9384:7: (lv_type_3_0= ruleJvmTypeReference )
-                    // InternalTableDSL.g:9385:8: lv_type_3_0= ruleJvmTypeReference
+                    // InternalTableDSL.g:8854:7: (lv_type_3_0= ruleJvmTypeReference )
+                    // InternalTableDSL.g:8855:8: lv_type_3_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
@@ -26416,18 +25042,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:9402:6: ( (lv_name_4_0= ruleValidID ) )
-                    // InternalTableDSL.g:9403:7: (lv_name_4_0= ruleValidID )
+                    // InternalTableDSL.g:8872:6: ( (lv_name_4_0= ruleValidID ) )
+                    // InternalTableDSL.g:8873:7: (lv_name_4_0= ruleValidID )
                     {
-                    // InternalTableDSL.g:9403:7: (lv_name_4_0= ruleValidID )
-                    // InternalTableDSL.g:9404:8: lv_name_4_0= ruleValidID
+                    // InternalTableDSL.g:8873:7: (lv_name_4_0= ruleValidID )
+                    // InternalTableDSL.g:8874:8: lv_name_4_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
 
                       								newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_0_0_1_0());
                       							
                     }
-                    pushFollow(FOLLOW_120);
+                    pushFollow(FOLLOW_119);
                     lv_name_4_0=ruleValidID();
 
                     state._fsp--;
@@ -26461,20 +25087,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:9424:4: ( (lv_name_5_0= ruleValidID ) )
+                    // InternalTableDSL.g:8894:4: ( (lv_name_5_0= ruleValidID ) )
                     {
-                    // InternalTableDSL.g:9424:4: ( (lv_name_5_0= ruleValidID ) )
-                    // InternalTableDSL.g:9425:5: (lv_name_5_0= ruleValidID )
+                    // InternalTableDSL.g:8894:4: ( (lv_name_5_0= ruleValidID ) )
+                    // InternalTableDSL.g:8895:5: (lv_name_5_0= ruleValidID )
                     {
-                    // InternalTableDSL.g:9425:5: (lv_name_5_0= ruleValidID )
-                    // InternalTableDSL.g:9426:6: lv_name_5_0= ruleValidID
+                    // InternalTableDSL.g:8895:5: (lv_name_5_0= ruleValidID )
+                    // InternalTableDSL.g:8896:6: lv_name_5_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_1_0());
                       					
                     }
-                    pushFollow(FOLLOW_120);
+                    pushFollow(FOLLOW_119);
                     lv_name_5_0=ruleValidID();
 
                     state._fsp--;
@@ -26504,28 +25130,28 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:9444:3: (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
-            int alt129=2;
-            int LA129_0 = input.LA(1);
+            // InternalTableDSL.g:8914:3: (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
+            int alt124=2;
+            int LA124_0 = input.LA(1);
 
-            if ( (LA129_0==106) ) {
-                alt129=1;
+            if ( (LA124_0==103) ) {
+                alt124=1;
             }
-            switch (alt129) {
+            switch (alt124) {
                 case 1 :
-                    // InternalTableDSL.g:9445:4: otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) )
+                    // InternalTableDSL.g:8915:4: otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) )
                     {
-                    otherlv_6=(Token)match(input,106,FOLLOW_66); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,103,FOLLOW_65); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_6, grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0());
                       			
                     }
-                    // InternalTableDSL.g:9449:4: ( (lv_right_7_0= ruleXExpression ) )
-                    // InternalTableDSL.g:9450:5: (lv_right_7_0= ruleXExpression )
+                    // InternalTableDSL.g:8919:4: ( (lv_right_7_0= ruleXExpression ) )
+                    // InternalTableDSL.g:8920:5: (lv_right_7_0= ruleXExpression )
                     {
-                    // InternalTableDSL.g:9450:5: (lv_right_7_0= ruleXExpression )
-                    // InternalTableDSL.g:9451:6: lv_right_7_0= ruleXExpression
+                    // InternalTableDSL.g:8920:5: (lv_right_7_0= ruleXExpression )
+                    // InternalTableDSL.g:8921:6: lv_right_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -26587,7 +25213,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmFormalParameter"
-    // InternalTableDSL.g:9473:1: entryRuleJvmFormalParameter returns [EObject current=null] : iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF ;
+    // InternalTableDSL.g:8943:1: entryRuleJvmFormalParameter returns [EObject current=null] : iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF ;
     public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -26595,8 +25221,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:9473:59: (iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF )
-            // InternalTableDSL.g:9474:2: iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF
+            // InternalTableDSL.g:8943:59: (iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF )
+            // InternalTableDSL.g:8944:2: iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmFormalParameterRule()); 
@@ -26627,7 +25253,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmFormalParameter"
-    // InternalTableDSL.g:9480:1: ruleJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) ;
+    // InternalTableDSL.g:8950:1: ruleJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) ;
     public final EObject ruleJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -26640,32 +25266,32 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:9486:2: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) )
-            // InternalTableDSL.g:9487:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalTableDSL.g:8956:2: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) )
+            // InternalTableDSL.g:8957:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
             {
-            // InternalTableDSL.g:9487:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
-            // InternalTableDSL.g:9488:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) )
+            // InternalTableDSL.g:8957:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalTableDSL.g:8958:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) )
             {
-            // InternalTableDSL.g:9488:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )?
-            int alt130=2;
-            int LA130_0 = input.LA(1);
+            // InternalTableDSL.g:8958:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )?
+            int alt125=2;
+            int LA125_0 = input.LA(1);
 
-            if ( (LA130_0==RULE_ID) ) {
-                int LA130_1 = input.LA(2);
+            if ( (LA125_0==RULE_ID) ) {
+                int LA125_1 = input.LA(2);
 
-                if ( (LA130_1==RULE_ID||LA130_1==78||LA130_1==108||LA130_1==115) ) {
-                    alt130=1;
+                if ( (LA125_1==RULE_ID||LA125_1==74||LA125_1==105||LA125_1==112) ) {
+                    alt125=1;
                 }
             }
-            else if ( (LA130_0==103||LA130_0==128) ) {
-                alt130=1;
+            else if ( (LA125_0==100||LA125_0==125) ) {
+                alt125=1;
             }
-            switch (alt130) {
+            switch (alt125) {
                 case 1 :
-                    // InternalTableDSL.g:9489:4: (lv_parameterType_0_0= ruleJvmTypeReference )
+                    // InternalTableDSL.g:8959:4: (lv_parameterType_0_0= ruleJvmTypeReference )
                     {
-                    // InternalTableDSL.g:9489:4: (lv_parameterType_0_0= ruleJvmTypeReference )
-                    // InternalTableDSL.g:9490:5: lv_parameterType_0_0= ruleJvmTypeReference
+                    // InternalTableDSL.g:8959:4: (lv_parameterType_0_0= ruleJvmTypeReference )
+                    // InternalTableDSL.g:8960:5: lv_parameterType_0_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
@@ -26699,11 +25325,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:9507:3: ( (lv_name_1_0= ruleValidID ) )
-            // InternalTableDSL.g:9508:4: (lv_name_1_0= ruleValidID )
+            // InternalTableDSL.g:8977:3: ( (lv_name_1_0= ruleValidID ) )
+            // InternalTableDSL.g:8978:4: (lv_name_1_0= ruleValidID )
             {
-            // InternalTableDSL.g:9508:4: (lv_name_1_0= ruleValidID )
-            // InternalTableDSL.g:9509:5: lv_name_1_0= ruleValidID
+            // InternalTableDSL.g:8978:4: (lv_name_1_0= ruleValidID )
+            // InternalTableDSL.g:8979:5: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
 
@@ -26759,7 +25385,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleFullJvmFormalParameter"
-    // InternalTableDSL.g:9530:1: entryRuleFullJvmFormalParameter returns [EObject current=null] : iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF ;
+    // InternalTableDSL.g:9000:1: entryRuleFullJvmFormalParameter returns [EObject current=null] : iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF ;
     public final EObject entryRuleFullJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -26767,8 +25393,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:9530:63: (iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF )
-            // InternalTableDSL.g:9531:2: iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF
+            // InternalTableDSL.g:9000:63: (iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF )
+            // InternalTableDSL.g:9001:2: iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFullJvmFormalParameterRule()); 
@@ -26799,7 +25425,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleFullJvmFormalParameter"
-    // InternalTableDSL.g:9537:1: ruleFullJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) ;
+    // InternalTableDSL.g:9007:1: ruleFullJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) ;
     public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -26812,17 +25438,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:9543:2: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) )
-            // InternalTableDSL.g:9544:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalTableDSL.g:9013:2: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) )
+            // InternalTableDSL.g:9014:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
             {
-            // InternalTableDSL.g:9544:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
-            // InternalTableDSL.g:9545:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )
+            // InternalTableDSL.g:9014:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalTableDSL.g:9015:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )
             {
-            // InternalTableDSL.g:9545:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )
-            // InternalTableDSL.g:9546:4: (lv_parameterType_0_0= ruleJvmTypeReference )
+            // InternalTableDSL.g:9015:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )
+            // InternalTableDSL.g:9016:4: (lv_parameterType_0_0= ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:9546:4: (lv_parameterType_0_0= ruleJvmTypeReference )
-            // InternalTableDSL.g:9547:5: lv_parameterType_0_0= ruleJvmTypeReference
+            // InternalTableDSL.g:9016:4: (lv_parameterType_0_0= ruleJvmTypeReference )
+            // InternalTableDSL.g:9017:5: lv_parameterType_0_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
 
@@ -26853,11 +25479,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:9564:3: ( (lv_name_1_0= ruleValidID ) )
-            // InternalTableDSL.g:9565:4: (lv_name_1_0= ruleValidID )
+            // InternalTableDSL.g:9034:3: ( (lv_name_1_0= ruleValidID ) )
+            // InternalTableDSL.g:9035:4: (lv_name_1_0= ruleValidID )
             {
-            // InternalTableDSL.g:9565:4: (lv_name_1_0= ruleValidID )
-            // InternalTableDSL.g:9566:5: lv_name_1_0= ruleValidID
+            // InternalTableDSL.g:9035:4: (lv_name_1_0= ruleValidID )
+            // InternalTableDSL.g:9036:5: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
 
@@ -26913,7 +25539,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXFeatureCall"
-    // InternalTableDSL.g:9587:1: entryRuleXFeatureCall returns [EObject current=null] : iv_ruleXFeatureCall= ruleXFeatureCall EOF ;
+    // InternalTableDSL.g:9057:1: entryRuleXFeatureCall returns [EObject current=null] : iv_ruleXFeatureCall= ruleXFeatureCall EOF ;
     public final EObject entryRuleXFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -26921,8 +25547,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:9587:53: (iv_ruleXFeatureCall= ruleXFeatureCall EOF )
-            // InternalTableDSL.g:9588:2: iv_ruleXFeatureCall= ruleXFeatureCall EOF
+            // InternalTableDSL.g:9057:53: (iv_ruleXFeatureCall= ruleXFeatureCall EOF )
+            // InternalTableDSL.g:9058:2: iv_ruleXFeatureCall= ruleXFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXFeatureCallRule()); 
@@ -26953,7 +25579,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXFeatureCall"
-    // InternalTableDSL.g:9594:1: ruleXFeatureCall returns [EObject current=null] : ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) ;
+    // InternalTableDSL.g:9064:1: ruleXFeatureCall returns [EObject current=null] : ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) ;
     public final EObject ruleXFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -26980,14 +25606,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:9600:2: ( ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) )
-            // InternalTableDSL.g:9601:2: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
+            // InternalTableDSL.g:9070:2: ( ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) )
+            // InternalTableDSL.g:9071:2: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
             {
-            // InternalTableDSL.g:9601:2: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
-            // InternalTableDSL.g:9602:3: () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
+            // InternalTableDSL.g:9071:2: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
+            // InternalTableDSL.g:9072:3: () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
             {
-            // InternalTableDSL.g:9602:3: ()
-            // InternalTableDSL.g:9603:4: 
+            // InternalTableDSL.g:9072:3: ()
+            // InternalTableDSL.g:9073:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -26999,35 +25625,35 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:9609:3: (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )?
-            int alt132=2;
-            int LA132_0 = input.LA(1);
+            // InternalTableDSL.g:9079:3: (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )?
+            int alt127=2;
+            int LA127_0 = input.LA(1);
 
-            if ( (LA132_0==115) ) {
-                alt132=1;
+            if ( (LA127_0==112) ) {
+                alt127=1;
             }
-            switch (alt132) {
+            switch (alt127) {
                 case 1 :
-                    // InternalTableDSL.g:9610:4: otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>'
+                    // InternalTableDSL.g:9080:4: otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>'
                     {
-                    otherlv_1=(Token)match(input,115,FOLLOW_91); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,112,FOLLOW_90); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_1, grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0());
                       			
                     }
-                    // InternalTableDSL.g:9614:4: ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) )
-                    // InternalTableDSL.g:9615:5: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalTableDSL.g:9084:4: ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) )
+                    // InternalTableDSL.g:9085:5: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
                     {
-                    // InternalTableDSL.g:9615:5: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
-                    // InternalTableDSL.g:9616:6: lv_typeArguments_2_0= ruleJvmArgumentTypeReference
+                    // InternalTableDSL.g:9085:5: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalTableDSL.g:9086:6: lv_typeArguments_2_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0());
                       					
                     }
-                    pushFollow(FOLLOW_92);
+                    pushFollow(FOLLOW_91);
                     lv_typeArguments_2_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -27051,39 +25677,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:9633:4: (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )*
-                    loop131:
+                    // InternalTableDSL.g:9103:4: (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )*
+                    loop126:
                     do {
-                        int alt131=2;
-                        int LA131_0 = input.LA(1);
+                        int alt126=2;
+                        int LA126_0 = input.LA(1);
 
-                        if ( (LA131_0==104) ) {
-                            alt131=1;
+                        if ( (LA126_0==101) ) {
+                            alt126=1;
                         }
 
 
-                        switch (alt131) {
+                        switch (alt126) {
                     	case 1 :
-                    	    // InternalTableDSL.g:9634:5: otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalTableDSL.g:9104:5: otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,104,FOLLOW_91); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,101,FOLLOW_90); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      					newLeafNode(otherlv_3, grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0());
                     	      				
                     	    }
-                    	    // InternalTableDSL.g:9638:5: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
-                    	    // InternalTableDSL.g:9639:6: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalTableDSL.g:9108:5: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalTableDSL.g:9109:6: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // InternalTableDSL.g:9639:6: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
-                    	    // InternalTableDSL.g:9640:7: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
+                    	    // InternalTableDSL.g:9109:6: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalTableDSL.g:9110:7: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      							newCompositeNode(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_92);
+                    	    pushFollow(FOLLOW_91);
                     	    lv_typeArguments_4_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -27112,11 +25738,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop131;
+                    	    break loop126;
                         }
                     } while (true);
 
-                    otherlv_5=(Token)match(input,116,FOLLOW_90); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,113,FOLLOW_89); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_5, grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3());
@@ -27128,11 +25754,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:9663:3: ( ( ruleIdOrSuper ) )
-            // InternalTableDSL.g:9664:4: ( ruleIdOrSuper )
+            // InternalTableDSL.g:9133:3: ( ( ruleIdOrSuper ) )
+            // InternalTableDSL.g:9134:4: ( ruleIdOrSuper )
             {
-            // InternalTableDSL.g:9664:4: ( ruleIdOrSuper )
-            // InternalTableDSL.g:9665:5: ruleIdOrSuper
+            // InternalTableDSL.g:9134:4: ( ruleIdOrSuper )
+            // InternalTableDSL.g:9135:5: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
 
@@ -27146,7 +25772,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               					newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_2_0());
               				
             }
-            pushFollow(FOLLOW_121);
+            pushFollow(FOLLOW_120);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -27162,20 +25788,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:9679:3: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?
-            int alt135=2;
-            alt135 = dfa135.predict(input);
-            switch (alt135) {
+            // InternalTableDSL.g:9149:3: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?
+            int alt130=2;
+            alt130 = dfa130.predict(input);
+            switch (alt130) {
                 case 1 :
-                    // InternalTableDSL.g:9680:4: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')'
+                    // InternalTableDSL.g:9150:4: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')'
                     {
-                    // InternalTableDSL.g:9680:4: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) )
-                    // InternalTableDSL.g:9681:5: ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' )
+                    // InternalTableDSL.g:9150:4: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) )
+                    // InternalTableDSL.g:9151:5: ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' )
                     {
-                    // InternalTableDSL.g:9685:5: (lv_explicitOperationCall_7_0= '(' )
-                    // InternalTableDSL.g:9686:6: lv_explicitOperationCall_7_0= '('
+                    // InternalTableDSL.g:9155:5: (lv_explicitOperationCall_7_0= '(' )
+                    // InternalTableDSL.g:9156:6: lv_explicitOperationCall_7_0= '('
                     {
-                    lv_explicitOperationCall_7_0=(Token)match(input,103,FOLLOW_94); if (state.failed) return current;
+                    lv_explicitOperationCall_7_0=(Token)match(input,100,FOLLOW_93); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(lv_explicitOperationCall_7_0, grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0());
@@ -27195,25 +25821,25 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:9698:4: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?
-                    int alt134=3;
-                    alt134 = dfa134.predict(input);
-                    switch (alt134) {
+                    // InternalTableDSL.g:9168:4: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?
+                    int alt129=3;
+                    alt129 = dfa129.predict(input);
+                    switch (alt129) {
                         case 1 :
-                            // InternalTableDSL.g:9699:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
+                            // InternalTableDSL.g:9169:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
                             {
-                            // InternalTableDSL.g:9699:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
-                            // InternalTableDSL.g:9700:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure )
+                            // InternalTableDSL.g:9169:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
+                            // InternalTableDSL.g:9170:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure )
                             {
-                            // InternalTableDSL.g:9725:6: (lv_featureCallArguments_8_0= ruleXShortClosure )
-                            // InternalTableDSL.g:9726:7: lv_featureCallArguments_8_0= ruleXShortClosure
+                            // InternalTableDSL.g:9195:6: (lv_featureCallArguments_8_0= ruleXShortClosure )
+                            // InternalTableDSL.g:9196:7: lv_featureCallArguments_8_0= ruleXShortClosure
                             {
                             if ( state.backtracking==0 ) {
 
                               							newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXShortClosureParserRuleCall_3_1_0_0());
                               						
                             }
-                            pushFollow(FOLLOW_64);
+                            pushFollow(FOLLOW_63);
                             lv_featureCallArguments_8_0=ruleXShortClosure();
 
                             state._fsp--;
@@ -27241,23 +25867,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // InternalTableDSL.g:9744:5: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
+                            // InternalTableDSL.g:9214:5: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
                             {
-                            // InternalTableDSL.g:9744:5: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
-                            // InternalTableDSL.g:9745:6: ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
+                            // InternalTableDSL.g:9214:5: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
+                            // InternalTableDSL.g:9215:6: ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
                             {
-                            // InternalTableDSL.g:9745:6: ( (lv_featureCallArguments_9_0= ruleXExpression ) )
-                            // InternalTableDSL.g:9746:7: (lv_featureCallArguments_9_0= ruleXExpression )
+                            // InternalTableDSL.g:9215:6: ( (lv_featureCallArguments_9_0= ruleXExpression ) )
+                            // InternalTableDSL.g:9216:7: (lv_featureCallArguments_9_0= ruleXExpression )
                             {
-                            // InternalTableDSL.g:9746:7: (lv_featureCallArguments_9_0= ruleXExpression )
-                            // InternalTableDSL.g:9747:8: lv_featureCallArguments_9_0= ruleXExpression
+                            // InternalTableDSL.g:9216:7: (lv_featureCallArguments_9_0= ruleXExpression )
+                            // InternalTableDSL.g:9217:8: lv_featureCallArguments_9_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
 
                               								newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_0_0());
                               							
                             }
-                            pushFollow(FOLLOW_63);
+                            pushFollow(FOLLOW_62);
                             lv_featureCallArguments_9_0=ruleXExpression();
 
                             state._fsp--;
@@ -27281,39 +25907,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalTableDSL.g:9764:6: (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
-                            loop133:
+                            // InternalTableDSL.g:9234:6: (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
+                            loop128:
                             do {
-                                int alt133=2;
-                                int LA133_0 = input.LA(1);
+                                int alt128=2;
+                                int LA128_0 = input.LA(1);
 
-                                if ( (LA133_0==104) ) {
-                                    alt133=1;
+                                if ( (LA128_0==101) ) {
+                                    alt128=1;
                                 }
 
 
-                                switch (alt133) {
+                                switch (alt128) {
                             	case 1 :
-                            	    // InternalTableDSL.g:9765:7: otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) )
+                            	    // InternalTableDSL.g:9235:7: otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) )
                             	    {
-                            	    otherlv_10=(Token)match(input,104,FOLLOW_66); if (state.failed) return current;
+                            	    otherlv_10=(Token)match(input,101,FOLLOW_65); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      							newLeafNode(otherlv_10, grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0());
                             	      						
                             	    }
-                            	    // InternalTableDSL.g:9769:7: ( (lv_featureCallArguments_11_0= ruleXExpression ) )
-                            	    // InternalTableDSL.g:9770:8: (lv_featureCallArguments_11_0= ruleXExpression )
+                            	    // InternalTableDSL.g:9239:7: ( (lv_featureCallArguments_11_0= ruleXExpression ) )
+                            	    // InternalTableDSL.g:9240:8: (lv_featureCallArguments_11_0= ruleXExpression )
                             	    {
-                            	    // InternalTableDSL.g:9770:8: (lv_featureCallArguments_11_0= ruleXExpression )
-                            	    // InternalTableDSL.g:9771:9: lv_featureCallArguments_11_0= ruleXExpression
+                            	    // InternalTableDSL.g:9240:8: (lv_featureCallArguments_11_0= ruleXExpression )
+                            	    // InternalTableDSL.g:9241:9: lv_featureCallArguments_11_0= ruleXExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
 
                             	      									newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_1_1_0());
                             	      								
                             	    }
-                            	    pushFollow(FOLLOW_63);
+                            	    pushFollow(FOLLOW_62);
                             	    lv_featureCallArguments_11_0=ruleXExpression();
 
                             	    state._fsp--;
@@ -27342,7 +25968,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    break loop133;
+                            	    break loop128;
                                 }
                             } while (true);
 
@@ -27355,7 +25981,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_12=(Token)match(input,105,FOLLOW_122); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,102,FOLLOW_121); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_12, grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2());
@@ -27367,15 +25993,15 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:9796:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
-            int alt136=2;
-            alt136 = dfa136.predict(input);
-            switch (alt136) {
+            // InternalTableDSL.g:9266:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
+            int alt131=2;
+            alt131 = dfa131.predict(input);
+            switch (alt131) {
                 case 1 :
-                    // InternalTableDSL.g:9797:4: ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure )
+                    // InternalTableDSL.g:9267:4: ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure )
                     {
-                    // InternalTableDSL.g:9803:4: (lv_featureCallArguments_13_0= ruleXClosure )
-                    // InternalTableDSL.g:9804:5: lv_featureCallArguments_13_0= ruleXClosure
+                    // InternalTableDSL.g:9273:4: (lv_featureCallArguments_13_0= ruleXClosure )
+                    // InternalTableDSL.g:9274:5: lv_featureCallArguments_13_0= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
 
@@ -27434,7 +26060,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleFeatureCallID"
-    // InternalTableDSL.g:9825:1: entryRuleFeatureCallID returns [String current=null] : iv_ruleFeatureCallID= ruleFeatureCallID EOF ;
+    // InternalTableDSL.g:9295:1: entryRuleFeatureCallID returns [String current=null] : iv_ruleFeatureCallID= ruleFeatureCallID EOF ;
     public final String entryRuleFeatureCallID() throws RecognitionException {
         String current = null;
 
@@ -27442,8 +26068,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:9825:53: (iv_ruleFeatureCallID= ruleFeatureCallID EOF )
-            // InternalTableDSL.g:9826:2: iv_ruleFeatureCallID= ruleFeatureCallID EOF
+            // InternalTableDSL.g:9295:53: (iv_ruleFeatureCallID= ruleFeatureCallID EOF )
+            // InternalTableDSL.g:9296:2: iv_ruleFeatureCallID= ruleFeatureCallID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFeatureCallIDRule()); 
@@ -27474,7 +26100,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleFeatureCallID"
-    // InternalTableDSL.g:9832:1: ruleFeatureCallID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' ) ;
+    // InternalTableDSL.g:9302:1: ruleFeatureCallID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' ) ;
     public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -27486,48 +26112,48 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:9838:2: ( (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' ) )
-            // InternalTableDSL.g:9839:2: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
+            // InternalTableDSL.g:9308:2: ( (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' ) )
+            // InternalTableDSL.g:9309:2: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
             {
-            // InternalTableDSL.g:9839:2: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
-            int alt137=5;
+            // InternalTableDSL.g:9309:2: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
+            int alt132=5;
             switch ( input.LA(1) ) {
             case RULE_ID:
                 {
-                alt137=1;
+                alt132=1;
                 }
                 break;
-            case 151:
+            case 148:
                 {
-                alt137=2;
+                alt132=2;
                 }
                 break;
-            case 97:
+            case 94:
                 {
-                alt137=3;
+                alt132=3;
                 }
                 break;
-            case 96:
+            case 93:
                 {
-                alt137=4;
+                alt132=4;
                 }
                 break;
-            case 98:
+            case 95:
                 {
-                alt137=5;
+                alt132=5;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 137, 0, input);
+                    new NoViableAltException("", 132, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt137) {
+            switch (alt132) {
                 case 1 :
-                    // InternalTableDSL.g:9840:3: this_ValidID_0= ruleValidID
+                    // InternalTableDSL.g:9310:3: this_ValidID_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -27553,9 +26179,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:9851:3: kw= 'extends'
+                    // InternalTableDSL.g:9321:3: kw= 'extends'
                     {
-                    kw=(Token)match(input,151,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,148,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -27566,9 +26192,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:9857:3: kw= 'static'
+                    // InternalTableDSL.g:9327:3: kw= 'static'
                     {
-                    kw=(Token)match(input,97,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,94,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -27579,9 +26205,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:9863:3: kw= 'import'
+                    // InternalTableDSL.g:9333:3: kw= 'import'
                     {
-                    kw=(Token)match(input,96,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,93,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -27592,9 +26218,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:9869:3: kw= 'extension'
+                    // InternalTableDSL.g:9339:3: kw= 'extension'
                     {
-                    kw=(Token)match(input,98,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,95,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -27629,7 +26255,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleIdOrSuper"
-    // InternalTableDSL.g:9878:1: entryRuleIdOrSuper returns [String current=null] : iv_ruleIdOrSuper= ruleIdOrSuper EOF ;
+    // InternalTableDSL.g:9348:1: entryRuleIdOrSuper returns [String current=null] : iv_ruleIdOrSuper= ruleIdOrSuper EOF ;
     public final String entryRuleIdOrSuper() throws RecognitionException {
         String current = null;
 
@@ -27637,8 +26263,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:9878:49: (iv_ruleIdOrSuper= ruleIdOrSuper EOF )
-            // InternalTableDSL.g:9879:2: iv_ruleIdOrSuper= ruleIdOrSuper EOF
+            // InternalTableDSL.g:9348:49: (iv_ruleIdOrSuper= ruleIdOrSuper EOF )
+            // InternalTableDSL.g:9349:2: iv_ruleIdOrSuper= ruleIdOrSuper EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIdOrSuperRule()); 
@@ -27669,7 +26295,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleIdOrSuper"
-    // InternalTableDSL.g:9885:1: ruleIdOrSuper returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) ;
+    // InternalTableDSL.g:9355:1: ruleIdOrSuper returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) ;
     public final AntlrDatatypeRuleToken ruleIdOrSuper() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -27681,29 +26307,29 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:9891:2: ( (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) )
-            // InternalTableDSL.g:9892:2: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
+            // InternalTableDSL.g:9361:2: ( (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) )
+            // InternalTableDSL.g:9362:2: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
             {
-            // InternalTableDSL.g:9892:2: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
-            int alt138=2;
-            int LA138_0 = input.LA(1);
+            // InternalTableDSL.g:9362:2: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
+            int alt133=2;
+            int LA133_0 = input.LA(1);
 
-            if ( (LA138_0==RULE_ID||(LA138_0>=96 && LA138_0<=98)||LA138_0==151) ) {
-                alt138=1;
+            if ( (LA133_0==RULE_ID||(LA133_0>=93 && LA133_0<=95)||LA133_0==148) ) {
+                alt133=1;
             }
-            else if ( (LA138_0==152) ) {
-                alt138=2;
+            else if ( (LA133_0==149) ) {
+                alt133=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 138, 0, input);
+                    new NoViableAltException("", 133, 0, input);
 
                 throw nvae;
             }
-            switch (alt138) {
+            switch (alt133) {
                 case 1 :
-                    // InternalTableDSL.g:9893:3: this_FeatureCallID_0= ruleFeatureCallID
+                    // InternalTableDSL.g:9363:3: this_FeatureCallID_0= ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -27729,9 +26355,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:9904:3: kw= 'super'
+                    // InternalTableDSL.g:9374:3: kw= 'super'
                     {
-                    kw=(Token)match(input,152,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,149,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -27766,7 +26392,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXConstructorCall"
-    // InternalTableDSL.g:9913:1: entryRuleXConstructorCall returns [EObject current=null] : iv_ruleXConstructorCall= ruleXConstructorCall EOF ;
+    // InternalTableDSL.g:9383:1: entryRuleXConstructorCall returns [EObject current=null] : iv_ruleXConstructorCall= ruleXConstructorCall EOF ;
     public final EObject entryRuleXConstructorCall() throws RecognitionException {
         EObject current = null;
 
@@ -27774,8 +26400,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:9913:57: (iv_ruleXConstructorCall= ruleXConstructorCall EOF )
-            // InternalTableDSL.g:9914:2: iv_ruleXConstructorCall= ruleXConstructorCall EOF
+            // InternalTableDSL.g:9383:57: (iv_ruleXConstructorCall= ruleXConstructorCall EOF )
+            // InternalTableDSL.g:9384:2: iv_ruleXConstructorCall= ruleXConstructorCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXConstructorCallRule()); 
@@ -27806,7 +26432,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXConstructorCall"
-    // InternalTableDSL.g:9920:1: ruleXConstructorCall returns [EObject current=null] : ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) ;
+    // InternalTableDSL.g:9390:1: ruleXConstructorCall returns [EObject current=null] : ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) ;
     public final EObject ruleXConstructorCall() throws RecognitionException {
         EObject current = null;
 
@@ -27834,14 +26460,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:9926:2: ( ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) )
-            // InternalTableDSL.g:9927:2: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
+            // InternalTableDSL.g:9396:2: ( ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) )
+            // InternalTableDSL.g:9397:2: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
             {
-            // InternalTableDSL.g:9927:2: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
-            // InternalTableDSL.g:9928:3: () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
+            // InternalTableDSL.g:9397:2: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
+            // InternalTableDSL.g:9398:3: () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
             {
-            // InternalTableDSL.g:9928:3: ()
-            // InternalTableDSL.g:9929:4: 
+            // InternalTableDSL.g:9398:3: ()
+            // InternalTableDSL.g:9399:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -27853,17 +26479,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,153,FOLLOW_4); if (state.failed) return current;
+            otherlv_1=(Token)match(input,150,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXConstructorCallAccess().getNewKeyword_1());
               		
             }
-            // InternalTableDSL.g:9939:3: ( ( ruleQualifiedName ) )
-            // InternalTableDSL.g:9940:4: ( ruleQualifiedName )
+            // InternalTableDSL.g:9409:3: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:9410:4: ( ruleQualifiedName )
             {
-            // InternalTableDSL.g:9940:4: ( ruleQualifiedName )
-            // InternalTableDSL.g:9941:5: ruleQualifiedName
+            // InternalTableDSL.g:9410:4: ( ruleQualifiedName )
+            // InternalTableDSL.g:9411:5: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -27877,7 +26503,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               					newCompositeNode(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorCrossReference_2_0());
               				
             }
-            pushFollow(FOLLOW_123);
+            pushFollow(FOLLOW_122);
             ruleQualifiedName();
 
             state._fsp--;
@@ -27893,17 +26519,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:9955:3: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?
-            int alt140=2;
-            alt140 = dfa140.predict(input);
-            switch (alt140) {
+            // InternalTableDSL.g:9425:3: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?
+            int alt135=2;
+            alt135 = dfa135.predict(input);
+            switch (alt135) {
                 case 1 :
-                    // InternalTableDSL.g:9956:4: ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>'
+                    // InternalTableDSL.g:9426:4: ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>'
                     {
-                    // InternalTableDSL.g:9956:4: ( ( '<' )=>otherlv_3= '<' )
-                    // InternalTableDSL.g:9957:5: ( '<' )=>otherlv_3= '<'
+                    // InternalTableDSL.g:9426:4: ( ( '<' )=>otherlv_3= '<' )
+                    // InternalTableDSL.g:9427:5: ( '<' )=>otherlv_3= '<'
                     {
-                    otherlv_3=(Token)match(input,115,FOLLOW_91); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,112,FOLLOW_90); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(otherlv_3, grammarAccess.getXConstructorCallAccess().getLessThanSignKeyword_3_0());
@@ -27912,18 +26538,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:9963:4: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
-                    // InternalTableDSL.g:9964:5: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    // InternalTableDSL.g:9433:4: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    // InternalTableDSL.g:9434:5: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
                     {
-                    // InternalTableDSL.g:9964:5: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
-                    // InternalTableDSL.g:9965:6: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
+                    // InternalTableDSL.g:9434:5: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    // InternalTableDSL.g:9435:6: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_1_0());
                       					
                     }
-                    pushFollow(FOLLOW_92);
+                    pushFollow(FOLLOW_91);
                     lv_typeArguments_4_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -27947,39 +26573,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:9982:4: (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )*
-                    loop139:
+                    // InternalTableDSL.g:9452:4: (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )*
+                    loop134:
                     do {
-                        int alt139=2;
-                        int LA139_0 = input.LA(1);
+                        int alt134=2;
+                        int LA134_0 = input.LA(1);
 
-                        if ( (LA139_0==104) ) {
-                            alt139=1;
+                        if ( (LA134_0==101) ) {
+                            alt134=1;
                         }
 
 
-                        switch (alt139) {
+                        switch (alt134) {
                     	case 1 :
-                    	    // InternalTableDSL.g:9983:5: otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalTableDSL.g:9453:5: otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_5=(Token)match(input,104,FOLLOW_91); if (state.failed) return current;
+                    	    otherlv_5=(Token)match(input,101,FOLLOW_90); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      					newLeafNode(otherlv_5, grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0());
                     	      				
                     	    }
-                    	    // InternalTableDSL.g:9987:5: ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
-                    	    // InternalTableDSL.g:9988:6: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
+                    	    // InternalTableDSL.g:9457:5: ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalTableDSL.g:9458:6: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // InternalTableDSL.g:9988:6: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
-                    	    // InternalTableDSL.g:9989:7: lv_typeArguments_6_0= ruleJvmArgumentTypeReference
+                    	    // InternalTableDSL.g:9458:6: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
+                    	    // InternalTableDSL.g:9459:7: lv_typeArguments_6_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      							newCompositeNode(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_2_1_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_92);
+                    	    pushFollow(FOLLOW_91);
                     	    lv_typeArguments_6_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -28008,11 +26634,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop139;
+                    	    break loop134;
                         }
                     } while (true);
 
-                    otherlv_7=(Token)match(input,116,FOLLOW_121); if (state.failed) return current;
+                    otherlv_7=(Token)match(input,113,FOLLOW_120); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_7, grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3());
@@ -28024,20 +26650,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:10012:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?
-            int alt143=2;
-            alt143 = dfa143.predict(input);
-            switch (alt143) {
+            // InternalTableDSL.g:9482:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?
+            int alt138=2;
+            alt138 = dfa138.predict(input);
+            switch (alt138) {
                 case 1 :
-                    // InternalTableDSL.g:10013:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')'
+                    // InternalTableDSL.g:9483:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')'
                     {
-                    // InternalTableDSL.g:10013:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) )
-                    // InternalTableDSL.g:10014:5: ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' )
+                    // InternalTableDSL.g:9483:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) )
+                    // InternalTableDSL.g:9484:5: ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' )
                     {
-                    // InternalTableDSL.g:10018:5: (lv_explicitConstructorCall_8_0= '(' )
-                    // InternalTableDSL.g:10019:6: lv_explicitConstructorCall_8_0= '('
+                    // InternalTableDSL.g:9488:5: (lv_explicitConstructorCall_8_0= '(' )
+                    // InternalTableDSL.g:9489:6: lv_explicitConstructorCall_8_0= '('
                     {
-                    lv_explicitConstructorCall_8_0=(Token)match(input,103,FOLLOW_94); if (state.failed) return current;
+                    lv_explicitConstructorCall_8_0=(Token)match(input,100,FOLLOW_93); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(lv_explicitConstructorCall_8_0, grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0());
@@ -28057,25 +26683,25 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:10031:4: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?
-                    int alt142=3;
-                    alt142 = dfa142.predict(input);
-                    switch (alt142) {
+                    // InternalTableDSL.g:9501:4: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?
+                    int alt137=3;
+                    alt137 = dfa137.predict(input);
+                    switch (alt137) {
                         case 1 :
-                            // InternalTableDSL.g:10032:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
+                            // InternalTableDSL.g:9502:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
                             {
-                            // InternalTableDSL.g:10032:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
-                            // InternalTableDSL.g:10033:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure )
+                            // InternalTableDSL.g:9502:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
+                            // InternalTableDSL.g:9503:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure )
                             {
-                            // InternalTableDSL.g:10058:6: (lv_arguments_9_0= ruleXShortClosure )
-                            // InternalTableDSL.g:10059:7: lv_arguments_9_0= ruleXShortClosure
+                            // InternalTableDSL.g:9528:6: (lv_arguments_9_0= ruleXShortClosure )
+                            // InternalTableDSL.g:9529:7: lv_arguments_9_0= ruleXShortClosure
                             {
                             if ( state.backtracking==0 ) {
 
                               							newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXShortClosureParserRuleCall_4_1_0_0());
                               						
                             }
-                            pushFollow(FOLLOW_64);
+                            pushFollow(FOLLOW_63);
                             lv_arguments_9_0=ruleXShortClosure();
 
                             state._fsp--;
@@ -28103,23 +26729,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // InternalTableDSL.g:10077:5: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
+                            // InternalTableDSL.g:9547:5: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
                             {
-                            // InternalTableDSL.g:10077:5: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
-                            // InternalTableDSL.g:10078:6: ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
+                            // InternalTableDSL.g:9547:5: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
+                            // InternalTableDSL.g:9548:6: ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
                             {
-                            // InternalTableDSL.g:10078:6: ( (lv_arguments_10_0= ruleXExpression ) )
-                            // InternalTableDSL.g:10079:7: (lv_arguments_10_0= ruleXExpression )
+                            // InternalTableDSL.g:9548:6: ( (lv_arguments_10_0= ruleXExpression ) )
+                            // InternalTableDSL.g:9549:7: (lv_arguments_10_0= ruleXExpression )
                             {
-                            // InternalTableDSL.g:10079:7: (lv_arguments_10_0= ruleXExpression )
-                            // InternalTableDSL.g:10080:8: lv_arguments_10_0= ruleXExpression
+                            // InternalTableDSL.g:9549:7: (lv_arguments_10_0= ruleXExpression )
+                            // InternalTableDSL.g:9550:8: lv_arguments_10_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
 
                               								newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_0_0());
                               							
                             }
-                            pushFollow(FOLLOW_63);
+                            pushFollow(FOLLOW_62);
                             lv_arguments_10_0=ruleXExpression();
 
                             state._fsp--;
@@ -28143,39 +26769,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalTableDSL.g:10097:6: (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
-                            loop141:
+                            // InternalTableDSL.g:9567:6: (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
+                            loop136:
                             do {
-                                int alt141=2;
-                                int LA141_0 = input.LA(1);
+                                int alt136=2;
+                                int LA136_0 = input.LA(1);
 
-                                if ( (LA141_0==104) ) {
-                                    alt141=1;
+                                if ( (LA136_0==101) ) {
+                                    alt136=1;
                                 }
 
 
-                                switch (alt141) {
+                                switch (alt136) {
                             	case 1 :
-                            	    // InternalTableDSL.g:10098:7: otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) )
+                            	    // InternalTableDSL.g:9568:7: otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) )
                             	    {
-                            	    otherlv_11=(Token)match(input,104,FOLLOW_66); if (state.failed) return current;
+                            	    otherlv_11=(Token)match(input,101,FOLLOW_65); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      							newLeafNode(otherlv_11, grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0());
                             	      						
                             	    }
-                            	    // InternalTableDSL.g:10102:7: ( (lv_arguments_12_0= ruleXExpression ) )
-                            	    // InternalTableDSL.g:10103:8: (lv_arguments_12_0= ruleXExpression )
+                            	    // InternalTableDSL.g:9572:7: ( (lv_arguments_12_0= ruleXExpression ) )
+                            	    // InternalTableDSL.g:9573:8: (lv_arguments_12_0= ruleXExpression )
                             	    {
-                            	    // InternalTableDSL.g:10103:8: (lv_arguments_12_0= ruleXExpression )
-                            	    // InternalTableDSL.g:10104:9: lv_arguments_12_0= ruleXExpression
+                            	    // InternalTableDSL.g:9573:8: (lv_arguments_12_0= ruleXExpression )
+                            	    // InternalTableDSL.g:9574:9: lv_arguments_12_0= ruleXExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
 
                             	      									newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_1_1_0());
                             	      								
                             	    }
-                            	    pushFollow(FOLLOW_63);
+                            	    pushFollow(FOLLOW_62);
                             	    lv_arguments_12_0=ruleXExpression();
 
                             	    state._fsp--;
@@ -28204,7 +26830,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    break loop141;
+                            	    break loop136;
                                 }
                             } while (true);
 
@@ -28217,7 +26843,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_13=(Token)match(input,105,FOLLOW_122); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,102,FOLLOW_121); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_13, grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2());
@@ -28229,15 +26855,15 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:10129:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
-            int alt144=2;
-            alt144 = dfa144.predict(input);
-            switch (alt144) {
+            // InternalTableDSL.g:9599:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
+            int alt139=2;
+            alt139 = dfa139.predict(input);
+            switch (alt139) {
                 case 1 :
-                    // InternalTableDSL.g:10130:4: ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure )
+                    // InternalTableDSL.g:9600:4: ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure )
                     {
-                    // InternalTableDSL.g:10136:4: (lv_arguments_14_0= ruleXClosure )
-                    // InternalTableDSL.g:10137:5: lv_arguments_14_0= ruleXClosure
+                    // InternalTableDSL.g:9606:4: (lv_arguments_14_0= ruleXClosure )
+                    // InternalTableDSL.g:9607:5: lv_arguments_14_0= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
 
@@ -28296,7 +26922,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXBooleanLiteral"
-    // InternalTableDSL.g:10158:1: entryRuleXBooleanLiteral returns [EObject current=null] : iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF ;
+    // InternalTableDSL.g:9628:1: entryRuleXBooleanLiteral returns [EObject current=null] : iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF ;
     public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -28304,8 +26930,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:10158:56: (iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF )
-            // InternalTableDSL.g:10159:2: iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF
+            // InternalTableDSL.g:9628:56: (iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF )
+            // InternalTableDSL.g:9629:2: iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBooleanLiteralRule()); 
@@ -28336,7 +26962,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXBooleanLiteral"
-    // InternalTableDSL.g:10165:1: ruleXBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
+    // InternalTableDSL.g:9635:1: ruleXBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
     public final EObject ruleXBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -28347,14 +26973,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:10171:2: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
-            // InternalTableDSL.g:10172:2: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalTableDSL.g:9641:2: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
+            // InternalTableDSL.g:9642:2: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
             {
-            // InternalTableDSL.g:10172:2: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
-            // InternalTableDSL.g:10173:3: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalTableDSL.g:9642:2: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalTableDSL.g:9643:3: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             {
-            // InternalTableDSL.g:10173:3: ()
-            // InternalTableDSL.g:10174:4: 
+            // InternalTableDSL.g:9643:3: ()
+            // InternalTableDSL.g:9644:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -28366,28 +26992,28 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:10180:3: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
-            int alt145=2;
-            int LA145_0 = input.LA(1);
+            // InternalTableDSL.g:9650:3: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            int alt140=2;
+            int LA140_0 = input.LA(1);
 
-            if ( (LA145_0==154) ) {
-                alt145=1;
+            if ( (LA140_0==151) ) {
+                alt140=1;
             }
-            else if ( (LA145_0==155) ) {
-                alt145=2;
+            else if ( (LA140_0==152) ) {
+                alt140=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 145, 0, input);
+                    new NoViableAltException("", 140, 0, input);
 
                 throw nvae;
             }
-            switch (alt145) {
+            switch (alt140) {
                 case 1 :
-                    // InternalTableDSL.g:10181:4: otherlv_1= 'false'
+                    // InternalTableDSL.g:9651:4: otherlv_1= 'false'
                     {
-                    otherlv_1=(Token)match(input,154,FOLLOW_2); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,151,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_1, grammarAccess.getXBooleanLiteralAccess().getFalseKeyword_1_0());
@@ -28397,15 +27023,15 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:10186:4: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalTableDSL.g:9656:4: ( (lv_isTrue_2_0= 'true' ) )
                     {
-                    // InternalTableDSL.g:10186:4: ( (lv_isTrue_2_0= 'true' ) )
-                    // InternalTableDSL.g:10187:5: (lv_isTrue_2_0= 'true' )
+                    // InternalTableDSL.g:9656:4: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalTableDSL.g:9657:5: (lv_isTrue_2_0= 'true' )
                     {
-                    // InternalTableDSL.g:10187:5: (lv_isTrue_2_0= 'true' )
-                    // InternalTableDSL.g:10188:6: lv_isTrue_2_0= 'true'
+                    // InternalTableDSL.g:9657:5: (lv_isTrue_2_0= 'true' )
+                    // InternalTableDSL.g:9658:6: lv_isTrue_2_0= 'true'
                     {
-                    lv_isTrue_2_0=(Token)match(input,155,FOLLOW_2); if (state.failed) return current;
+                    lv_isTrue_2_0=(Token)match(input,152,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(lv_isTrue_2_0, grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0());
@@ -28456,7 +27082,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXNullLiteral"
-    // InternalTableDSL.g:10205:1: entryRuleXNullLiteral returns [EObject current=null] : iv_ruleXNullLiteral= ruleXNullLiteral EOF ;
+    // InternalTableDSL.g:9675:1: entryRuleXNullLiteral returns [EObject current=null] : iv_ruleXNullLiteral= ruleXNullLiteral EOF ;
     public final EObject entryRuleXNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -28464,8 +27090,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:10205:53: (iv_ruleXNullLiteral= ruleXNullLiteral EOF )
-            // InternalTableDSL.g:10206:2: iv_ruleXNullLiteral= ruleXNullLiteral EOF
+            // InternalTableDSL.g:9675:53: (iv_ruleXNullLiteral= ruleXNullLiteral EOF )
+            // InternalTableDSL.g:9676:2: iv_ruleXNullLiteral= ruleXNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXNullLiteralRule()); 
@@ -28496,7 +27122,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXNullLiteral"
-    // InternalTableDSL.g:10212:1: ruleXNullLiteral returns [EObject current=null] : ( () otherlv_1= 'null' ) ;
+    // InternalTableDSL.g:9682:1: ruleXNullLiteral returns [EObject current=null] : ( () otherlv_1= 'null' ) ;
     public final EObject ruleXNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -28506,14 +27132,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:10218:2: ( ( () otherlv_1= 'null' ) )
-            // InternalTableDSL.g:10219:2: ( () otherlv_1= 'null' )
+            // InternalTableDSL.g:9688:2: ( ( () otherlv_1= 'null' ) )
+            // InternalTableDSL.g:9689:2: ( () otherlv_1= 'null' )
             {
-            // InternalTableDSL.g:10219:2: ( () otherlv_1= 'null' )
-            // InternalTableDSL.g:10220:3: () otherlv_1= 'null'
+            // InternalTableDSL.g:9689:2: ( () otherlv_1= 'null' )
+            // InternalTableDSL.g:9690:3: () otherlv_1= 'null'
             {
-            // InternalTableDSL.g:10220:3: ()
-            // InternalTableDSL.g:10221:4: 
+            // InternalTableDSL.g:9690:3: ()
+            // InternalTableDSL.g:9691:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -28525,7 +27151,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,156,FOLLOW_2); if (state.failed) return current;
+            otherlv_1=(Token)match(input,153,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXNullLiteralAccess().getNullKeyword_1());
@@ -28556,7 +27182,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXNumberLiteral"
-    // InternalTableDSL.g:10235:1: entryRuleXNumberLiteral returns [EObject current=null] : iv_ruleXNumberLiteral= ruleXNumberLiteral EOF ;
+    // InternalTableDSL.g:9705:1: entryRuleXNumberLiteral returns [EObject current=null] : iv_ruleXNumberLiteral= ruleXNumberLiteral EOF ;
     public final EObject entryRuleXNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -28564,8 +27190,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:10235:55: (iv_ruleXNumberLiteral= ruleXNumberLiteral EOF )
-            // InternalTableDSL.g:10236:2: iv_ruleXNumberLiteral= ruleXNumberLiteral EOF
+            // InternalTableDSL.g:9705:55: (iv_ruleXNumberLiteral= ruleXNumberLiteral EOF )
+            // InternalTableDSL.g:9706:2: iv_ruleXNumberLiteral= ruleXNumberLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXNumberLiteralRule()); 
@@ -28596,7 +27222,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXNumberLiteral"
-    // InternalTableDSL.g:10242:1: ruleXNumberLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleNumber ) ) ) ;
+    // InternalTableDSL.g:9712:1: ruleXNumberLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleNumber ) ) ) ;
     public final EObject ruleXNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -28607,14 +27233,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:10248:2: ( ( () ( (lv_value_1_0= ruleNumber ) ) ) )
-            // InternalTableDSL.g:10249:2: ( () ( (lv_value_1_0= ruleNumber ) ) )
+            // InternalTableDSL.g:9718:2: ( ( () ( (lv_value_1_0= ruleNumber ) ) ) )
+            // InternalTableDSL.g:9719:2: ( () ( (lv_value_1_0= ruleNumber ) ) )
             {
-            // InternalTableDSL.g:10249:2: ( () ( (lv_value_1_0= ruleNumber ) ) )
-            // InternalTableDSL.g:10250:3: () ( (lv_value_1_0= ruleNumber ) )
+            // InternalTableDSL.g:9719:2: ( () ( (lv_value_1_0= ruleNumber ) ) )
+            // InternalTableDSL.g:9720:3: () ( (lv_value_1_0= ruleNumber ) )
             {
-            // InternalTableDSL.g:10250:3: ()
-            // InternalTableDSL.g:10251:4: 
+            // InternalTableDSL.g:9720:3: ()
+            // InternalTableDSL.g:9721:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -28626,11 +27252,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:10257:3: ( (lv_value_1_0= ruleNumber ) )
-            // InternalTableDSL.g:10258:4: (lv_value_1_0= ruleNumber )
+            // InternalTableDSL.g:9727:3: ( (lv_value_1_0= ruleNumber ) )
+            // InternalTableDSL.g:9728:4: (lv_value_1_0= ruleNumber )
             {
-            // InternalTableDSL.g:10258:4: (lv_value_1_0= ruleNumber )
-            // InternalTableDSL.g:10259:5: lv_value_1_0= ruleNumber
+            // InternalTableDSL.g:9728:4: (lv_value_1_0= ruleNumber )
+            // InternalTableDSL.g:9729:5: lv_value_1_0= ruleNumber
             {
             if ( state.backtracking==0 ) {
 
@@ -28686,7 +27312,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXStringLiteral"
-    // InternalTableDSL.g:10280:1: entryRuleXStringLiteral returns [EObject current=null] : iv_ruleXStringLiteral= ruleXStringLiteral EOF ;
+    // InternalTableDSL.g:9750:1: entryRuleXStringLiteral returns [EObject current=null] : iv_ruleXStringLiteral= ruleXStringLiteral EOF ;
     public final EObject entryRuleXStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -28694,8 +27320,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:10280:55: (iv_ruleXStringLiteral= ruleXStringLiteral EOF )
-            // InternalTableDSL.g:10281:2: iv_ruleXStringLiteral= ruleXStringLiteral EOF
+            // InternalTableDSL.g:9750:55: (iv_ruleXStringLiteral= ruleXStringLiteral EOF )
+            // InternalTableDSL.g:9751:2: iv_ruleXStringLiteral= ruleXStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXStringLiteralRule()); 
@@ -28726,7 +27352,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXStringLiteral"
-    // InternalTableDSL.g:10287:1: ruleXStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
+    // InternalTableDSL.g:9757:1: ruleXStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleXStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -28736,14 +27362,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:10293:2: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
-            // InternalTableDSL.g:10294:2: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:9763:2: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
+            // InternalTableDSL.g:9764:2: ( () ( (lv_value_1_0= RULE_STRING ) ) )
             {
-            // InternalTableDSL.g:10294:2: ( () ( (lv_value_1_0= RULE_STRING ) ) )
-            // InternalTableDSL.g:10295:3: () ( (lv_value_1_0= RULE_STRING ) )
+            // InternalTableDSL.g:9764:2: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalTableDSL.g:9765:3: () ( (lv_value_1_0= RULE_STRING ) )
             {
-            // InternalTableDSL.g:10295:3: ()
-            // InternalTableDSL.g:10296:4: 
+            // InternalTableDSL.g:9765:3: ()
+            // InternalTableDSL.g:9766:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -28755,11 +27381,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:10302:3: ( (lv_value_1_0= RULE_STRING ) )
-            // InternalTableDSL.g:10303:4: (lv_value_1_0= RULE_STRING )
+            // InternalTableDSL.g:9772:3: ( (lv_value_1_0= RULE_STRING ) )
+            // InternalTableDSL.g:9773:4: (lv_value_1_0= RULE_STRING )
             {
-            // InternalTableDSL.g:10303:4: (lv_value_1_0= RULE_STRING )
-            // InternalTableDSL.g:10304:5: lv_value_1_0= RULE_STRING
+            // InternalTableDSL.g:9773:4: (lv_value_1_0= RULE_STRING )
+            // InternalTableDSL.g:9774:5: lv_value_1_0= RULE_STRING
             {
             lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
@@ -28810,7 +27436,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXTypeLiteral"
-    // InternalTableDSL.g:10324:1: entryRuleXTypeLiteral returns [EObject current=null] : iv_ruleXTypeLiteral= ruleXTypeLiteral EOF ;
+    // InternalTableDSL.g:9794:1: entryRuleXTypeLiteral returns [EObject current=null] : iv_ruleXTypeLiteral= ruleXTypeLiteral EOF ;
     public final EObject entryRuleXTypeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -28818,8 +27444,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:10324:53: (iv_ruleXTypeLiteral= ruleXTypeLiteral EOF )
-            // InternalTableDSL.g:10325:2: iv_ruleXTypeLiteral= ruleXTypeLiteral EOF
+            // InternalTableDSL.g:9794:53: (iv_ruleXTypeLiteral= ruleXTypeLiteral EOF )
+            // InternalTableDSL.g:9795:2: iv_ruleXTypeLiteral= ruleXTypeLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXTypeLiteralRule()); 
@@ -28850,7 +27476,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXTypeLiteral"
-    // InternalTableDSL.g:10331:1: ruleXTypeLiteral returns [EObject current=null] : ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) ;
+    // InternalTableDSL.g:9801:1: ruleXTypeLiteral returns [EObject current=null] : ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) ;
     public final EObject ruleXTypeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -28864,14 +27490,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:10337:2: ( ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) )
-            // InternalTableDSL.g:10338:2: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
+            // InternalTableDSL.g:9807:2: ( ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) )
+            // InternalTableDSL.g:9808:2: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
             {
-            // InternalTableDSL.g:10338:2: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
-            // InternalTableDSL.g:10339:3: () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')'
+            // InternalTableDSL.g:9808:2: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
+            // InternalTableDSL.g:9809:3: () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')'
             {
-            // InternalTableDSL.g:10339:3: ()
-            // InternalTableDSL.g:10340:4: 
+            // InternalTableDSL.g:9809:3: ()
+            // InternalTableDSL.g:9810:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -28883,23 +27509,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,157,FOLLOW_104); if (state.failed) return current;
+            otherlv_1=(Token)match(input,154,FOLLOW_103); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,103,FOLLOW_4); if (state.failed) return current;
+            otherlv_2=(Token)match(input,100,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2());
               		
             }
-            // InternalTableDSL.g:10354:3: ( ( ruleQualifiedName ) )
-            // InternalTableDSL.g:10355:4: ( ruleQualifiedName )
+            // InternalTableDSL.g:9824:3: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:9825:4: ( ruleQualifiedName )
             {
-            // InternalTableDSL.g:10355:4: ( ruleQualifiedName )
-            // InternalTableDSL.g:10356:5: ruleQualifiedName
+            // InternalTableDSL.g:9825:4: ( ruleQualifiedName )
+            // InternalTableDSL.g:9826:5: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -28913,7 +27539,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               					newCompositeNode(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeCrossReference_3_0());
               				
             }
-            pushFollow(FOLLOW_124);
+            pushFollow(FOLLOW_123);
             ruleQualifiedName();
 
             state._fsp--;
@@ -28929,30 +27555,30 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:10370:3: ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )*
-            loop146:
+            // InternalTableDSL.g:9840:3: ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )*
+            loop141:
             do {
-                int alt146=2;
-                int LA146_0 = input.LA(1);
+                int alt141=2;
+                int LA141_0 = input.LA(1);
 
-                if ( (LA146_0==108) ) {
-                    alt146=1;
+                if ( (LA141_0==105) ) {
+                    alt141=1;
                 }
 
 
-                switch (alt146) {
+                switch (alt141) {
             	case 1 :
-            	    // InternalTableDSL.g:10371:4: (lv_arrayDimensions_4_0= ruleArrayBrackets )
+            	    // InternalTableDSL.g:9841:4: (lv_arrayDimensions_4_0= ruleArrayBrackets )
             	    {
-            	    // InternalTableDSL.g:10371:4: (lv_arrayDimensions_4_0= ruleArrayBrackets )
-            	    // InternalTableDSL.g:10372:5: lv_arrayDimensions_4_0= ruleArrayBrackets
+            	    // InternalTableDSL.g:9841:4: (lv_arrayDimensions_4_0= ruleArrayBrackets )
+            	    // InternalTableDSL.g:9842:5: lv_arrayDimensions_4_0= ruleArrayBrackets
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      					newCompositeNode(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsArrayBracketsParserRuleCall_4_0());
             	      				
             	    }
-            	    pushFollow(FOLLOW_124);
+            	    pushFollow(FOLLOW_123);
             	    lv_arrayDimensions_4_0=ruleArrayBrackets();
 
             	    state._fsp--;
@@ -28978,11 +27604,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop146;
+            	    break loop141;
                 }
             } while (true);
 
-            otherlv_5=(Token)match(input,105,FOLLOW_2); if (state.failed) return current;
+            otherlv_5=(Token)match(input,102,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_5, grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5());
@@ -29013,7 +27639,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXThrowExpression"
-    // InternalTableDSL.g:10397:1: entryRuleXThrowExpression returns [EObject current=null] : iv_ruleXThrowExpression= ruleXThrowExpression EOF ;
+    // InternalTableDSL.g:9867:1: entryRuleXThrowExpression returns [EObject current=null] : iv_ruleXThrowExpression= ruleXThrowExpression EOF ;
     public final EObject entryRuleXThrowExpression() throws RecognitionException {
         EObject current = null;
 
@@ -29021,8 +27647,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:10397:57: (iv_ruleXThrowExpression= ruleXThrowExpression EOF )
-            // InternalTableDSL.g:10398:2: iv_ruleXThrowExpression= ruleXThrowExpression EOF
+            // InternalTableDSL.g:9867:57: (iv_ruleXThrowExpression= ruleXThrowExpression EOF )
+            // InternalTableDSL.g:9868:2: iv_ruleXThrowExpression= ruleXThrowExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXThrowExpressionRule()); 
@@ -29053,7 +27679,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXThrowExpression"
-    // InternalTableDSL.g:10404:1: ruleXThrowExpression returns [EObject current=null] : ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) ;
+    // InternalTableDSL.g:9874:1: ruleXThrowExpression returns [EObject current=null] : ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) ;
     public final EObject ruleXThrowExpression() throws RecognitionException {
         EObject current = null;
 
@@ -29065,14 +27691,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:10410:2: ( ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) )
-            // InternalTableDSL.g:10411:2: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
+            // InternalTableDSL.g:9880:2: ( ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) )
+            // InternalTableDSL.g:9881:2: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
             {
-            // InternalTableDSL.g:10411:2: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
-            // InternalTableDSL.g:10412:3: () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) )
+            // InternalTableDSL.g:9881:2: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
+            // InternalTableDSL.g:9882:3: () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) )
             {
-            // InternalTableDSL.g:10412:3: ()
-            // InternalTableDSL.g:10413:4: 
+            // InternalTableDSL.g:9882:3: ()
+            // InternalTableDSL.g:9883:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -29084,17 +27710,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,158,FOLLOW_66); if (state.failed) return current;
+            otherlv_1=(Token)match(input,155,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1());
               		
             }
-            // InternalTableDSL.g:10423:3: ( (lv_expression_2_0= ruleXExpression ) )
-            // InternalTableDSL.g:10424:4: (lv_expression_2_0= ruleXExpression )
+            // InternalTableDSL.g:9893:3: ( (lv_expression_2_0= ruleXExpression ) )
+            // InternalTableDSL.g:9894:4: (lv_expression_2_0= ruleXExpression )
             {
-            // InternalTableDSL.g:10424:4: (lv_expression_2_0= ruleXExpression )
-            // InternalTableDSL.g:10425:5: lv_expression_2_0= ruleXExpression
+            // InternalTableDSL.g:9894:4: (lv_expression_2_0= ruleXExpression )
+            // InternalTableDSL.g:9895:5: lv_expression_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -29150,7 +27776,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXReturnExpression"
-    // InternalTableDSL.g:10446:1: entryRuleXReturnExpression returns [EObject current=null] : iv_ruleXReturnExpression= ruleXReturnExpression EOF ;
+    // InternalTableDSL.g:9916:1: entryRuleXReturnExpression returns [EObject current=null] : iv_ruleXReturnExpression= ruleXReturnExpression EOF ;
     public final EObject entryRuleXReturnExpression() throws RecognitionException {
         EObject current = null;
 
@@ -29158,8 +27784,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:10446:58: (iv_ruleXReturnExpression= ruleXReturnExpression EOF )
-            // InternalTableDSL.g:10447:2: iv_ruleXReturnExpression= ruleXReturnExpression EOF
+            // InternalTableDSL.g:9916:58: (iv_ruleXReturnExpression= ruleXReturnExpression EOF )
+            // InternalTableDSL.g:9917:2: iv_ruleXReturnExpression= ruleXReturnExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXReturnExpressionRule()); 
@@ -29190,7 +27816,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXReturnExpression"
-    // InternalTableDSL.g:10453:1: ruleXReturnExpression returns [EObject current=null] : ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) ;
+    // InternalTableDSL.g:9923:1: ruleXReturnExpression returns [EObject current=null] : ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) ;
     public final EObject ruleXReturnExpression() throws RecognitionException {
         EObject current = null;
 
@@ -29202,14 +27828,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:10459:2: ( ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) )
-            // InternalTableDSL.g:10460:2: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
+            // InternalTableDSL.g:9929:2: ( ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) )
+            // InternalTableDSL.g:9930:2: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
             {
-            // InternalTableDSL.g:10460:2: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
-            // InternalTableDSL.g:10461:3: () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
+            // InternalTableDSL.g:9930:2: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
+            // InternalTableDSL.g:9931:3: () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
             {
-            // InternalTableDSL.g:10461:3: ()
-            // InternalTableDSL.g:10462:4: 
+            // InternalTableDSL.g:9931:3: ()
+            // InternalTableDSL.g:9932:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -29221,21 +27847,21 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,159,FOLLOW_125); if (state.failed) return current;
+            otherlv_1=(Token)match(input,156,FOLLOW_124); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1());
               		
             }
-            // InternalTableDSL.g:10472:3: ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
-            int alt147=2;
-            alt147 = dfa147.predict(input);
-            switch (alt147) {
+            // InternalTableDSL.g:9942:3: ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
+            int alt142=2;
+            alt142 = dfa142.predict(input);
+            switch (alt142) {
                 case 1 :
-                    // InternalTableDSL.g:10473:4: ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression )
+                    // InternalTableDSL.g:9943:4: ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression )
                     {
-                    // InternalTableDSL.g:10474:4: (lv_expression_2_0= ruleXExpression )
-                    // InternalTableDSL.g:10475:5: lv_expression_2_0= ruleXExpression
+                    // InternalTableDSL.g:9944:4: (lv_expression_2_0= ruleXExpression )
+                    // InternalTableDSL.g:9945:5: lv_expression_2_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -29294,7 +27920,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXTryCatchFinallyExpression"
-    // InternalTableDSL.g:10496:1: entryRuleXTryCatchFinallyExpression returns [EObject current=null] : iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF ;
+    // InternalTableDSL.g:9966:1: entryRuleXTryCatchFinallyExpression returns [EObject current=null] : iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF ;
     public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionException {
         EObject current = null;
 
@@ -29302,8 +27928,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:10496:67: (iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF )
-            // InternalTableDSL.g:10497:2: iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF
+            // InternalTableDSL.g:9966:67: (iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF )
+            // InternalTableDSL.g:9967:2: iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionRule()); 
@@ -29334,7 +27960,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXTryCatchFinallyExpression"
-    // InternalTableDSL.g:10503:1: ruleXTryCatchFinallyExpression returns [EObject current=null] : ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) ;
+    // InternalTableDSL.g:9973:1: ruleXTryCatchFinallyExpression returns [EObject current=null] : ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) ;
     public final EObject ruleXTryCatchFinallyExpression() throws RecognitionException {
         EObject current = null;
 
@@ -29354,14 +27980,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:10509:2: ( ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) )
-            // InternalTableDSL.g:10510:2: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
+            // InternalTableDSL.g:9979:2: ( ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) )
+            // InternalTableDSL.g:9980:2: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
             {
-            // InternalTableDSL.g:10510:2: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
-            // InternalTableDSL.g:10511:3: () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
+            // InternalTableDSL.g:9980:2: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
+            // InternalTableDSL.g:9981:3: () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
             {
-            // InternalTableDSL.g:10511:3: ()
-            // InternalTableDSL.g:10512:4: 
+            // InternalTableDSL.g:9981:3: ()
+            // InternalTableDSL.g:9982:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -29373,24 +27999,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,160,FOLLOW_66); if (state.failed) return current;
+            otherlv_1=(Token)match(input,157,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1());
               		
             }
-            // InternalTableDSL.g:10522:3: ( (lv_expression_2_0= ruleXExpression ) )
-            // InternalTableDSL.g:10523:4: (lv_expression_2_0= ruleXExpression )
+            // InternalTableDSL.g:9992:3: ( (lv_expression_2_0= ruleXExpression ) )
+            // InternalTableDSL.g:9993:4: (lv_expression_2_0= ruleXExpression )
             {
-            // InternalTableDSL.g:10523:4: (lv_expression_2_0= ruleXExpression )
-            // InternalTableDSL.g:10524:5: lv_expression_2_0= ruleXExpression
+            // InternalTableDSL.g:9993:4: (lv_expression_2_0= ruleXExpression )
+            // InternalTableDSL.g:9994:5: lv_expression_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionXExpressionParserRuleCall_2_0());
               				
             }
-            pushFollow(FOLLOW_126);
+            pushFollow(FOLLOW_125);
             lv_expression_2_0=ruleXExpression();
 
             state._fsp--;
@@ -29414,61 +28040,61 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:10541:3: ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
-            int alt150=2;
-            int LA150_0 = input.LA(1);
+            // InternalTableDSL.g:10011:3: ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
+            int alt145=2;
+            int LA145_0 = input.LA(1);
 
-            if ( (LA150_0==163) ) {
-                alt150=1;
+            if ( (LA145_0==160) ) {
+                alt145=1;
             }
-            else if ( (LA150_0==161) ) {
-                alt150=2;
+            else if ( (LA145_0==158) ) {
+                alt145=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 150, 0, input);
+                    new NoViableAltException("", 145, 0, input);
 
                 throw nvae;
             }
-            switch (alt150) {
+            switch (alt145) {
                 case 1 :
-                    // InternalTableDSL.g:10542:4: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
+                    // InternalTableDSL.g:10012:4: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
                     {
-                    // InternalTableDSL.g:10542:4: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
-                    // InternalTableDSL.g:10543:5: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
+                    // InternalTableDSL.g:10012:4: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
+                    // InternalTableDSL.g:10013:5: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
                     {
-                    // InternalTableDSL.g:10543:5: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+
-                    int cnt148=0;
-                    loop148:
+                    // InternalTableDSL.g:10013:5: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+
+                    int cnt143=0;
+                    loop143:
                     do {
-                        int alt148=2;
-                        int LA148_0 = input.LA(1);
+                        int alt143=2;
+                        int LA143_0 = input.LA(1);
 
-                        if ( (LA148_0==163) ) {
-                            int LA148_2 = input.LA(2);
+                        if ( (LA143_0==160) ) {
+                            int LA143_2 = input.LA(2);
 
                             if ( (synpred44_InternalTableDSL()) ) {
-                                alt148=1;
+                                alt143=1;
                             }
 
 
                         }
 
 
-                        switch (alt148) {
+                        switch (alt143) {
                     	case 1 :
-                    	    // InternalTableDSL.g:10544:6: ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause )
+                    	    // InternalTableDSL.g:10014:6: ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause )
                     	    {
-                    	    // InternalTableDSL.g:10545:6: (lv_catchClauses_3_0= ruleXCatchClause )
-                    	    // InternalTableDSL.g:10546:7: lv_catchClauses_3_0= ruleXCatchClause
+                    	    // InternalTableDSL.g:10015:6: (lv_catchClauses_3_0= ruleXCatchClause )
+                    	    // InternalTableDSL.g:10016:7: lv_catchClauses_3_0= ruleXCatchClause
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      							newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesXCatchClauseParserRuleCall_3_0_0_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_127);
+                    	    pushFollow(FOLLOW_126);
                     	    lv_catchClauses_3_0=ruleXCatchClause();
 
                     	    state._fsp--;
@@ -29494,34 +28120,34 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    if ( cnt148 >= 1 ) break loop148;
+                    	    if ( cnt143 >= 1 ) break loop143;
                     	    if (state.backtracking>0) {state.failed=true; return current;}
                                 EarlyExitException eee =
-                                    new EarlyExitException(148, input);
+                                    new EarlyExitException(143, input);
                                 throw eee;
                         }
-                        cnt148++;
+                        cnt143++;
                     } while (true);
 
-                    // InternalTableDSL.g:10563:5: ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
-                    int alt149=2;
-                    int LA149_0 = input.LA(1);
+                    // InternalTableDSL.g:10033:5: ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
+                    int alt144=2;
+                    int LA144_0 = input.LA(1);
 
-                    if ( (LA149_0==161) ) {
-                        int LA149_1 = input.LA(2);
+                    if ( (LA144_0==158) ) {
+                        int LA144_1 = input.LA(2);
 
                         if ( (synpred45_InternalTableDSL()) ) {
-                            alt149=1;
+                            alt144=1;
                         }
                     }
-                    switch (alt149) {
+                    switch (alt144) {
                         case 1 :
-                            // InternalTableDSL.g:10564:6: ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) )
+                            // InternalTableDSL.g:10034:6: ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) )
                             {
-                            // InternalTableDSL.g:10564:6: ( ( 'finally' )=>otherlv_4= 'finally' )
-                            // InternalTableDSL.g:10565:7: ( 'finally' )=>otherlv_4= 'finally'
+                            // InternalTableDSL.g:10034:6: ( ( 'finally' )=>otherlv_4= 'finally' )
+                            // InternalTableDSL.g:10035:7: ( 'finally' )=>otherlv_4= 'finally'
                             {
-                            otherlv_4=(Token)match(input,161,FOLLOW_66); if (state.failed) return current;
+                            otherlv_4=(Token)match(input,158,FOLLOW_65); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               							newLeafNode(otherlv_4, grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_0_1_0());
@@ -29530,11 +28156,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalTableDSL.g:10571:6: ( (lv_finallyExpression_5_0= ruleXExpression ) )
-                            // InternalTableDSL.g:10572:7: (lv_finallyExpression_5_0= ruleXExpression )
+                            // InternalTableDSL.g:10041:6: ( (lv_finallyExpression_5_0= ruleXExpression ) )
+                            // InternalTableDSL.g:10042:7: (lv_finallyExpression_5_0= ruleXExpression )
                             {
-                            // InternalTableDSL.g:10572:7: (lv_finallyExpression_5_0= ruleXExpression )
-                            // InternalTableDSL.g:10573:8: lv_finallyExpression_5_0= ruleXExpression
+                            // InternalTableDSL.g:10042:7: (lv_finallyExpression_5_0= ruleXExpression )
+                            // InternalTableDSL.g:10043:8: lv_finallyExpression_5_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
 
@@ -29578,22 +28204,22 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:10593:4: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
+                    // InternalTableDSL.g:10063:4: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
                     {
-                    // InternalTableDSL.g:10593:4: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
-                    // InternalTableDSL.g:10594:5: otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) )
+                    // InternalTableDSL.g:10063:4: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
+                    // InternalTableDSL.g:10064:5: otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) )
                     {
-                    otherlv_6=(Token)match(input,161,FOLLOW_66); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,158,FOLLOW_65); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(otherlv_6, grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0());
                       				
                     }
-                    // InternalTableDSL.g:10598:5: ( (lv_finallyExpression_7_0= ruleXExpression ) )
-                    // InternalTableDSL.g:10599:6: (lv_finallyExpression_7_0= ruleXExpression )
+                    // InternalTableDSL.g:10068:5: ( (lv_finallyExpression_7_0= ruleXExpression ) )
+                    // InternalTableDSL.g:10069:6: (lv_finallyExpression_7_0= ruleXExpression )
                     {
-                    // InternalTableDSL.g:10599:6: (lv_finallyExpression_7_0= ruleXExpression )
-                    // InternalTableDSL.g:10600:7: lv_finallyExpression_7_0= ruleXExpression
+                    // InternalTableDSL.g:10069:6: (lv_finallyExpression_7_0= ruleXExpression )
+                    // InternalTableDSL.g:10070:7: lv_finallyExpression_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -29658,7 +28284,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXSynchronizedExpression"
-    // InternalTableDSL.g:10623:1: entryRuleXSynchronizedExpression returns [EObject current=null] : iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF ;
+    // InternalTableDSL.g:10093:1: entryRuleXSynchronizedExpression returns [EObject current=null] : iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF ;
     public final EObject entryRuleXSynchronizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -29666,8 +28292,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:10623:64: (iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF )
-            // InternalTableDSL.g:10624:2: iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF
+            // InternalTableDSL.g:10093:64: (iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF )
+            // InternalTableDSL.g:10094:2: iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSynchronizedExpressionRule()); 
@@ -29698,7 +28324,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXSynchronizedExpression"
-    // InternalTableDSL.g:10630:1: ruleXSynchronizedExpression returns [EObject current=null] : ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) ;
+    // InternalTableDSL.g:10100:1: ruleXSynchronizedExpression returns [EObject current=null] : ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) ;
     public final EObject ruleXSynchronizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -29714,20 +28340,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:10636:2: ( ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) )
-            // InternalTableDSL.g:10637:2: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalTableDSL.g:10106:2: ( ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) )
+            // InternalTableDSL.g:10107:2: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
             {
-            // InternalTableDSL.g:10637:2: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
-            // InternalTableDSL.g:10638:3: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalTableDSL.g:10107:2: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalTableDSL.g:10108:3: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) )
             {
-            // InternalTableDSL.g:10638:3: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) )
-            // InternalTableDSL.g:10639:4: ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' )
+            // InternalTableDSL.g:10108:3: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) )
+            // InternalTableDSL.g:10109:4: ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' )
             {
-            // InternalTableDSL.g:10646:4: ( () otherlv_1= 'synchronized' otherlv_2= '(' )
-            // InternalTableDSL.g:10647:5: () otherlv_1= 'synchronized' otherlv_2= '('
+            // InternalTableDSL.g:10116:4: ( () otherlv_1= 'synchronized' otherlv_2= '(' )
+            // InternalTableDSL.g:10117:5: () otherlv_1= 'synchronized' otherlv_2= '('
             {
-            // InternalTableDSL.g:10647:5: ()
-            // InternalTableDSL.g:10648:6: 
+            // InternalTableDSL.g:10117:5: ()
+            // InternalTableDSL.g:10118:6: 
             {
             if ( state.backtracking==0 ) {
 
@@ -29739,13 +28365,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,162,FOLLOW_104); if (state.failed) return current;
+            otherlv_1=(Token)match(input,159,FOLLOW_103); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(otherlv_1, grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1());
               				
             }
-            otherlv_2=(Token)match(input,103,FOLLOW_66); if (state.failed) return current;
+            otherlv_2=(Token)match(input,100,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(otherlv_2, grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2());
@@ -29757,18 +28383,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:10664:3: ( (lv_param_3_0= ruleXExpression ) )
-            // InternalTableDSL.g:10665:4: (lv_param_3_0= ruleXExpression )
+            // InternalTableDSL.g:10134:3: ( (lv_param_3_0= ruleXExpression ) )
+            // InternalTableDSL.g:10135:4: (lv_param_3_0= ruleXExpression )
             {
-            // InternalTableDSL.g:10665:4: (lv_param_3_0= ruleXExpression )
-            // InternalTableDSL.g:10666:5: lv_param_3_0= ruleXExpression
+            // InternalTableDSL.g:10135:4: (lv_param_3_0= ruleXExpression )
+            // InternalTableDSL.g:10136:5: lv_param_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXSynchronizedExpressionAccess().getParamXExpressionParserRuleCall_1_0());
               				
             }
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_63);
             lv_param_3_0=ruleXExpression();
 
             state._fsp--;
@@ -29792,17 +28418,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,105,FOLLOW_66); if (state.failed) return current;
+            otherlv_4=(Token)match(input,102,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_4, grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2());
               		
             }
-            // InternalTableDSL.g:10687:3: ( (lv_expression_5_0= ruleXExpression ) )
-            // InternalTableDSL.g:10688:4: (lv_expression_5_0= ruleXExpression )
+            // InternalTableDSL.g:10157:3: ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalTableDSL.g:10158:4: (lv_expression_5_0= ruleXExpression )
             {
-            // InternalTableDSL.g:10688:4: (lv_expression_5_0= ruleXExpression )
-            // InternalTableDSL.g:10689:5: lv_expression_5_0= ruleXExpression
+            // InternalTableDSL.g:10158:4: (lv_expression_5_0= ruleXExpression )
+            // InternalTableDSL.g:10159:5: lv_expression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -29858,7 +28484,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXCatchClause"
-    // InternalTableDSL.g:10710:1: entryRuleXCatchClause returns [EObject current=null] : iv_ruleXCatchClause= ruleXCatchClause EOF ;
+    // InternalTableDSL.g:10180:1: entryRuleXCatchClause returns [EObject current=null] : iv_ruleXCatchClause= ruleXCatchClause EOF ;
     public final EObject entryRuleXCatchClause() throws RecognitionException {
         EObject current = null;
 
@@ -29866,8 +28492,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:10710:53: (iv_ruleXCatchClause= ruleXCatchClause EOF )
-            // InternalTableDSL.g:10711:2: iv_ruleXCatchClause= ruleXCatchClause EOF
+            // InternalTableDSL.g:10180:53: (iv_ruleXCatchClause= ruleXCatchClause EOF )
+            // InternalTableDSL.g:10181:2: iv_ruleXCatchClause= ruleXCatchClause EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCatchClauseRule()); 
@@ -29898,7 +28524,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXCatchClause"
-    // InternalTableDSL.g:10717:1: ruleXCatchClause returns [EObject current=null] : ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) ;
+    // InternalTableDSL.g:10187:1: ruleXCatchClause returns [EObject current=null] : ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) ;
     public final EObject ruleXCatchClause() throws RecognitionException {
         EObject current = null;
 
@@ -29914,16 +28540,16 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:10723:2: ( ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) )
-            // InternalTableDSL.g:10724:2: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
+            // InternalTableDSL.g:10193:2: ( ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) )
+            // InternalTableDSL.g:10194:2: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
             {
-            // InternalTableDSL.g:10724:2: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
-            // InternalTableDSL.g:10725:3: ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) )
+            // InternalTableDSL.g:10194:2: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
+            // InternalTableDSL.g:10195:3: ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) )
             {
-            // InternalTableDSL.g:10725:3: ( ( 'catch' )=>otherlv_0= 'catch' )
-            // InternalTableDSL.g:10726:4: ( 'catch' )=>otherlv_0= 'catch'
+            // InternalTableDSL.g:10195:3: ( ( 'catch' )=>otherlv_0= 'catch' )
+            // InternalTableDSL.g:10196:4: ( 'catch' )=>otherlv_0= 'catch'
             {
-            otherlv_0=(Token)match(input,163,FOLLOW_104); if (state.failed) return current;
+            otherlv_0=(Token)match(input,160,FOLLOW_103); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               				newLeafNode(otherlv_0, grammarAccess.getXCatchClauseAccess().getCatchKeyword_0());
@@ -29932,24 +28558,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,103,FOLLOW_79); if (state.failed) return current;
+            otherlv_1=(Token)match(input,100,FOLLOW_78); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1());
               		
             }
-            // InternalTableDSL.g:10736:3: ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) )
-            // InternalTableDSL.g:10737:4: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
+            // InternalTableDSL.g:10206:3: ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) )
+            // InternalTableDSL.g:10207:4: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
             {
-            // InternalTableDSL.g:10737:4: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
-            // InternalTableDSL.g:10738:5: lv_declaredParam_2_0= ruleFullJvmFormalParameter
+            // InternalTableDSL.g:10207:4: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
+            // InternalTableDSL.g:10208:5: lv_declaredParam_2_0= ruleFullJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXCatchClauseAccess().getDeclaredParamFullJvmFormalParameterParserRuleCall_2_0());
               				
             }
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_63);
             lv_declaredParam_2_0=ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -29973,17 +28599,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,105,FOLLOW_66); if (state.failed) return current;
+            otherlv_3=(Token)match(input,102,FOLLOW_65); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_3, grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3());
               		
             }
-            // InternalTableDSL.g:10759:3: ( (lv_expression_4_0= ruleXExpression ) )
-            // InternalTableDSL.g:10760:4: (lv_expression_4_0= ruleXExpression )
+            // InternalTableDSL.g:10229:3: ( (lv_expression_4_0= ruleXExpression ) )
+            // InternalTableDSL.g:10230:4: (lv_expression_4_0= ruleXExpression )
             {
-            // InternalTableDSL.g:10760:4: (lv_expression_4_0= ruleXExpression )
-            // InternalTableDSL.g:10761:5: lv_expression_4_0= ruleXExpression
+            // InternalTableDSL.g:10230:4: (lv_expression_4_0= ruleXExpression )
+            // InternalTableDSL.g:10231:5: lv_expression_4_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -30039,7 +28665,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // InternalTableDSL.g:10782:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+    // InternalTableDSL.g:10252:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
     public final String entryRuleQualifiedName() throws RecognitionException {
         String current = null;
 
@@ -30047,8 +28673,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:10782:53: (iv_ruleQualifiedName= ruleQualifiedName EOF )
-            // InternalTableDSL.g:10783:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+            // InternalTableDSL.g:10252:53: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+            // InternalTableDSL.g:10253:2: iv_ruleQualifiedName= ruleQualifiedName EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameRule()); 
@@ -30079,7 +28705,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // InternalTableDSL.g:10789:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
+    // InternalTableDSL.g:10259:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -30093,18 +28719,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:10795:2: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
-            // InternalTableDSL.g:10796:2: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+            // InternalTableDSL.g:10265:2: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
+            // InternalTableDSL.g:10266:2: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
             {
-            // InternalTableDSL.g:10796:2: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
-            // InternalTableDSL.g:10797:3: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+            // InternalTableDSL.g:10266:2: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+            // InternalTableDSL.g:10267:3: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_43);
             this_ValidID_0=ruleValidID();
 
             state._fsp--;
@@ -30119,20 +28745,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalTableDSL.g:10807:3: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
-            loop151:
+            // InternalTableDSL.g:10277:3: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+            loop146:
             do {
-                int alt151=2;
-                int LA151_0 = input.LA(1);
+                int alt146=2;
+                int LA146_0 = input.LA(1);
 
-                if ( (LA151_0==78) ) {
-                    int LA151_2 = input.LA(2);
+                if ( (LA146_0==74) ) {
+                    int LA146_2 = input.LA(2);
 
-                    if ( (LA151_2==RULE_ID) ) {
-                        int LA151_3 = input.LA(3);
+                    if ( (LA146_2==RULE_ID) ) {
+                        int LA146_3 = input.LA(3);
 
                         if ( (synpred48_InternalTableDSL()) ) {
-                            alt151=1;
+                            alt146=1;
                         }
 
 
@@ -30142,14 +28768,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                 }
 
 
-                switch (alt151) {
+                switch (alt146) {
             	case 1 :
-            	    // InternalTableDSL.g:10808:4: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
+            	    // InternalTableDSL.g:10278:4: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
             	    {
-            	    // InternalTableDSL.g:10808:4: ( ( '.' )=>kw= '.' )
-            	    // InternalTableDSL.g:10809:5: ( '.' )=>kw= '.'
+            	    // InternalTableDSL.g:10278:4: ( ( '.' )=>kw= '.' )
+            	    // InternalTableDSL.g:10279:5: ( '.' )=>kw= '.'
             	    {
-            	    kw=(Token)match(input,78,FOLLOW_4); if (state.failed) return current;
+            	    kw=(Token)match(input,74,FOLLOW_4); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      					current.merge(kw);
@@ -30164,7 +28790,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      				newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1());
             	      			
             	    }
-            	    pushFollow(FOLLOW_44);
+            	    pushFollow(FOLLOW_43);
             	    this_ValidID_2=ruleValidID();
 
             	    state._fsp--;
@@ -30184,7 +28810,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop151;
+            	    break loop146;
                 }
             } while (true);
 
@@ -30213,7 +28839,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNumber"
-    // InternalTableDSL.g:10831:1: entryRuleNumber returns [String current=null] : iv_ruleNumber= ruleNumber EOF ;
+    // InternalTableDSL.g:10301:1: entryRuleNumber returns [String current=null] : iv_ruleNumber= ruleNumber EOF ;
     public final String entryRuleNumber() throws RecognitionException {
         String current = null;
 
@@ -30224,8 +28850,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // InternalTableDSL.g:10833:2: (iv_ruleNumber= ruleNumber EOF )
-            // InternalTableDSL.g:10834:2: iv_ruleNumber= ruleNumber EOF
+            // InternalTableDSL.g:10303:2: (iv_ruleNumber= ruleNumber EOF )
+            // InternalTableDSL.g:10304:2: iv_ruleNumber= ruleNumber EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNumberRule()); 
@@ -30259,7 +28885,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNumber"
-    // InternalTableDSL.g:10843:1: ruleNumber returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) ;
+    // InternalTableDSL.g:10313:1: ruleNumber returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) ;
     public final AntlrDatatypeRuleToken ruleNumber() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -30275,29 +28901,29 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // InternalTableDSL.g:10850:2: ( (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) )
-            // InternalTableDSL.g:10851:2: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
+            // InternalTableDSL.g:10320:2: ( (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) )
+            // InternalTableDSL.g:10321:2: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
             {
-            // InternalTableDSL.g:10851:2: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
-            int alt155=2;
-            int LA155_0 = input.LA(1);
+            // InternalTableDSL.g:10321:2: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
+            int alt150=2;
+            int LA150_0 = input.LA(1);
 
-            if ( (LA155_0==RULE_HEX) ) {
-                alt155=1;
+            if ( (LA150_0==RULE_HEX) ) {
+                alt150=1;
             }
-            else if ( (LA155_0==RULE_INT||LA155_0==RULE_DECIMAL) ) {
-                alt155=2;
+            else if ( (LA150_0==RULE_INT||LA150_0==RULE_DECIMAL) ) {
+                alt150=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 155, 0, input);
+                    new NoViableAltException("", 150, 0, input);
 
                 throw nvae;
             }
-            switch (alt155) {
+            switch (alt150) {
                 case 1 :
-                    // InternalTableDSL.g:10852:3: this_HEX_0= RULE_HEX
+                    // InternalTableDSL.g:10322:3: this_HEX_0= RULE_HEX
                     {
                     this_HEX_0=(Token)match(input,RULE_HEX,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
@@ -30314,33 +28940,33 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:10860:3: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
+                    // InternalTableDSL.g:10330:3: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
                     {
-                    // InternalTableDSL.g:10860:3: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
-                    // InternalTableDSL.g:10861:4: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
+                    // InternalTableDSL.g:10330:3: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
+                    // InternalTableDSL.g:10331:4: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
                     {
-                    // InternalTableDSL.g:10861:4: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL )
-                    int alt152=2;
-                    int LA152_0 = input.LA(1);
+                    // InternalTableDSL.g:10331:4: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL )
+                    int alt147=2;
+                    int LA147_0 = input.LA(1);
 
-                    if ( (LA152_0==RULE_INT) ) {
-                        alt152=1;
+                    if ( (LA147_0==RULE_INT) ) {
+                        alt147=1;
                     }
-                    else if ( (LA152_0==RULE_DECIMAL) ) {
-                        alt152=2;
+                    else if ( (LA147_0==RULE_DECIMAL) ) {
+                        alt147=2;
                     }
                     else {
                         if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
-                            new NoViableAltException("", 152, 0, input);
+                            new NoViableAltException("", 147, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt152) {
+                    switch (alt147) {
                         case 1 :
-                            // InternalTableDSL.g:10862:5: this_INT_1= RULE_INT
+                            // InternalTableDSL.g:10332:5: this_INT_1= RULE_INT
                             {
-                            this_INT_1=(Token)match(input,RULE_INT,FOLLOW_44); if (state.failed) return current;
+                            this_INT_1=(Token)match(input,RULE_INT,FOLLOW_43); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               					current.merge(this_INT_1);
@@ -30355,9 +28981,9 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // InternalTableDSL.g:10870:5: this_DECIMAL_2= RULE_DECIMAL
+                            // InternalTableDSL.g:10340:5: this_DECIMAL_2= RULE_DECIMAL
                             {
-                            this_DECIMAL_2=(Token)match(input,RULE_DECIMAL,FOLLOW_44); if (state.failed) return current;
+                            this_DECIMAL_2=(Token)match(input,RULE_DECIMAL,FOLLOW_43); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               					current.merge(this_DECIMAL_2);
@@ -30374,48 +29000,48 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:10878:4: (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
-                    int alt154=2;
-                    int LA154_0 = input.LA(1);
+                    // InternalTableDSL.g:10348:4: (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
+                    int alt149=2;
+                    int LA149_0 = input.LA(1);
 
-                    if ( (LA154_0==78) ) {
-                        int LA154_1 = input.LA(2);
+                    if ( (LA149_0==74) ) {
+                        int LA149_1 = input.LA(2);
 
-                        if ( (LA154_1==RULE_INT||LA154_1==RULE_DECIMAL) ) {
-                            alt154=1;
+                        if ( (LA149_1==RULE_INT||LA149_1==RULE_DECIMAL) ) {
+                            alt149=1;
                         }
                     }
-                    switch (alt154) {
+                    switch (alt149) {
                         case 1 :
-                            // InternalTableDSL.g:10879:5: kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
+                            // InternalTableDSL.g:10349:5: kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
                             {
-                            kw=(Token)match(input,78,FOLLOW_128); if (state.failed) return current;
+                            kw=(Token)match(input,74,FOLLOW_127); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               					current.merge(kw);
                               					newLeafNode(kw, grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0());
                               				
                             }
-                            // InternalTableDSL.g:10884:5: (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
-                            int alt153=2;
-                            int LA153_0 = input.LA(1);
+                            // InternalTableDSL.g:10354:5: (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
+                            int alt148=2;
+                            int LA148_0 = input.LA(1);
 
-                            if ( (LA153_0==RULE_INT) ) {
-                                alt153=1;
+                            if ( (LA148_0==RULE_INT) ) {
+                                alt148=1;
                             }
-                            else if ( (LA153_0==RULE_DECIMAL) ) {
-                                alt153=2;
+                            else if ( (LA148_0==RULE_DECIMAL) ) {
+                                alt148=2;
                             }
                             else {
                                 if (state.backtracking>0) {state.failed=true; return current;}
                                 NoViableAltException nvae =
-                                    new NoViableAltException("", 153, 0, input);
+                                    new NoViableAltException("", 148, 0, input);
 
                                 throw nvae;
                             }
-                            switch (alt153) {
+                            switch (alt148) {
                                 case 1 :
-                                    // InternalTableDSL.g:10885:6: this_INT_4= RULE_INT
+                                    // InternalTableDSL.g:10355:6: this_INT_4= RULE_INT
                                     {
                                     this_INT_4=(Token)match(input,RULE_INT,FOLLOW_2); if (state.failed) return current;
                                     if ( state.backtracking==0 ) {
@@ -30432,7 +29058,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                                     }
                                     break;
                                 case 2 :
-                                    // InternalTableDSL.g:10893:6: this_DECIMAL_5= RULE_DECIMAL
+                                    // InternalTableDSL.g:10363:6: this_DECIMAL_5= RULE_DECIMAL
                                     {
                                     this_DECIMAL_5=(Token)match(input,RULE_DECIMAL,FOLLOW_2); if (state.failed) return current;
                                     if ( state.backtracking==0 ) {
@@ -30491,7 +29117,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmTypeReference"
-    // InternalTableDSL.g:10910:1: entryRuleJvmTypeReference returns [EObject current=null] : iv_ruleJvmTypeReference= ruleJvmTypeReference EOF ;
+    // InternalTableDSL.g:10380:1: entryRuleJvmTypeReference returns [EObject current=null] : iv_ruleJvmTypeReference= ruleJvmTypeReference EOF ;
     public final EObject entryRuleJvmTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -30499,8 +29125,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:10910:57: (iv_ruleJvmTypeReference= ruleJvmTypeReference EOF )
-            // InternalTableDSL.g:10911:2: iv_ruleJvmTypeReference= ruleJvmTypeReference EOF
+            // InternalTableDSL.g:10380:57: (iv_ruleJvmTypeReference= ruleJvmTypeReference EOF )
+            // InternalTableDSL.g:10381:2: iv_ruleJvmTypeReference= ruleJvmTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmTypeReferenceRule()); 
@@ -30531,7 +29157,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmTypeReference"
-    // InternalTableDSL.g:10917:1: ruleJvmTypeReference returns [EObject current=null] : ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) ;
+    // InternalTableDSL.g:10387:1: ruleJvmTypeReference returns [EObject current=null] : ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) ;
     public final EObject ruleJvmTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -30544,39 +29170,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:10923:2: ( ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) )
-            // InternalTableDSL.g:10924:2: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
+            // InternalTableDSL.g:10393:2: ( ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) )
+            // InternalTableDSL.g:10394:2: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
             {
-            // InternalTableDSL.g:10924:2: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
-            int alt157=2;
-            int LA157_0 = input.LA(1);
+            // InternalTableDSL.g:10394:2: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
+            int alt152=2;
+            int LA152_0 = input.LA(1);
 
-            if ( (LA157_0==RULE_ID) ) {
-                alt157=1;
+            if ( (LA152_0==RULE_ID) ) {
+                alt152=1;
             }
-            else if ( (LA157_0==103||LA157_0==128) ) {
-                alt157=2;
+            else if ( (LA152_0==100||LA152_0==125) ) {
+                alt152=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 157, 0, input);
+                    new NoViableAltException("", 152, 0, input);
 
                 throw nvae;
             }
-            switch (alt157) {
+            switch (alt152) {
                 case 1 :
-                    // InternalTableDSL.g:10925:3: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
+                    // InternalTableDSL.g:10395:3: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
                     {
-                    // InternalTableDSL.g:10925:3: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
-                    // InternalTableDSL.g:10926:4: this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
+                    // InternalTableDSL.g:10395:3: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
+                    // InternalTableDSL.g:10396:4: this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
                     {
                     if ( state.backtracking==0 ) {
 
                       				newCompositeNode(grammarAccess.getJvmTypeReferenceAccess().getJvmParameterizedTypeReferenceParserRuleCall_0_0());
                       			
                     }
-                    pushFollow(FOLLOW_122);
+                    pushFollow(FOLLOW_121);
                     this_JvmParameterizedTypeReference_0=ruleJvmParameterizedTypeReference();
 
                     state._fsp--;
@@ -30587,20 +29213,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                       				afterParserOrEnumRuleCall();
                       			
                     }
-                    // InternalTableDSL.g:10934:4: ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
-                    loop156:
+                    // InternalTableDSL.g:10404:4: ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
+                    loop151:
                     do {
-                        int alt156=2;
-                        int LA156_0 = input.LA(1);
+                        int alt151=2;
+                        int LA151_0 = input.LA(1);
 
-                        if ( (LA156_0==108) ) {
-                            int LA156_2 = input.LA(2);
+                        if ( (LA151_0==105) ) {
+                            int LA151_2 = input.LA(2);
 
-                            if ( (LA156_2==109) ) {
-                                int LA156_3 = input.LA(3);
+                            if ( (LA151_2==106) ) {
+                                int LA151_3 = input.LA(3);
 
                                 if ( (synpred49_InternalTableDSL()) ) {
-                                    alt156=1;
+                                    alt151=1;
                                 }
 
 
@@ -30610,15 +29236,15 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         }
 
 
-                        switch (alt156) {
+                        switch (alt151) {
                     	case 1 :
-                    	    // InternalTableDSL.g:10935:5: ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets )
+                    	    // InternalTableDSL.g:10405:5: ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets )
                     	    {
-                    	    // InternalTableDSL.g:10941:5: ( () ruleArrayBrackets )
-                    	    // InternalTableDSL.g:10942:6: () ruleArrayBrackets
+                    	    // InternalTableDSL.g:10411:5: ( () ruleArrayBrackets )
+                    	    // InternalTableDSL.g:10412:6: () ruleArrayBrackets
                     	    {
-                    	    // InternalTableDSL.g:10942:6: ()
-                    	    // InternalTableDSL.g:10943:7: 
+                    	    // InternalTableDSL.g:10412:6: ()
+                    	    // InternalTableDSL.g:10413:7: 
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -30635,7 +29261,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	      						newCompositeNode(grammarAccess.getJvmTypeReferenceAccess().getArrayBracketsParserRuleCall_0_1_0_1());
                     	      					
                     	    }
-                    	    pushFollow(FOLLOW_122);
+                    	    pushFollow(FOLLOW_121);
                     	    ruleArrayBrackets();
 
                     	    state._fsp--;
@@ -30653,7 +29279,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop156;
+                    	    break loop151;
                         }
                     } while (true);
 
@@ -30664,7 +29290,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:10960:3: this_XFunctionTypeRef_3= ruleXFunctionTypeRef
+                    // InternalTableDSL.g:10430:3: this_XFunctionTypeRef_3= ruleXFunctionTypeRef
                     {
                     if ( state.backtracking==0 ) {
 
@@ -30710,7 +29336,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleArrayBrackets"
-    // InternalTableDSL.g:10972:1: entryRuleArrayBrackets returns [String current=null] : iv_ruleArrayBrackets= ruleArrayBrackets EOF ;
+    // InternalTableDSL.g:10442:1: entryRuleArrayBrackets returns [String current=null] : iv_ruleArrayBrackets= ruleArrayBrackets EOF ;
     public final String entryRuleArrayBrackets() throws RecognitionException {
         String current = null;
 
@@ -30718,8 +29344,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:10972:53: (iv_ruleArrayBrackets= ruleArrayBrackets EOF )
-            // InternalTableDSL.g:10973:2: iv_ruleArrayBrackets= ruleArrayBrackets EOF
+            // InternalTableDSL.g:10442:53: (iv_ruleArrayBrackets= ruleArrayBrackets EOF )
+            // InternalTableDSL.g:10443:2: iv_ruleArrayBrackets= ruleArrayBrackets EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getArrayBracketsRule()); 
@@ -30750,7 +29376,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleArrayBrackets"
-    // InternalTableDSL.g:10979:1: ruleArrayBrackets returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '[' kw= ']' ) ;
+    // InternalTableDSL.g:10449:1: ruleArrayBrackets returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '[' kw= ']' ) ;
     public final AntlrDatatypeRuleToken ruleArrayBrackets() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -30760,20 +29386,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:10985:2: ( (kw= '[' kw= ']' ) )
-            // InternalTableDSL.g:10986:2: (kw= '[' kw= ']' )
+            // InternalTableDSL.g:10455:2: ( (kw= '[' kw= ']' ) )
+            // InternalTableDSL.g:10456:2: (kw= '[' kw= ']' )
             {
-            // InternalTableDSL.g:10986:2: (kw= '[' kw= ']' )
-            // InternalTableDSL.g:10987:3: kw= '[' kw= ']'
+            // InternalTableDSL.g:10456:2: (kw= '[' kw= ']' )
+            // InternalTableDSL.g:10457:3: kw= '[' kw= ']'
             {
-            kw=(Token)match(input,108,FOLLOW_101); if (state.failed) return current;
+            kw=(Token)match(input,105,FOLLOW_100); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			current.merge(kw);
               			newLeafNode(kw, grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0());
               		
             }
-            kw=(Token)match(input,109,FOLLOW_2); if (state.failed) return current;
+            kw=(Token)match(input,106,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			current.merge(kw);
@@ -30805,7 +29431,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXFunctionTypeRef"
-    // InternalTableDSL.g:11001:1: entryRuleXFunctionTypeRef returns [EObject current=null] : iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF ;
+    // InternalTableDSL.g:10471:1: entryRuleXFunctionTypeRef returns [EObject current=null] : iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF ;
     public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
         EObject current = null;
 
@@ -30813,8 +29439,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:11001:57: (iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF )
-            // InternalTableDSL.g:11002:2: iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF
+            // InternalTableDSL.g:10471:57: (iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF )
+            // InternalTableDSL.g:10472:2: iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXFunctionTypeRefRule()); 
@@ -30845,7 +29471,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXFunctionTypeRef"
-    // InternalTableDSL.g:11008:1: ruleXFunctionTypeRef returns [EObject current=null] : ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) ;
+    // InternalTableDSL.g:10478:1: ruleXFunctionTypeRef returns [EObject current=null] : ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleXFunctionTypeRef() throws RecognitionException {
         EObject current = null;
 
@@ -30864,52 +29490,52 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11014:2: ( ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) )
-            // InternalTableDSL.g:11015:2: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
+            // InternalTableDSL.g:10484:2: ( ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) )
+            // InternalTableDSL.g:10485:2: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
             {
-            // InternalTableDSL.g:11015:2: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
-            // InternalTableDSL.g:11016:3: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) )
+            // InternalTableDSL.g:10485:2: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
+            // InternalTableDSL.g:10486:3: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) )
             {
-            // InternalTableDSL.g:11016:3: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )?
-            int alt160=2;
-            int LA160_0 = input.LA(1);
+            // InternalTableDSL.g:10486:3: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )?
+            int alt155=2;
+            int LA155_0 = input.LA(1);
 
-            if ( (LA160_0==103) ) {
-                alt160=1;
+            if ( (LA155_0==100) ) {
+                alt155=1;
             }
-            switch (alt160) {
+            switch (alt155) {
                 case 1 :
-                    // InternalTableDSL.g:11017:4: otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')'
+                    // InternalTableDSL.g:10487:4: otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')'
                     {
-                    otherlv_0=(Token)match(input,103,FOLLOW_129); if (state.failed) return current;
+                    otherlv_0=(Token)match(input,100,FOLLOW_128); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_0, grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0());
                       			
                     }
-                    // InternalTableDSL.g:11021:4: ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )?
-                    int alt159=2;
-                    int LA159_0 = input.LA(1);
+                    // InternalTableDSL.g:10491:4: ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )?
+                    int alt154=2;
+                    int LA154_0 = input.LA(1);
 
-                    if ( (LA159_0==RULE_ID||LA159_0==103||LA159_0==128) ) {
-                        alt159=1;
+                    if ( (LA154_0==RULE_ID||LA154_0==100||LA154_0==125) ) {
+                        alt154=1;
                     }
-                    switch (alt159) {
+                    switch (alt154) {
                         case 1 :
-                            // InternalTableDSL.g:11022:5: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
+                            // InternalTableDSL.g:10492:5: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
                             {
-                            // InternalTableDSL.g:11022:5: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) )
-                            // InternalTableDSL.g:11023:6: (lv_paramTypes_1_0= ruleJvmTypeReference )
+                            // InternalTableDSL.g:10492:5: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) )
+                            // InternalTableDSL.g:10493:6: (lv_paramTypes_1_0= ruleJvmTypeReference )
                             {
-                            // InternalTableDSL.g:11023:6: (lv_paramTypes_1_0= ruleJvmTypeReference )
-                            // InternalTableDSL.g:11024:7: lv_paramTypes_1_0= ruleJvmTypeReference
+                            // InternalTableDSL.g:10493:6: (lv_paramTypes_1_0= ruleJvmTypeReference )
+                            // InternalTableDSL.g:10494:7: lv_paramTypes_1_0= ruleJvmTypeReference
                             {
                             if ( state.backtracking==0 ) {
 
                               							newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_0_0());
                               						
                             }
-                            pushFollow(FOLLOW_63);
+                            pushFollow(FOLLOW_62);
                             lv_paramTypes_1_0=ruleJvmTypeReference();
 
                             state._fsp--;
@@ -30933,39 +29559,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalTableDSL.g:11041:5: (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
-                            loop158:
+                            // InternalTableDSL.g:10511:5: (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
+                            loop153:
                             do {
-                                int alt158=2;
-                                int LA158_0 = input.LA(1);
+                                int alt153=2;
+                                int LA153_0 = input.LA(1);
 
-                                if ( (LA158_0==104) ) {
-                                    alt158=1;
+                                if ( (LA153_0==101) ) {
+                                    alt153=1;
                                 }
 
 
-                                switch (alt158) {
+                                switch (alt153) {
                             	case 1 :
-                            	    // InternalTableDSL.g:11042:6: otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
+                            	    // InternalTableDSL.g:10512:6: otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
                             	    {
-                            	    otherlv_2=(Token)match(input,104,FOLLOW_79); if (state.failed) return current;
+                            	    otherlv_2=(Token)match(input,101,FOLLOW_78); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      						newLeafNode(otherlv_2, grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0());
                             	      					
                             	    }
-                            	    // InternalTableDSL.g:11046:6: ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
-                            	    // InternalTableDSL.g:11047:7: (lv_paramTypes_3_0= ruleJvmTypeReference )
+                            	    // InternalTableDSL.g:10516:6: ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
+                            	    // InternalTableDSL.g:10517:7: (lv_paramTypes_3_0= ruleJvmTypeReference )
                             	    {
-                            	    // InternalTableDSL.g:11047:7: (lv_paramTypes_3_0= ruleJvmTypeReference )
-                            	    // InternalTableDSL.g:11048:8: lv_paramTypes_3_0= ruleJvmTypeReference
+                            	    // InternalTableDSL.g:10517:7: (lv_paramTypes_3_0= ruleJvmTypeReference )
+                            	    // InternalTableDSL.g:10518:8: lv_paramTypes_3_0= ruleJvmTypeReference
                             	    {
                             	    if ( state.backtracking==0 ) {
 
                             	      								newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_1_1_0());
                             	      							
                             	    }
-                            	    pushFollow(FOLLOW_63);
+                            	    pushFollow(FOLLOW_62);
                             	    lv_paramTypes_3_0=ruleJvmTypeReference();
 
                             	    state._fsp--;
@@ -30994,7 +29620,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    break loop158;
+                            	    break loop153;
                                 }
                             } while (true);
 
@@ -31004,7 +29630,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_4=(Token)match(input,105,FOLLOW_130); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,102,FOLLOW_129); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_4, grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2());
@@ -31016,17 +29642,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_5=(Token)match(input,128,FOLLOW_79); if (state.failed) return current;
+            otherlv_5=(Token)match(input,125,FOLLOW_78); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_5, grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1());
               		
             }
-            // InternalTableDSL.g:11076:3: ( (lv_returnType_6_0= ruleJvmTypeReference ) )
-            // InternalTableDSL.g:11077:4: (lv_returnType_6_0= ruleJvmTypeReference )
+            // InternalTableDSL.g:10546:3: ( (lv_returnType_6_0= ruleJvmTypeReference ) )
+            // InternalTableDSL.g:10547:4: (lv_returnType_6_0= ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:11077:4: (lv_returnType_6_0= ruleJvmTypeReference )
-            // InternalTableDSL.g:11078:5: lv_returnType_6_0= ruleJvmTypeReference
+            // InternalTableDSL.g:10547:4: (lv_returnType_6_0= ruleJvmTypeReference )
+            // InternalTableDSL.g:10548:5: lv_returnType_6_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
 
@@ -31082,7 +29708,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmParameterizedTypeReference"
-    // InternalTableDSL.g:11099:1: entryRuleJvmParameterizedTypeReference returns [EObject current=null] : iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF ;
+    // InternalTableDSL.g:10569:1: entryRuleJvmParameterizedTypeReference returns [EObject current=null] : iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF ;
     public final EObject entryRuleJvmParameterizedTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -31090,8 +29716,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:11099:70: (iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF )
-            // InternalTableDSL.g:11100:2: iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF
+            // InternalTableDSL.g:10569:70: (iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF )
+            // InternalTableDSL.g:10570:2: iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceRule()); 
@@ -31122,7 +29748,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmParameterizedTypeReference"
-    // InternalTableDSL.g:11106:1: ruleJvmParameterizedTypeReference returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) ;
+    // InternalTableDSL.g:10576:1: ruleJvmParameterizedTypeReference returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) ;
     public final EObject ruleJvmParameterizedTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -31146,17 +29772,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11112:2: ( ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) )
-            // InternalTableDSL.g:11113:2: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
+            // InternalTableDSL.g:10582:2: ( ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) )
+            // InternalTableDSL.g:10583:2: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
             {
-            // InternalTableDSL.g:11113:2: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
-            // InternalTableDSL.g:11114:3: ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
+            // InternalTableDSL.g:10583:2: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
+            // InternalTableDSL.g:10584:3: ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
             {
-            // InternalTableDSL.g:11114:3: ( ( ruleQualifiedName ) )
-            // InternalTableDSL.g:11115:4: ( ruleQualifiedName )
+            // InternalTableDSL.g:10584:3: ( ( ruleQualifiedName ) )
+            // InternalTableDSL.g:10585:4: ( ruleQualifiedName )
             {
-            // InternalTableDSL.g:11115:4: ( ruleQualifiedName )
-            // InternalTableDSL.g:11116:5: ruleQualifiedName
+            // InternalTableDSL.g:10585:4: ( ruleQualifiedName )
+            // InternalTableDSL.g:10586:5: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -31170,7 +29796,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               					newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_0_0());
               				
             }
-            pushFollow(FOLLOW_131);
+            pushFollow(FOLLOW_130);
             ruleQualifiedName();
 
             state._fsp--;
@@ -31186,17 +29812,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalTableDSL.g:11130:3: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
-            int alt165=2;
-            alt165 = dfa165.predict(input);
-            switch (alt165) {
+            // InternalTableDSL.g:10600:3: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
+            int alt160=2;
+            alt160 = dfa160.predict(input);
+            switch (alt160) {
                 case 1 :
-                    // InternalTableDSL.g:11131:4: ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
+                    // InternalTableDSL.g:10601:4: ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
                     {
-                    // InternalTableDSL.g:11131:4: ( ( '<' )=>otherlv_1= '<' )
-                    // InternalTableDSL.g:11132:5: ( '<' )=>otherlv_1= '<'
+                    // InternalTableDSL.g:10601:4: ( ( '<' )=>otherlv_1= '<' )
+                    // InternalTableDSL.g:10602:5: ( '<' )=>otherlv_1= '<'
                     {
-                    otherlv_1=(Token)match(input,115,FOLLOW_91); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,112,FOLLOW_90); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(otherlv_1, grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_0());
@@ -31205,18 +29831,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:11138:4: ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) )
-                    // InternalTableDSL.g:11139:5: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalTableDSL.g:10608:4: ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) )
+                    // InternalTableDSL.g:10609:5: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
                     {
-                    // InternalTableDSL.g:11139:5: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
-                    // InternalTableDSL.g:11140:6: lv_arguments_2_0= ruleJvmArgumentTypeReference
+                    // InternalTableDSL.g:10609:5: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalTableDSL.g:10610:6: lv_arguments_2_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0());
                       					
                     }
-                    pushFollow(FOLLOW_92);
+                    pushFollow(FOLLOW_91);
                     lv_arguments_2_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -31240,39 +29866,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:11157:4: (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )*
-                    loop161:
+                    // InternalTableDSL.g:10627:4: (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )*
+                    loop156:
                     do {
-                        int alt161=2;
-                        int LA161_0 = input.LA(1);
+                        int alt156=2;
+                        int LA156_0 = input.LA(1);
 
-                        if ( (LA161_0==104) ) {
-                            alt161=1;
+                        if ( (LA156_0==101) ) {
+                            alt156=1;
                         }
 
 
-                        switch (alt161) {
+                        switch (alt156) {
                     	case 1 :
-                    	    // InternalTableDSL.g:11158:5: otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalTableDSL.g:10628:5: otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,104,FOLLOW_91); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,101,FOLLOW_90); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      					newLeafNode(otherlv_3, grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0());
                     	      				
                     	    }
-                    	    // InternalTableDSL.g:11162:5: ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
-                    	    // InternalTableDSL.g:11163:6: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalTableDSL.g:10632:5: ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalTableDSL.g:10633:6: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // InternalTableDSL.g:11163:6: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
-                    	    // InternalTableDSL.g:11164:7: lv_arguments_4_0= ruleJvmArgumentTypeReference
+                    	    // InternalTableDSL.g:10633:6: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalTableDSL.g:10634:7: lv_arguments_4_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      							newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_92);
+                    	    pushFollow(FOLLOW_91);
                     	    lv_arguments_4_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -31301,30 +29927,30 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop161;
+                    	    break loop156;
                         }
                     } while (true);
 
-                    otherlv_5=(Token)match(input,116,FOLLOW_44); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,113,FOLLOW_43); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_5, grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3());
                       			
                     }
-                    // InternalTableDSL.g:11186:4: ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
-                    loop164:
+                    // InternalTableDSL.g:10656:4: ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
+                    loop159:
                     do {
-                        int alt164=2;
-                        int LA164_0 = input.LA(1);
+                        int alt159=2;
+                        int LA159_0 = input.LA(1);
 
-                        if ( (LA164_0==78) ) {
-                            int LA164_2 = input.LA(2);
+                        if ( (LA159_0==74) ) {
+                            int LA159_2 = input.LA(2);
 
-                            if ( (LA164_2==RULE_ID) ) {
-                                int LA164_3 = input.LA(3);
+                            if ( (LA159_2==RULE_ID) ) {
+                                int LA159_3 = input.LA(3);
 
                                 if ( (synpred51_InternalTableDSL()) ) {
-                                    alt164=1;
+                                    alt159=1;
                                 }
 
 
@@ -31334,18 +29960,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         }
 
 
-                        switch (alt164) {
+                        switch (alt159) {
                     	case 1 :
-                    	    // InternalTableDSL.g:11187:5: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
+                    	    // InternalTableDSL.g:10657:5: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
                     	    {
-                    	    // InternalTableDSL.g:11187:5: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) )
-                    	    // InternalTableDSL.g:11188:6: ( ( () '.' ) )=> ( () otherlv_7= '.' )
+                    	    // InternalTableDSL.g:10657:5: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) )
+                    	    // InternalTableDSL.g:10658:6: ( ( () '.' ) )=> ( () otherlv_7= '.' )
                     	    {
-                    	    // InternalTableDSL.g:11194:6: ( () otherlv_7= '.' )
-                    	    // InternalTableDSL.g:11195:7: () otherlv_7= '.'
+                    	    // InternalTableDSL.g:10664:6: ( () otherlv_7= '.' )
+                    	    // InternalTableDSL.g:10665:7: () otherlv_7= '.'
                     	    {
-                    	    // InternalTableDSL.g:11195:7: ()
-                    	    // InternalTableDSL.g:11196:8: 
+                    	    // InternalTableDSL.g:10665:7: ()
+                    	    // InternalTableDSL.g:10666:8: 
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -31357,7 +29983,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     	    }
 
-                    	    otherlv_7=(Token)match(input,78,FOLLOW_4); if (state.failed) return current;
+                    	    otherlv_7=(Token)match(input,74,FOLLOW_4); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      							newLeafNode(otherlv_7, grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1());
@@ -31369,11 +29995,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     	    }
 
-                    	    // InternalTableDSL.g:11208:5: ( ( ruleValidID ) )
-                    	    // InternalTableDSL.g:11209:6: ( ruleValidID )
+                    	    // InternalTableDSL.g:10678:5: ( ( ruleValidID ) )
+                    	    // InternalTableDSL.g:10679:6: ( ruleValidID )
                     	    {
-                    	    // InternalTableDSL.g:11209:6: ( ruleValidID )
-                    	    // InternalTableDSL.g:11210:7: ruleValidID
+                    	    // InternalTableDSL.g:10679:6: ( ruleValidID )
+                    	    // InternalTableDSL.g:10680:7: ruleValidID
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -31387,7 +30013,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	      							newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_1_4_1_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_132);
+                    	    pushFollow(FOLLOW_131);
                     	    ruleValidID();
 
                     	    state._fsp--;
@@ -31403,17 +30029,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     	    }
 
-                    	    // InternalTableDSL.g:11224:5: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
-                    	    int alt163=2;
-                    	    alt163 = dfa163.predict(input);
-                    	    switch (alt163) {
+                    	    // InternalTableDSL.g:10694:5: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
+                    	    int alt158=2;
+                    	    alt158 = dfa158.predict(input);
+                    	    switch (alt158) {
                     	        case 1 :
-                    	            // InternalTableDSL.g:11225:6: ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>'
+                    	            // InternalTableDSL.g:10695:6: ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>'
                     	            {
-                    	            // InternalTableDSL.g:11225:6: ( ( '<' )=>otherlv_9= '<' )
-                    	            // InternalTableDSL.g:11226:7: ( '<' )=>otherlv_9= '<'
+                    	            // InternalTableDSL.g:10695:6: ( ( '<' )=>otherlv_9= '<' )
+                    	            // InternalTableDSL.g:10696:7: ( '<' )=>otherlv_9= '<'
                     	            {
-                    	            otherlv_9=(Token)match(input,115,FOLLOW_91); if (state.failed) return current;
+                    	            otherlv_9=(Token)match(input,112,FOLLOW_90); if (state.failed) return current;
                     	            if ( state.backtracking==0 ) {
 
                     	              							newLeafNode(otherlv_9, grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_4_2_0());
@@ -31422,18 +30048,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     	            }
 
-                    	            // InternalTableDSL.g:11232:6: ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) )
-                    	            // InternalTableDSL.g:11233:7: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
+                    	            // InternalTableDSL.g:10702:6: ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) )
+                    	            // InternalTableDSL.g:10703:7: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
                     	            {
-                    	            // InternalTableDSL.g:11233:7: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
-                    	            // InternalTableDSL.g:11234:8: lv_arguments_10_0= ruleJvmArgumentTypeReference
+                    	            // InternalTableDSL.g:10703:7: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
+                    	            // InternalTableDSL.g:10704:8: lv_arguments_10_0= ruleJvmArgumentTypeReference
                     	            {
                     	            if ( state.backtracking==0 ) {
 
                     	              								newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_1_0());
                     	              							
                     	            }
-                    	            pushFollow(FOLLOW_92);
+                    	            pushFollow(FOLLOW_91);
                     	            lv_arguments_10_0=ruleJvmArgumentTypeReference();
 
                     	            state._fsp--;
@@ -31457,39 +30083,39 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     	            }
 
-                    	            // InternalTableDSL.g:11251:6: (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )*
-                    	            loop162:
+                    	            // InternalTableDSL.g:10721:6: (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )*
+                    	            loop157:
                     	            do {
-                    	                int alt162=2;
-                    	                int LA162_0 = input.LA(1);
+                    	                int alt157=2;
+                    	                int LA157_0 = input.LA(1);
 
-                    	                if ( (LA162_0==104) ) {
-                    	                    alt162=1;
+                    	                if ( (LA157_0==101) ) {
+                    	                    alt157=1;
                     	                }
 
 
-                    	                switch (alt162) {
+                    	                switch (alt157) {
                     	            	case 1 :
-                    	            	    // InternalTableDSL.g:11252:7: otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
+                    	            	    // InternalTableDSL.g:10722:7: otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
                     	            	    {
-                    	            	    otherlv_11=(Token)match(input,104,FOLLOW_91); if (state.failed) return current;
+                    	            	    otherlv_11=(Token)match(input,101,FOLLOW_90); if (state.failed) return current;
                     	            	    if ( state.backtracking==0 ) {
 
                     	            	      							newLeafNode(otherlv_11, grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0());
                     	            	      						
                     	            	    }
-                    	            	    // InternalTableDSL.g:11256:7: ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
-                    	            	    // InternalTableDSL.g:11257:8: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
+                    	            	    // InternalTableDSL.g:10726:7: ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
+                    	            	    // InternalTableDSL.g:10727:8: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
                     	            	    {
-                    	            	    // InternalTableDSL.g:11257:8: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
-                    	            	    // InternalTableDSL.g:11258:9: lv_arguments_12_0= ruleJvmArgumentTypeReference
+                    	            	    // InternalTableDSL.g:10727:8: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
+                    	            	    // InternalTableDSL.g:10728:9: lv_arguments_12_0= ruleJvmArgumentTypeReference
                     	            	    {
                     	            	    if ( state.backtracking==0 ) {
 
                     	            	      									newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_2_1_0());
                     	            	      								
                     	            	    }
-                    	            	    pushFollow(FOLLOW_92);
+                    	            	    pushFollow(FOLLOW_91);
                     	            	    lv_arguments_12_0=ruleJvmArgumentTypeReference();
 
                     	            	    state._fsp--;
@@ -31518,11 +30144,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	            	    break;
 
                     	            	default :
-                    	            	    break loop162;
+                    	            	    break loop157;
                     	                }
                     	            } while (true);
 
-                    	            otherlv_13=(Token)match(input,116,FOLLOW_44); if (state.failed) return current;
+                    	            otherlv_13=(Token)match(input,113,FOLLOW_43); if (state.failed) return current;
                     	            if ( state.backtracking==0 ) {
 
                     	              						newLeafNode(otherlv_13, grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3());
@@ -31539,7 +30165,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop164;
+                    	    break loop159;
                         }
                     } while (true);
 
@@ -31574,7 +30200,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmArgumentTypeReference"
-    // InternalTableDSL.g:11287:1: entryRuleJvmArgumentTypeReference returns [EObject current=null] : iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF ;
+    // InternalTableDSL.g:10757:1: entryRuleJvmArgumentTypeReference returns [EObject current=null] : iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF ;
     public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -31582,8 +30208,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:11287:65: (iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF )
-            // InternalTableDSL.g:11288:2: iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF
+            // InternalTableDSL.g:10757:65: (iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF )
+            // InternalTableDSL.g:10758:2: iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmArgumentTypeReferenceRule()); 
@@ -31614,7 +30240,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmArgumentTypeReference"
-    // InternalTableDSL.g:11294:1: ruleJvmArgumentTypeReference returns [EObject current=null] : (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) ;
+    // InternalTableDSL.g:10764:1: ruleJvmArgumentTypeReference returns [EObject current=null] : (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) ;
     public final EObject ruleJvmArgumentTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -31627,29 +30253,29 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11300:2: ( (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) )
-            // InternalTableDSL.g:11301:2: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
+            // InternalTableDSL.g:10770:2: ( (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) )
+            // InternalTableDSL.g:10771:2: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
             {
-            // InternalTableDSL.g:11301:2: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
-            int alt166=2;
-            int LA166_0 = input.LA(1);
+            // InternalTableDSL.g:10771:2: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
+            int alt161=2;
+            int LA161_0 = input.LA(1);
 
-            if ( (LA166_0==RULE_ID||LA166_0==103||LA166_0==128) ) {
-                alt166=1;
+            if ( (LA161_0==RULE_ID||LA161_0==100||LA161_0==125) ) {
+                alt161=1;
             }
-            else if ( (LA166_0==164) ) {
-                alt166=2;
+            else if ( (LA161_0==161) ) {
+                alt161=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 166, 0, input);
+                    new NoViableAltException("", 161, 0, input);
 
                 throw nvae;
             }
-            switch (alt166) {
+            switch (alt161) {
                 case 1 :
-                    // InternalTableDSL.g:11302:3: this_JvmTypeReference_0= ruleJvmTypeReference
+                    // InternalTableDSL.g:10772:3: this_JvmTypeReference_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
@@ -31671,7 +30297,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:11311:3: this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference
+                    // InternalTableDSL.g:10781:3: this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
@@ -31717,7 +30343,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmWildcardTypeReference"
-    // InternalTableDSL.g:11323:1: entryRuleJvmWildcardTypeReference returns [EObject current=null] : iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF ;
+    // InternalTableDSL.g:10793:1: entryRuleJvmWildcardTypeReference returns [EObject current=null] : iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF ;
     public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -31725,8 +30351,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:11323:65: (iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF )
-            // InternalTableDSL.g:11324:2: iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF
+            // InternalTableDSL.g:10793:65: (iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF )
+            // InternalTableDSL.g:10794:2: iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceRule()); 
@@ -31757,7 +30383,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmWildcardTypeReference"
-    // InternalTableDSL.g:11330:1: ruleJvmWildcardTypeReference returns [EObject current=null] : ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) ;
+    // InternalTableDSL.g:10800:1: ruleJvmWildcardTypeReference returns [EObject current=null] : ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) ;
     public final EObject ruleJvmWildcardTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -31775,14 +30401,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11336:2: ( ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) )
-            // InternalTableDSL.g:11337:2: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
+            // InternalTableDSL.g:10806:2: ( ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) )
+            // InternalTableDSL.g:10807:2: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
             {
-            // InternalTableDSL.g:11337:2: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
-            // InternalTableDSL.g:11338:3: () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
+            // InternalTableDSL.g:10807:2: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
+            // InternalTableDSL.g:10808:3: () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
             {
-            // InternalTableDSL.g:11338:3: ()
-            // InternalTableDSL.g:11339:4: 
+            // InternalTableDSL.g:10808:3: ()
+            // InternalTableDSL.g:10809:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -31794,41 +30420,41 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,164,FOLLOW_133); if (state.failed) return current;
+            otherlv_1=(Token)match(input,161,FOLLOW_132); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1());
               		
             }
-            // InternalTableDSL.g:11349:3: ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
-            int alt169=3;
-            int LA169_0 = input.LA(1);
+            // InternalTableDSL.g:10819:3: ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
+            int alt164=3;
+            int LA164_0 = input.LA(1);
 
-            if ( (LA169_0==151) ) {
-                alt169=1;
+            if ( (LA164_0==148) ) {
+                alt164=1;
             }
-            else if ( (LA169_0==152) ) {
-                alt169=2;
+            else if ( (LA164_0==149) ) {
+                alt164=2;
             }
-            switch (alt169) {
+            switch (alt164) {
                 case 1 :
-                    // InternalTableDSL.g:11350:4: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
+                    // InternalTableDSL.g:10820:4: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
                     {
-                    // InternalTableDSL.g:11350:4: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
-                    // InternalTableDSL.g:11351:5: ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
+                    // InternalTableDSL.g:10820:4: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
+                    // InternalTableDSL.g:10821:5: ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
                     {
-                    // InternalTableDSL.g:11351:5: ( (lv_constraints_2_0= ruleJvmUpperBound ) )
-                    // InternalTableDSL.g:11352:6: (lv_constraints_2_0= ruleJvmUpperBound )
+                    // InternalTableDSL.g:10821:5: ( (lv_constraints_2_0= ruleJvmUpperBound ) )
+                    // InternalTableDSL.g:10822:6: (lv_constraints_2_0= ruleJvmUpperBound )
                     {
-                    // InternalTableDSL.g:11352:6: (lv_constraints_2_0= ruleJvmUpperBound )
-                    // InternalTableDSL.g:11353:7: lv_constraints_2_0= ruleJvmUpperBound
+                    // InternalTableDSL.g:10822:6: (lv_constraints_2_0= ruleJvmUpperBound )
+                    // InternalTableDSL.g:10823:7: lv_constraints_2_0= ruleJvmUpperBound
                     {
                     if ( state.backtracking==0 ) {
 
                       							newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundParserRuleCall_2_0_0_0());
                       						
                     }
-                    pushFollow(FOLLOW_134);
+                    pushFollow(FOLLOW_133);
                     lv_constraints_2_0=ruleJvmUpperBound();
 
                     state._fsp--;
@@ -31852,30 +30478,30 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:11370:5: ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
-                    loop167:
+                    // InternalTableDSL.g:10840:5: ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
+                    loop162:
                     do {
-                        int alt167=2;
-                        int LA167_0 = input.LA(1);
+                        int alt162=2;
+                        int LA162_0 = input.LA(1);
 
-                        if ( (LA167_0==165) ) {
-                            alt167=1;
+                        if ( (LA162_0==162) ) {
+                            alt162=1;
                         }
 
 
-                        switch (alt167) {
+                        switch (alt162) {
                     	case 1 :
-                    	    // InternalTableDSL.g:11371:6: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
+                    	    // InternalTableDSL.g:10841:6: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
                     	    {
-                    	    // InternalTableDSL.g:11371:6: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
-                    	    // InternalTableDSL.g:11372:7: lv_constraints_3_0= ruleJvmUpperBoundAnded
+                    	    // InternalTableDSL.g:10841:6: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
+                    	    // InternalTableDSL.g:10842:7: lv_constraints_3_0= ruleJvmUpperBoundAnded
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      							newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundAndedParserRuleCall_2_0_1_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_134);
+                    	    pushFollow(FOLLOW_133);
                     	    lv_constraints_3_0=ruleJvmUpperBoundAnded();
 
                     	    state._fsp--;
@@ -31901,7 +30527,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop167;
+                    	    break loop162;
                         }
                     } while (true);
 
@@ -31912,23 +30538,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:11391:4: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
+                    // InternalTableDSL.g:10861:4: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
                     {
-                    // InternalTableDSL.g:11391:4: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
-                    // InternalTableDSL.g:11392:5: ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
+                    // InternalTableDSL.g:10861:4: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
+                    // InternalTableDSL.g:10862:5: ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
                     {
-                    // InternalTableDSL.g:11392:5: ( (lv_constraints_4_0= ruleJvmLowerBound ) )
-                    // InternalTableDSL.g:11393:6: (lv_constraints_4_0= ruleJvmLowerBound )
+                    // InternalTableDSL.g:10862:5: ( (lv_constraints_4_0= ruleJvmLowerBound ) )
+                    // InternalTableDSL.g:10863:6: (lv_constraints_4_0= ruleJvmLowerBound )
                     {
-                    // InternalTableDSL.g:11393:6: (lv_constraints_4_0= ruleJvmLowerBound )
-                    // InternalTableDSL.g:11394:7: lv_constraints_4_0= ruleJvmLowerBound
+                    // InternalTableDSL.g:10863:6: (lv_constraints_4_0= ruleJvmLowerBound )
+                    // InternalTableDSL.g:10864:7: lv_constraints_4_0= ruleJvmLowerBound
                     {
                     if ( state.backtracking==0 ) {
 
                       							newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundParserRuleCall_2_1_0_0());
                       						
                     }
-                    pushFollow(FOLLOW_134);
+                    pushFollow(FOLLOW_133);
                     lv_constraints_4_0=ruleJvmLowerBound();
 
                     state._fsp--;
@@ -31952,30 +30578,30 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalTableDSL.g:11411:5: ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
-                    loop168:
+                    // InternalTableDSL.g:10881:5: ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
+                    loop163:
                     do {
-                        int alt168=2;
-                        int LA168_0 = input.LA(1);
+                        int alt163=2;
+                        int LA163_0 = input.LA(1);
 
-                        if ( (LA168_0==165) ) {
-                            alt168=1;
+                        if ( (LA163_0==162) ) {
+                            alt163=1;
                         }
 
 
-                        switch (alt168) {
+                        switch (alt163) {
                     	case 1 :
-                    	    // InternalTableDSL.g:11412:6: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
+                    	    // InternalTableDSL.g:10882:6: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
                     	    {
-                    	    // InternalTableDSL.g:11412:6: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
-                    	    // InternalTableDSL.g:11413:7: lv_constraints_5_0= ruleJvmLowerBoundAnded
+                    	    // InternalTableDSL.g:10882:6: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
+                    	    // InternalTableDSL.g:10883:7: lv_constraints_5_0= ruleJvmLowerBoundAnded
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      							newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundAndedParserRuleCall_2_1_1_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_134);
+                    	    pushFollow(FOLLOW_133);
                     	    lv_constraints_5_0=ruleJvmLowerBoundAnded();
 
                     	    state._fsp--;
@@ -32001,7 +30627,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop168;
+                    	    break loop163;
                         }
                     } while (true);
 
@@ -32039,7 +30665,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmUpperBound"
-    // InternalTableDSL.g:11436:1: entryRuleJvmUpperBound returns [EObject current=null] : iv_ruleJvmUpperBound= ruleJvmUpperBound EOF ;
+    // InternalTableDSL.g:10906:1: entryRuleJvmUpperBound returns [EObject current=null] : iv_ruleJvmUpperBound= ruleJvmUpperBound EOF ;
     public final EObject entryRuleJvmUpperBound() throws RecognitionException {
         EObject current = null;
 
@@ -32047,8 +30673,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:11436:54: (iv_ruleJvmUpperBound= ruleJvmUpperBound EOF )
-            // InternalTableDSL.g:11437:2: iv_ruleJvmUpperBound= ruleJvmUpperBound EOF
+            // InternalTableDSL.g:10906:54: (iv_ruleJvmUpperBound= ruleJvmUpperBound EOF )
+            // InternalTableDSL.g:10907:2: iv_ruleJvmUpperBound= ruleJvmUpperBound EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmUpperBoundRule()); 
@@ -32079,7 +30705,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmUpperBound"
-    // InternalTableDSL.g:11443:1: ruleJvmUpperBound returns [EObject current=null] : (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalTableDSL.g:10913:1: ruleJvmUpperBound returns [EObject current=null] : (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmUpperBound() throws RecognitionException {
         EObject current = null;
 
@@ -32091,23 +30717,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11449:2: ( (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // InternalTableDSL.g:11450:2: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalTableDSL.g:10919:2: ( (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalTableDSL.g:10920:2: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // InternalTableDSL.g:11450:2: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // InternalTableDSL.g:11451:3: otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalTableDSL.g:10920:2: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalTableDSL.g:10921:3: otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,151,FOLLOW_79); if (state.failed) return current;
+            otherlv_0=(Token)match(input,148,FOLLOW_78); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0());
               		
             }
-            // InternalTableDSL.g:11455:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // InternalTableDSL.g:11456:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalTableDSL.g:10925:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalTableDSL.g:10926:4: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:11456:4: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // InternalTableDSL.g:11457:5: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalTableDSL.g:10926:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalTableDSL.g:10927:5: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
 
@@ -32163,7 +30789,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmUpperBoundAnded"
-    // InternalTableDSL.g:11478:1: entryRuleJvmUpperBoundAnded returns [EObject current=null] : iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF ;
+    // InternalTableDSL.g:10948:1: entryRuleJvmUpperBoundAnded returns [EObject current=null] : iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF ;
     public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -32171,8 +30797,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:11478:59: (iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF )
-            // InternalTableDSL.g:11479:2: iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF
+            // InternalTableDSL.g:10948:59: (iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF )
+            // InternalTableDSL.g:10949:2: iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmUpperBoundAndedRule()); 
@@ -32203,7 +30829,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmUpperBoundAnded"
-    // InternalTableDSL.g:11485:1: ruleJvmUpperBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalTableDSL.g:10955:1: ruleJvmUpperBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -32215,23 +30841,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11491:2: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // InternalTableDSL.g:11492:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalTableDSL.g:10961:2: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalTableDSL.g:10962:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // InternalTableDSL.g:11492:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // InternalTableDSL.g:11493:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalTableDSL.g:10962:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalTableDSL.g:10963:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,165,FOLLOW_79); if (state.failed) return current;
+            otherlv_0=(Token)match(input,162,FOLLOW_78); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0());
               		
             }
-            // InternalTableDSL.g:11497:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // InternalTableDSL.g:11498:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalTableDSL.g:10967:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalTableDSL.g:10968:4: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:11498:4: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // InternalTableDSL.g:11499:5: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalTableDSL.g:10968:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalTableDSL.g:10969:5: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
 
@@ -32287,7 +30913,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmLowerBound"
-    // InternalTableDSL.g:11520:1: entryRuleJvmLowerBound returns [EObject current=null] : iv_ruleJvmLowerBound= ruleJvmLowerBound EOF ;
+    // InternalTableDSL.g:10990:1: entryRuleJvmLowerBound returns [EObject current=null] : iv_ruleJvmLowerBound= ruleJvmLowerBound EOF ;
     public final EObject entryRuleJvmLowerBound() throws RecognitionException {
         EObject current = null;
 
@@ -32295,8 +30921,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:11520:54: (iv_ruleJvmLowerBound= ruleJvmLowerBound EOF )
-            // InternalTableDSL.g:11521:2: iv_ruleJvmLowerBound= ruleJvmLowerBound EOF
+            // InternalTableDSL.g:10990:54: (iv_ruleJvmLowerBound= ruleJvmLowerBound EOF )
+            // InternalTableDSL.g:10991:2: iv_ruleJvmLowerBound= ruleJvmLowerBound EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmLowerBoundRule()); 
@@ -32327,7 +30953,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmLowerBound"
-    // InternalTableDSL.g:11527:1: ruleJvmLowerBound returns [EObject current=null] : (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalTableDSL.g:10997:1: ruleJvmLowerBound returns [EObject current=null] : (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmLowerBound() throws RecognitionException {
         EObject current = null;
 
@@ -32339,23 +30965,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11533:2: ( (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // InternalTableDSL.g:11534:2: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalTableDSL.g:11003:2: ( (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalTableDSL.g:11004:2: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // InternalTableDSL.g:11534:2: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // InternalTableDSL.g:11535:3: otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalTableDSL.g:11004:2: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalTableDSL.g:11005:3: otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,152,FOLLOW_79); if (state.failed) return current;
+            otherlv_0=(Token)match(input,149,FOLLOW_78); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0());
               		
             }
-            // InternalTableDSL.g:11539:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // InternalTableDSL.g:11540:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalTableDSL.g:11009:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalTableDSL.g:11010:4: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:11540:4: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // InternalTableDSL.g:11541:5: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalTableDSL.g:11010:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalTableDSL.g:11011:5: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
 
@@ -32411,7 +31037,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmLowerBoundAnded"
-    // InternalTableDSL.g:11562:1: entryRuleJvmLowerBoundAnded returns [EObject current=null] : iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF ;
+    // InternalTableDSL.g:11032:1: entryRuleJvmLowerBoundAnded returns [EObject current=null] : iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF ;
     public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -32419,8 +31045,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:11562:59: (iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF )
-            // InternalTableDSL.g:11563:2: iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF
+            // InternalTableDSL.g:11032:59: (iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF )
+            // InternalTableDSL.g:11033:2: iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmLowerBoundAndedRule()); 
@@ -32451,7 +31077,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmLowerBoundAnded"
-    // InternalTableDSL.g:11569:1: ruleJvmLowerBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalTableDSL.g:11039:1: ruleJvmLowerBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -32463,23 +31089,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11575:2: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // InternalTableDSL.g:11576:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalTableDSL.g:11045:2: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalTableDSL.g:11046:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // InternalTableDSL.g:11576:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // InternalTableDSL.g:11577:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalTableDSL.g:11046:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalTableDSL.g:11047:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,165,FOLLOW_79); if (state.failed) return current;
+            otherlv_0=(Token)match(input,162,FOLLOW_78); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0());
               		
             }
-            // InternalTableDSL.g:11581:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // InternalTableDSL.g:11582:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalTableDSL.g:11051:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalTableDSL.g:11052:4: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // InternalTableDSL.g:11582:4: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // InternalTableDSL.g:11583:5: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalTableDSL.g:11052:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalTableDSL.g:11053:5: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
 
@@ -32535,7 +31161,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleQualifiedNameWithWildcard"
-    // InternalTableDSL.g:11604:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
+    // InternalTableDSL.g:11074:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
     public final String entryRuleQualifiedNameWithWildcard() throws RecognitionException {
         String current = null;
 
@@ -32543,8 +31169,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:11604:65: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
-            // InternalTableDSL.g:11605:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
+            // InternalTableDSL.g:11074:65: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
+            // InternalTableDSL.g:11075:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameWithWildcardRule()); 
@@ -32575,7 +31201,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQualifiedNameWithWildcard"
-    // InternalTableDSL.g:11611:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) ;
+    // InternalTableDSL.g:11081:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -32587,18 +31213,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11617:2: ( (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) )
-            // InternalTableDSL.g:11618:2: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
+            // InternalTableDSL.g:11087:2: ( (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) )
+            // InternalTableDSL.g:11088:2: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
             {
-            // InternalTableDSL.g:11618:2: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
-            // InternalTableDSL.g:11619:3: this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*'
+            // InternalTableDSL.g:11088:2: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
+            // InternalTableDSL.g:11089:3: this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*'
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getQualifiedNameWithWildcardAccess().getQualifiedNameParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_135);
+            pushFollow(FOLLOW_134);
             this_QualifiedName_0=ruleQualifiedName();
 
             state._fsp--;
@@ -32613,14 +31239,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            kw=(Token)match(input,78,FOLLOW_136); if (state.failed) return current;
+            kw=(Token)match(input,74,FOLLOW_135); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			current.merge(kw);
               			newLeafNode(kw, grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1());
               		
             }
-            kw=(Token)match(input,99,FOLLOW_2); if (state.failed) return current;
+            kw=(Token)match(input,96,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			current.merge(kw);
@@ -32652,7 +31278,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleValidID"
-    // InternalTableDSL.g:11643:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
+    // InternalTableDSL.g:11113:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
     public final String entryRuleValidID() throws RecognitionException {
         String current = null;
 
@@ -32660,8 +31286,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:11643:47: (iv_ruleValidID= ruleValidID EOF )
-            // InternalTableDSL.g:11644:2: iv_ruleValidID= ruleValidID EOF
+            // InternalTableDSL.g:11113:47: (iv_ruleValidID= ruleValidID EOF )
+            // InternalTableDSL.g:11114:2: iv_ruleValidID= ruleValidID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getValidIDRule()); 
@@ -32692,7 +31318,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleValidID"
-    // InternalTableDSL.g:11650:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // InternalTableDSL.g:11120:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -32702,8 +31328,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11656:2: (this_ID_0= RULE_ID )
-            // InternalTableDSL.g:11657:2: this_ID_0= RULE_ID
+            // InternalTableDSL.g:11126:2: (this_ID_0= RULE_ID )
+            // InternalTableDSL.g:11127:2: this_ID_0= RULE_ID
             {
             this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
@@ -32738,7 +31364,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXImportSection"
-    // InternalTableDSL.g:11667:1: entryRuleXImportSection returns [EObject current=null] : iv_ruleXImportSection= ruleXImportSection EOF ;
+    // InternalTableDSL.g:11137:1: entryRuleXImportSection returns [EObject current=null] : iv_ruleXImportSection= ruleXImportSection EOF ;
     public final EObject entryRuleXImportSection() throws RecognitionException {
         EObject current = null;
 
@@ -32746,8 +31372,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:11667:55: (iv_ruleXImportSection= ruleXImportSection EOF )
-            // InternalTableDSL.g:11668:2: iv_ruleXImportSection= ruleXImportSection EOF
+            // InternalTableDSL.g:11137:55: (iv_ruleXImportSection= ruleXImportSection EOF )
+            // InternalTableDSL.g:11138:2: iv_ruleXImportSection= ruleXImportSection EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXImportSectionRule()); 
@@ -32778,7 +31404,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXImportSection"
-    // InternalTableDSL.g:11674:1: ruleXImportSection returns [EObject current=null] : ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+ ;
+    // InternalTableDSL.g:11144:1: ruleXImportSection returns [EObject current=null] : ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+ ;
     public final EObject ruleXImportSection() throws RecognitionException {
         EObject current = null;
 
@@ -32789,34 +31415,34 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11680:2: ( ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+ )
-            // InternalTableDSL.g:11681:2: ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+
+            // InternalTableDSL.g:11150:2: ( ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+ )
+            // InternalTableDSL.g:11151:2: ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+
             {
-            // InternalTableDSL.g:11681:2: ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+
-            int cnt170=0;
-            loop170:
+            // InternalTableDSL.g:11151:2: ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+
+            int cnt165=0;
+            loop165:
             do {
-                int alt170=2;
-                int LA170_0 = input.LA(1);
+                int alt165=2;
+                int LA165_0 = input.LA(1);
 
-                if ( (LA170_0==96) ) {
-                    alt170=1;
+                if ( (LA165_0==93) ) {
+                    alt165=1;
                 }
 
 
-                switch (alt170) {
+                switch (alt165) {
             	case 1 :
-            	    // InternalTableDSL.g:11682:3: (lv_importDeclarations_0_0= ruleXImportDeclaration )
+            	    // InternalTableDSL.g:11152:3: (lv_importDeclarations_0_0= ruleXImportDeclaration )
             	    {
-            	    // InternalTableDSL.g:11682:3: (lv_importDeclarations_0_0= ruleXImportDeclaration )
-            	    // InternalTableDSL.g:11683:4: lv_importDeclarations_0_0= ruleXImportDeclaration
+            	    // InternalTableDSL.g:11152:3: (lv_importDeclarations_0_0= ruleXImportDeclaration )
+            	    // InternalTableDSL.g:11153:4: lv_importDeclarations_0_0= ruleXImportDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      				newCompositeNode(grammarAccess.getXImportSectionAccess().getImportDeclarationsXImportDeclarationParserRuleCall_0());
             	      			
             	    }
-            	    pushFollow(FOLLOW_137);
+            	    pushFollow(FOLLOW_136);
             	    lv_importDeclarations_0_0=ruleXImportDeclaration();
 
             	    state._fsp--;
@@ -32842,13 +31468,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    if ( cnt170 >= 1 ) break loop170;
+            	    if ( cnt165 >= 1 ) break loop165;
             	    if (state.backtracking>0) {state.failed=true; return current;}
                         EarlyExitException eee =
-                            new EarlyExitException(170, input);
+                            new EarlyExitException(165, input);
                         throw eee;
                 }
-                cnt170++;
+                cnt165++;
             } while (true);
 
 
@@ -32873,7 +31499,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleQualifiedNameInStaticImport"
-    // InternalTableDSL.g:11703:1: entryRuleQualifiedNameInStaticImport returns [String current=null] : iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF ;
+    // InternalTableDSL.g:11173:1: entryRuleQualifiedNameInStaticImport returns [String current=null] : iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF ;
     public final String entryRuleQualifiedNameInStaticImport() throws RecognitionException {
         String current = null;
 
@@ -32881,8 +31507,8 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalTableDSL.g:11703:67: (iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF )
-            // InternalTableDSL.g:11704:2: iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF
+            // InternalTableDSL.g:11173:67: (iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF )
+            // InternalTableDSL.g:11174:2: iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameInStaticImportRule()); 
@@ -32913,7 +31539,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQualifiedNameInStaticImport"
-    // InternalTableDSL.g:11710:1: ruleQualifiedNameInStaticImport returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID kw= '.' )+ ;
+    // InternalTableDSL.g:11180:1: ruleQualifiedNameInStaticImport returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID kw= '.' )+ ;
     public final AntlrDatatypeRuleToken ruleQualifiedNameInStaticImport() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -32925,37 +31551,37 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11716:2: ( (this_ValidID_0= ruleValidID kw= '.' )+ )
-            // InternalTableDSL.g:11717:2: (this_ValidID_0= ruleValidID kw= '.' )+
+            // InternalTableDSL.g:11186:2: ( (this_ValidID_0= ruleValidID kw= '.' )+ )
+            // InternalTableDSL.g:11187:2: (this_ValidID_0= ruleValidID kw= '.' )+
             {
-            // InternalTableDSL.g:11717:2: (this_ValidID_0= ruleValidID kw= '.' )+
-            int cnt171=0;
-            loop171:
+            // InternalTableDSL.g:11187:2: (this_ValidID_0= ruleValidID kw= '.' )+
+            int cnt166=0;
+            loop166:
             do {
-                int alt171=2;
-                int LA171_0 = input.LA(1);
+                int alt166=2;
+                int LA166_0 = input.LA(1);
 
-                if ( (LA171_0==RULE_ID) ) {
-                    int LA171_2 = input.LA(2);
+                if ( (LA166_0==RULE_ID) ) {
+                    int LA166_2 = input.LA(2);
 
-                    if ( (LA171_2==78) ) {
-                        alt171=1;
+                    if ( (LA166_2==74) ) {
+                        alt166=1;
                     }
 
 
                 }
 
 
-                switch (alt171) {
+                switch (alt166) {
             	case 1 :
-            	    // InternalTableDSL.g:11718:3: this_ValidID_0= ruleValidID kw= '.'
+            	    // InternalTableDSL.g:11188:3: this_ValidID_0= ruleValidID kw= '.'
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      			newCompositeNode(grammarAccess.getQualifiedNameInStaticImportAccess().getValidIDParserRuleCall_0());
             	      		
             	    }
-            	    pushFollow(FOLLOW_135);
+            	    pushFollow(FOLLOW_134);
             	    this_ValidID_0=ruleValidID();
 
             	    state._fsp--;
@@ -32970,7 +31596,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	      			afterParserOrEnumRuleCall();
             	      		
             	    }
-            	    kw=(Token)match(input,78,FOLLOW_138); if (state.failed) return current;
+            	    kw=(Token)match(input,74,FOLLOW_137); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      			current.merge(kw);
@@ -32982,13 +31608,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    if ( cnt171 >= 1 ) break loop171;
+            	    if ( cnt166 >= 1 ) break loop166;
             	    if (state.backtracking>0) {state.failed=true; return current;}
                         EarlyExitException eee =
-                            new EarlyExitException(171, input);
+                            new EarlyExitException(166, input);
                         throw eee;
                 }
-                cnt171++;
+                cnt166++;
             } while (true);
 
 
@@ -33013,7 +31639,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStyleCompare"
-    // InternalTableDSL.g:11737:1: ruleStyleCompare returns [Enumerator current=null] : ( (enumLiteral_0= 'equal' ) | (enumLiteral_1= 'greater equal' ) | (enumLiteral_2= 'greater than' ) | (enumLiteral_3= 'lower equal' ) | (enumLiteral_4= 'lower than' ) | (enumLiteral_5= 'not equal' ) ) ;
+    // InternalTableDSL.g:11207:1: ruleStyleCompare returns [Enumerator current=null] : ( (enumLiteral_0= 'equal' ) | (enumLiteral_1= 'greater equal' ) | (enumLiteral_2= 'greater than' ) | (enumLiteral_3= 'lower equal' ) | (enumLiteral_4= 'lower than' ) | (enumLiteral_5= 'not equal' ) ) ;
     public final Enumerator ruleStyleCompare() throws RecognitionException {
         Enumerator current = null;
 
@@ -33028,58 +31654,58 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11743:2: ( ( (enumLiteral_0= 'equal' ) | (enumLiteral_1= 'greater equal' ) | (enumLiteral_2= 'greater than' ) | (enumLiteral_3= 'lower equal' ) | (enumLiteral_4= 'lower than' ) | (enumLiteral_5= 'not equal' ) ) )
-            // InternalTableDSL.g:11744:2: ( (enumLiteral_0= 'equal' ) | (enumLiteral_1= 'greater equal' ) | (enumLiteral_2= 'greater than' ) | (enumLiteral_3= 'lower equal' ) | (enumLiteral_4= 'lower than' ) | (enumLiteral_5= 'not equal' ) )
+            // InternalTableDSL.g:11213:2: ( ( (enumLiteral_0= 'equal' ) | (enumLiteral_1= 'greater equal' ) | (enumLiteral_2= 'greater than' ) | (enumLiteral_3= 'lower equal' ) | (enumLiteral_4= 'lower than' ) | (enumLiteral_5= 'not equal' ) ) )
+            // InternalTableDSL.g:11214:2: ( (enumLiteral_0= 'equal' ) | (enumLiteral_1= 'greater equal' ) | (enumLiteral_2= 'greater than' ) | (enumLiteral_3= 'lower equal' ) | (enumLiteral_4= 'lower than' ) | (enumLiteral_5= 'not equal' ) )
             {
-            // InternalTableDSL.g:11744:2: ( (enumLiteral_0= 'equal' ) | (enumLiteral_1= 'greater equal' ) | (enumLiteral_2= 'greater than' ) | (enumLiteral_3= 'lower equal' ) | (enumLiteral_4= 'lower than' ) | (enumLiteral_5= 'not equal' ) )
-            int alt172=6;
+            // InternalTableDSL.g:11214:2: ( (enumLiteral_0= 'equal' ) | (enumLiteral_1= 'greater equal' ) | (enumLiteral_2= 'greater than' ) | (enumLiteral_3= 'lower equal' ) | (enumLiteral_4= 'lower than' ) | (enumLiteral_5= 'not equal' ) )
+            int alt167=6;
             switch ( input.LA(1) ) {
-            case 166:
+            case 163:
                 {
-                alt172=1;
+                alt167=1;
                 }
                 break;
-            case 167:
+            case 164:
                 {
-                alt172=2;
+                alt167=2;
                 }
                 break;
-            case 168:
+            case 165:
                 {
-                alt172=3;
+                alt167=3;
                 }
                 break;
-            case 169:
+            case 166:
                 {
-                alt172=4;
+                alt167=4;
                 }
                 break;
-            case 170:
+            case 167:
                 {
-                alt172=5;
+                alt167=5;
                 }
                 break;
-            case 171:
+            case 168:
                 {
-                alt172=6;
+                alt167=6;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 172, 0, input);
+                    new NoViableAltException("", 167, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt172) {
+            switch (alt167) {
                 case 1 :
-                    // InternalTableDSL.g:11745:3: (enumLiteral_0= 'equal' )
+                    // InternalTableDSL.g:11215:3: (enumLiteral_0= 'equal' )
                     {
-                    // InternalTableDSL.g:11745:3: (enumLiteral_0= 'equal' )
-                    // InternalTableDSL.g:11746:4: enumLiteral_0= 'equal'
+                    // InternalTableDSL.g:11215:3: (enumLiteral_0= 'equal' )
+                    // InternalTableDSL.g:11216:4: enumLiteral_0= 'equal'
                     {
-                    enumLiteral_0=(Token)match(input,166,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_0=(Token)match(input,163,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getStyleCompareAccess().getEqualEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
@@ -33093,12 +31719,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:11753:3: (enumLiteral_1= 'greater equal' )
+                    // InternalTableDSL.g:11223:3: (enumLiteral_1= 'greater equal' )
                     {
-                    // InternalTableDSL.g:11753:3: (enumLiteral_1= 'greater equal' )
-                    // InternalTableDSL.g:11754:4: enumLiteral_1= 'greater equal'
+                    // InternalTableDSL.g:11223:3: (enumLiteral_1= 'greater equal' )
+                    // InternalTableDSL.g:11224:4: enumLiteral_1= 'greater equal'
                     {
-                    enumLiteral_1=(Token)match(input,167,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_1=(Token)match(input,164,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getStyleCompareAccess().getGreaterEqualEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
@@ -33112,12 +31738,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:11761:3: (enumLiteral_2= 'greater than' )
+                    // InternalTableDSL.g:11231:3: (enumLiteral_2= 'greater than' )
                     {
-                    // InternalTableDSL.g:11761:3: (enumLiteral_2= 'greater than' )
-                    // InternalTableDSL.g:11762:4: enumLiteral_2= 'greater than'
+                    // InternalTableDSL.g:11231:3: (enumLiteral_2= 'greater than' )
+                    // InternalTableDSL.g:11232:4: enumLiteral_2= 'greater than'
                     {
-                    enumLiteral_2=(Token)match(input,168,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_2=(Token)match(input,165,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getStyleCompareAccess().getGreaterThanEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
@@ -33131,12 +31757,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:11769:3: (enumLiteral_3= 'lower equal' )
+                    // InternalTableDSL.g:11239:3: (enumLiteral_3= 'lower equal' )
                     {
-                    // InternalTableDSL.g:11769:3: (enumLiteral_3= 'lower equal' )
-                    // InternalTableDSL.g:11770:4: enumLiteral_3= 'lower equal'
+                    // InternalTableDSL.g:11239:3: (enumLiteral_3= 'lower equal' )
+                    // InternalTableDSL.g:11240:4: enumLiteral_3= 'lower equal'
                     {
-                    enumLiteral_3=(Token)match(input,169,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_3=(Token)match(input,166,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getStyleCompareAccess().getLowerEqualEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
@@ -33150,12 +31776,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:11777:3: (enumLiteral_4= 'lower than' )
+                    // InternalTableDSL.g:11247:3: (enumLiteral_4= 'lower than' )
                     {
-                    // InternalTableDSL.g:11777:3: (enumLiteral_4= 'lower than' )
-                    // InternalTableDSL.g:11778:4: enumLiteral_4= 'lower than'
+                    // InternalTableDSL.g:11247:3: (enumLiteral_4= 'lower than' )
+                    // InternalTableDSL.g:11248:4: enumLiteral_4= 'lower than'
                     {
-                    enumLiteral_4=(Token)match(input,170,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_4=(Token)match(input,167,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getStyleCompareAccess().getLowerThanEnumLiteralDeclaration_4().getEnumLiteral().getInstance();
@@ -33169,12 +31795,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 6 :
-                    // InternalTableDSL.g:11785:3: (enumLiteral_5= 'not equal' )
+                    // InternalTableDSL.g:11255:3: (enumLiteral_5= 'not equal' )
                     {
-                    // InternalTableDSL.g:11785:3: (enumLiteral_5= 'not equal' )
-                    // InternalTableDSL.g:11786:4: enumLiteral_5= 'not equal'
+                    // InternalTableDSL.g:11255:3: (enumLiteral_5= 'not equal' )
+                    // InternalTableDSL.g:11256:4: enumLiteral_5= 'not equal'
                     {
-                    enumLiteral_5=(Token)match(input,171,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_5=(Token)match(input,168,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getStyleCompareAccess().getNotEqualEnumLiteralDeclaration_5().getEnumLiteral().getInstance();
@@ -33212,7 +31838,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTrendIconEnum"
-    // InternalTableDSL.g:11796:1: ruleTrendIconEnum returns [Enumerator current=null] : ( (enumLiteral_0= 'rising' ) | (enumLiteral_1= 'bad-rising' ) | (enumLiteral_2= 'sloping' ) | (enumLiteral_3= 'good-sloping' ) | (enumLiteral_4= 'stagnating' ) ) ;
+    // InternalTableDSL.g:11266:1: ruleTrendIconEnum returns [Enumerator current=null] : ( (enumLiteral_0= 'rising' ) | (enumLiteral_1= 'bad-rising' ) | (enumLiteral_2= 'sloping' ) | (enumLiteral_3= 'good-sloping' ) | (enumLiteral_4= 'stagnating' ) ) ;
     public final Enumerator ruleTrendIconEnum() throws RecognitionException {
         Enumerator current = null;
 
@@ -33226,53 +31852,53 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11802:2: ( ( (enumLiteral_0= 'rising' ) | (enumLiteral_1= 'bad-rising' ) | (enumLiteral_2= 'sloping' ) | (enumLiteral_3= 'good-sloping' ) | (enumLiteral_4= 'stagnating' ) ) )
-            // InternalTableDSL.g:11803:2: ( (enumLiteral_0= 'rising' ) | (enumLiteral_1= 'bad-rising' ) | (enumLiteral_2= 'sloping' ) | (enumLiteral_3= 'good-sloping' ) | (enumLiteral_4= 'stagnating' ) )
+            // InternalTableDSL.g:11272:2: ( ( (enumLiteral_0= 'rising' ) | (enumLiteral_1= 'bad-rising' ) | (enumLiteral_2= 'sloping' ) | (enumLiteral_3= 'good-sloping' ) | (enumLiteral_4= 'stagnating' ) ) )
+            // InternalTableDSL.g:11273:2: ( (enumLiteral_0= 'rising' ) | (enumLiteral_1= 'bad-rising' ) | (enumLiteral_2= 'sloping' ) | (enumLiteral_3= 'good-sloping' ) | (enumLiteral_4= 'stagnating' ) )
             {
-            // InternalTableDSL.g:11803:2: ( (enumLiteral_0= 'rising' ) | (enumLiteral_1= 'bad-rising' ) | (enumLiteral_2= 'sloping' ) | (enumLiteral_3= 'good-sloping' ) | (enumLiteral_4= 'stagnating' ) )
-            int alt173=5;
+            // InternalTableDSL.g:11273:2: ( (enumLiteral_0= 'rising' ) | (enumLiteral_1= 'bad-rising' ) | (enumLiteral_2= 'sloping' ) | (enumLiteral_3= 'good-sloping' ) | (enumLiteral_4= 'stagnating' ) )
+            int alt168=5;
             switch ( input.LA(1) ) {
-            case 172:
+            case 169:
                 {
-                alt173=1;
+                alt168=1;
                 }
                 break;
-            case 173:
+            case 170:
                 {
-                alt173=2;
+                alt168=2;
                 }
                 break;
-            case 174:
+            case 171:
                 {
-                alt173=3;
+                alt168=3;
                 }
                 break;
-            case 175:
+            case 172:
                 {
-                alt173=4;
+                alt168=4;
                 }
                 break;
-            case 176:
+            case 173:
                 {
-                alt173=5;
+                alt168=5;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 173, 0, input);
+                    new NoViableAltException("", 168, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt173) {
+            switch (alt168) {
                 case 1 :
-                    // InternalTableDSL.g:11804:3: (enumLiteral_0= 'rising' )
+                    // InternalTableDSL.g:11274:3: (enumLiteral_0= 'rising' )
                     {
-                    // InternalTableDSL.g:11804:3: (enumLiteral_0= 'rising' )
-                    // InternalTableDSL.g:11805:4: enumLiteral_0= 'rising'
+                    // InternalTableDSL.g:11274:3: (enumLiteral_0= 'rising' )
+                    // InternalTableDSL.g:11275:4: enumLiteral_0= 'rising'
                     {
-                    enumLiteral_0=(Token)match(input,172,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_0=(Token)match(input,169,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getTrendIconEnumAccess().getRISINGEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
@@ -33286,12 +31912,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:11812:3: (enumLiteral_1= 'bad-rising' )
+                    // InternalTableDSL.g:11282:3: (enumLiteral_1= 'bad-rising' )
                     {
-                    // InternalTableDSL.g:11812:3: (enumLiteral_1= 'bad-rising' )
-                    // InternalTableDSL.g:11813:4: enumLiteral_1= 'bad-rising'
+                    // InternalTableDSL.g:11282:3: (enumLiteral_1= 'bad-rising' )
+                    // InternalTableDSL.g:11283:4: enumLiteral_1= 'bad-rising'
                     {
-                    enumLiteral_1=(Token)match(input,173,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_1=(Token)match(input,170,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getTrendIconEnumAccess().getBADRISINGEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
@@ -33305,12 +31931,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:11820:3: (enumLiteral_2= 'sloping' )
+                    // InternalTableDSL.g:11290:3: (enumLiteral_2= 'sloping' )
                     {
-                    // InternalTableDSL.g:11820:3: (enumLiteral_2= 'sloping' )
-                    // InternalTableDSL.g:11821:4: enumLiteral_2= 'sloping'
+                    // InternalTableDSL.g:11290:3: (enumLiteral_2= 'sloping' )
+                    // InternalTableDSL.g:11291:4: enumLiteral_2= 'sloping'
                     {
-                    enumLiteral_2=(Token)match(input,174,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_2=(Token)match(input,171,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getTrendIconEnumAccess().getSLOPINGEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
@@ -33324,12 +31950,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:11828:3: (enumLiteral_3= 'good-sloping' )
+                    // InternalTableDSL.g:11298:3: (enumLiteral_3= 'good-sloping' )
                     {
-                    // InternalTableDSL.g:11828:3: (enumLiteral_3= 'good-sloping' )
-                    // InternalTableDSL.g:11829:4: enumLiteral_3= 'good-sloping'
+                    // InternalTableDSL.g:11298:3: (enumLiteral_3= 'good-sloping' )
+                    // InternalTableDSL.g:11299:4: enumLiteral_3= 'good-sloping'
                     {
-                    enumLiteral_3=(Token)match(input,175,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_3=(Token)match(input,172,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getTrendIconEnumAccess().getGOODSLOPINGEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
@@ -33343,12 +31969,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:11836:3: (enumLiteral_4= 'stagnating' )
+                    // InternalTableDSL.g:11306:3: (enumLiteral_4= 'stagnating' )
                     {
-                    // InternalTableDSL.g:11836:3: (enumLiteral_4= 'stagnating' )
-                    // InternalTableDSL.g:11837:4: enumLiteral_4= 'stagnating'
+                    // InternalTableDSL.g:11306:3: (enumLiteral_4= 'stagnating' )
+                    // InternalTableDSL.g:11307:4: enumLiteral_4= 'stagnating'
                     {
-                    enumLiteral_4=(Token)match(input,176,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_4=(Token)match(input,173,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getTrendIconEnumAccess().getSTAGNATINGEnumLiteralDeclaration_4().getEnumLiteral().getInstance();
@@ -33386,7 +32012,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRowHeaderMode"
-    // InternalTableDSL.g:11847:1: ruleRowHeaderMode returns [Enumerator current=null] : ( (enumLiteral_0= 'hidden' ) | (enumLiteral_1= 'explicit' ) | (enumLiteral_2= 'indexed' ) ) ;
+    // InternalTableDSL.g:11317:1: ruleRowHeaderMode returns [Enumerator current=null] : ( (enumLiteral_0= 'hidden' ) | (enumLiteral_1= 'explicit' ) | (enumLiteral_2= 'indexed' ) ) ;
     public final Enumerator ruleRowHeaderMode() throws RecognitionException {
         Enumerator current = null;
 
@@ -33398,43 +32024,43 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11853:2: ( ( (enumLiteral_0= 'hidden' ) | (enumLiteral_1= 'explicit' ) | (enumLiteral_2= 'indexed' ) ) )
-            // InternalTableDSL.g:11854:2: ( (enumLiteral_0= 'hidden' ) | (enumLiteral_1= 'explicit' ) | (enumLiteral_2= 'indexed' ) )
+            // InternalTableDSL.g:11323:2: ( ( (enumLiteral_0= 'hidden' ) | (enumLiteral_1= 'explicit' ) | (enumLiteral_2= 'indexed' ) ) )
+            // InternalTableDSL.g:11324:2: ( (enumLiteral_0= 'hidden' ) | (enumLiteral_1= 'explicit' ) | (enumLiteral_2= 'indexed' ) )
             {
-            // InternalTableDSL.g:11854:2: ( (enumLiteral_0= 'hidden' ) | (enumLiteral_1= 'explicit' ) | (enumLiteral_2= 'indexed' ) )
-            int alt174=3;
+            // InternalTableDSL.g:11324:2: ( (enumLiteral_0= 'hidden' ) | (enumLiteral_1= 'explicit' ) | (enumLiteral_2= 'indexed' ) )
+            int alt169=3;
             switch ( input.LA(1) ) {
-            case 177:
+            case 174:
                 {
-                alt174=1;
+                alt169=1;
                 }
                 break;
-            case 178:
+            case 175:
                 {
-                alt174=2;
+                alt169=2;
                 }
                 break;
-            case 179:
+            case 176:
                 {
-                alt174=3;
+                alt169=3;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 174, 0, input);
+                    new NoViableAltException("", 169, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt174) {
+            switch (alt169) {
                 case 1 :
-                    // InternalTableDSL.g:11855:3: (enumLiteral_0= 'hidden' )
+                    // InternalTableDSL.g:11325:3: (enumLiteral_0= 'hidden' )
                     {
-                    // InternalTableDSL.g:11855:3: (enumLiteral_0= 'hidden' )
-                    // InternalTableDSL.g:11856:4: enumLiteral_0= 'hidden'
+                    // InternalTableDSL.g:11325:3: (enumLiteral_0= 'hidden' )
+                    // InternalTableDSL.g:11326:4: enumLiteral_0= 'hidden'
                     {
-                    enumLiteral_0=(Token)match(input,177,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_0=(Token)match(input,174,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getRowHeaderModeAccess().getHIDDENEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
@@ -33448,12 +32074,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:11863:3: (enumLiteral_1= 'explicit' )
+                    // InternalTableDSL.g:11333:3: (enumLiteral_1= 'explicit' )
                     {
-                    // InternalTableDSL.g:11863:3: (enumLiteral_1= 'explicit' )
-                    // InternalTableDSL.g:11864:4: enumLiteral_1= 'explicit'
+                    // InternalTableDSL.g:11333:3: (enumLiteral_1= 'explicit' )
+                    // InternalTableDSL.g:11334:4: enumLiteral_1= 'explicit'
                     {
-                    enumLiteral_1=(Token)match(input,178,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_1=(Token)match(input,175,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getRowHeaderModeAccess().getEXPLICIT_DEFAULTS_IDEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
@@ -33467,12 +32093,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:11871:3: (enumLiteral_2= 'indexed' )
+                    // InternalTableDSL.g:11341:3: (enumLiteral_2= 'indexed' )
                     {
-                    // InternalTableDSL.g:11871:3: (enumLiteral_2= 'indexed' )
-                    // InternalTableDSL.g:11872:4: enumLiteral_2= 'indexed'
+                    // InternalTableDSL.g:11341:3: (enumLiteral_2= 'indexed' )
+                    // InternalTableDSL.g:11342:4: enumLiteral_2= 'indexed'
                     {
-                    enumLiteral_2=(Token)match(input,179,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_2=(Token)match(input,176,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getRowHeaderModeAccess().getINDEXEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
@@ -33510,7 +32136,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAxisEnum"
-    // InternalTableDSL.g:11882:1: ruleAxisEnum returns [Enumerator current=null] : ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'columns' ) | (enumLiteral_2= 'rows' ) | (enumLiteral_3= 'pages' ) | (enumLiteral_4= 'sections' ) | (enumLiteral_5= 'chapters' ) ) ;
+    // InternalTableDSL.g:11352:1: ruleAxisEnum returns [Enumerator current=null] : ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'columns' ) | (enumLiteral_2= 'rows' ) | (enumLiteral_3= 'pages' ) | (enumLiteral_4= 'sections' ) | (enumLiteral_5= 'chapters' ) ) ;
     public final Enumerator ruleAxisEnum() throws RecognitionException {
         Enumerator current = null;
 
@@ -33525,58 +32151,58 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalTableDSL.g:11888:2: ( ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'columns' ) | (enumLiteral_2= 'rows' ) | (enumLiteral_3= 'pages' ) | (enumLiteral_4= 'sections' ) | (enumLiteral_5= 'chapters' ) ) )
-            // InternalTableDSL.g:11889:2: ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'columns' ) | (enumLiteral_2= 'rows' ) | (enumLiteral_3= 'pages' ) | (enumLiteral_4= 'sections' ) | (enumLiteral_5= 'chapters' ) )
+            // InternalTableDSL.g:11358:2: ( ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'columns' ) | (enumLiteral_2= 'rows' ) | (enumLiteral_3= 'pages' ) | (enumLiteral_4= 'sections' ) | (enumLiteral_5= 'chapters' ) ) )
+            // InternalTableDSL.g:11359:2: ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'columns' ) | (enumLiteral_2= 'rows' ) | (enumLiteral_3= 'pages' ) | (enumLiteral_4= 'sections' ) | (enumLiteral_5= 'chapters' ) )
             {
-            // InternalTableDSL.g:11889:2: ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'columns' ) | (enumLiteral_2= 'rows' ) | (enumLiteral_3= 'pages' ) | (enumLiteral_4= 'sections' ) | (enumLiteral_5= 'chapters' ) )
-            int alt175=6;
+            // InternalTableDSL.g:11359:2: ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'columns' ) | (enumLiteral_2= 'rows' ) | (enumLiteral_3= 'pages' ) | (enumLiteral_4= 'sections' ) | (enumLiteral_5= 'chapters' ) )
+            int alt170=6;
             switch ( input.LA(1) ) {
-            case 144:
+            case 141:
                 {
-                alt175=1;
+                alt170=1;
                 }
                 break;
-            case 180:
+            case 177:
                 {
-                alt175=2;
+                alt170=2;
                 }
                 break;
-            case 181:
+            case 178:
                 {
-                alt175=3;
+                alt170=3;
                 }
                 break;
-            case 182:
+            case 179:
                 {
-                alt175=4;
+                alt170=4;
                 }
                 break;
-            case 183:
+            case 180:
                 {
-                alt175=5;
+                alt170=5;
                 }
                 break;
-            case 184:
+            case 181:
                 {
-                alt175=6;
+                alt170=6;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 175, 0, input);
+                    new NoViableAltException("", 170, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt175) {
+            switch (alt170) {
                 case 1 :
-                    // InternalTableDSL.g:11890:3: (enumLiteral_0= 'default' )
+                    // InternalTableDSL.g:11360:3: (enumLiteral_0= 'default' )
                     {
-                    // InternalTableDSL.g:11890:3: (enumLiteral_0= 'default' )
-                    // InternalTableDSL.g:11891:4: enumLiteral_0= 'default'
+                    // InternalTableDSL.g:11360:3: (enumLiteral_0= 'default' )
+                    // InternalTableDSL.g:11361:4: enumLiteral_0= 'default'
                     {
-                    enumLiteral_0=(Token)match(input,144,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_0=(Token)match(input,141,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getAxisEnumAccess().getDEFAULTEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
@@ -33590,12 +32216,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalTableDSL.g:11898:3: (enumLiteral_1= 'columns' )
+                    // InternalTableDSL.g:11368:3: (enumLiteral_1= 'columns' )
                     {
-                    // InternalTableDSL.g:11898:3: (enumLiteral_1= 'columns' )
-                    // InternalTableDSL.g:11899:4: enumLiteral_1= 'columns'
+                    // InternalTableDSL.g:11368:3: (enumLiteral_1= 'columns' )
+                    // InternalTableDSL.g:11369:4: enumLiteral_1= 'columns'
                     {
-                    enumLiteral_1=(Token)match(input,180,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_1=(Token)match(input,177,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getAxisEnumAccess().getCOLUMNSEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
@@ -33609,12 +32235,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalTableDSL.g:11906:3: (enumLiteral_2= 'rows' )
+                    // InternalTableDSL.g:11376:3: (enumLiteral_2= 'rows' )
                     {
-                    // InternalTableDSL.g:11906:3: (enumLiteral_2= 'rows' )
-                    // InternalTableDSL.g:11907:4: enumLiteral_2= 'rows'
+                    // InternalTableDSL.g:11376:3: (enumLiteral_2= 'rows' )
+                    // InternalTableDSL.g:11377:4: enumLiteral_2= 'rows'
                     {
-                    enumLiteral_2=(Token)match(input,181,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_2=(Token)match(input,178,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getAxisEnumAccess().getROWSEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
@@ -33628,12 +32254,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalTableDSL.g:11914:3: (enumLiteral_3= 'pages' )
+                    // InternalTableDSL.g:11384:3: (enumLiteral_3= 'pages' )
                     {
-                    // InternalTableDSL.g:11914:3: (enumLiteral_3= 'pages' )
-                    // InternalTableDSL.g:11915:4: enumLiteral_3= 'pages'
+                    // InternalTableDSL.g:11384:3: (enumLiteral_3= 'pages' )
+                    // InternalTableDSL.g:11385:4: enumLiteral_3= 'pages'
                     {
-                    enumLiteral_3=(Token)match(input,182,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_3=(Token)match(input,179,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getAxisEnumAccess().getPAGESEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
@@ -33647,12 +32273,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalTableDSL.g:11922:3: (enumLiteral_4= 'sections' )
+                    // InternalTableDSL.g:11392:3: (enumLiteral_4= 'sections' )
                     {
-                    // InternalTableDSL.g:11922:3: (enumLiteral_4= 'sections' )
-                    // InternalTableDSL.g:11923:4: enumLiteral_4= 'sections'
+                    // InternalTableDSL.g:11392:3: (enumLiteral_4= 'sections' )
+                    // InternalTableDSL.g:11393:4: enumLiteral_4= 'sections'
                     {
-                    enumLiteral_4=(Token)match(input,183,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_4=(Token)match(input,180,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getAxisEnumAccess().getSECTIONSEnumLiteralDeclaration_4().getEnumLiteral().getInstance();
@@ -33666,12 +32292,12 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 6 :
-                    // InternalTableDSL.g:11930:3: (enumLiteral_5= 'chapters' )
+                    // InternalTableDSL.g:11400:3: (enumLiteral_5= 'chapters' )
                     {
-                    // InternalTableDSL.g:11930:3: (enumLiteral_5= 'chapters' )
-                    // InternalTableDSL.g:11931:4: enumLiteral_5= 'chapters'
+                    // InternalTableDSL.g:11400:3: (enumLiteral_5= 'chapters' )
+                    // InternalTableDSL.g:11401:4: enumLiteral_5= 'chapters'
                     {
-                    enumLiteral_5=(Token)match(input,184,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_5=(Token)match(input,181,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current = grammarAccess.getAxisEnumAccess().getCHAPTERSEnumLiteralDeclaration_5().getEnumLiteral().getInstance();
@@ -33709,10 +32335,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred1_InternalTableDSL
     public final void synpred1_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:5113:5: ( '(' )
-        // InternalTableDSL.g:5113:6: '('
+        // InternalTableDSL.g:4583:5: ( '(' )
+        // InternalTableDSL.g:4583:6: '('
         {
-        match(input,103,FOLLOW_2); if (state.failed) return ;
+        match(input,100,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -33720,19 +32346,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred2_InternalTableDSL
     public final void synpred2_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:5122:7: ( ( ( ( ruleValidID ) ) '=' ) )
-        // InternalTableDSL.g:5122:8: ( ( ( ruleValidID ) ) '=' )
+        // InternalTableDSL.g:4592:7: ( ( ( ( ruleValidID ) ) '=' ) )
+        // InternalTableDSL.g:4592:8: ( ( ( ruleValidID ) ) '=' )
         {
-        // InternalTableDSL.g:5122:8: ( ( ( ruleValidID ) ) '=' )
-        // InternalTableDSL.g:5123:8: ( ( ruleValidID ) ) '='
+        // InternalTableDSL.g:4592:8: ( ( ( ruleValidID ) ) '=' )
+        // InternalTableDSL.g:4593:8: ( ( ruleValidID ) ) '='
         {
-        // InternalTableDSL.g:5123:8: ( ( ruleValidID ) )
-        // InternalTableDSL.g:5124:9: ( ruleValidID )
+        // InternalTableDSL.g:4593:8: ( ( ruleValidID ) )
+        // InternalTableDSL.g:4594:9: ( ruleValidID )
         {
-        // InternalTableDSL.g:5124:9: ( ruleValidID )
-        // InternalTableDSL.g:5125:10: ruleValidID
+        // InternalTableDSL.g:4594:9: ( ruleValidID )
+        // InternalTableDSL.g:4595:10: ruleValidID
         {
-        pushFollow(FOLLOW_65);
+        pushFollow(FOLLOW_64);
         ruleValidID();
 
         state._fsp--;
@@ -33743,7 +32369,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
         }
 
-        match(input,106,FOLLOW_2); if (state.failed) return ;
+        match(input,103,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -33754,19 +32380,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred5_InternalTableDSL
     public final void synpred5_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:5302:5: ( ( () '#' '[' ) )
-        // InternalTableDSL.g:5302:6: ( () '#' '[' )
+        // InternalTableDSL.g:4772:5: ( ( () '#' '[' ) )
+        // InternalTableDSL.g:4772:6: ( () '#' '[' )
         {
-        // InternalTableDSL.g:5302:6: ( () '#' '[' )
-        // InternalTableDSL.g:5303:6: () '#' '['
+        // InternalTableDSL.g:4772:6: ( () '#' '[' )
+        // InternalTableDSL.g:4773:6: () '#' '['
         {
-        // InternalTableDSL.g:5303:6: ()
-        // InternalTableDSL.g:5304:6: 
+        // InternalTableDSL.g:4773:6: ()
+        // InternalTableDSL.g:4774:6: 
         {
         }
 
-        match(input,107,FOLLOW_67); if (state.failed) return ;
-        match(input,108,FOLLOW_2); if (state.failed) return ;
+        match(input,104,FOLLOW_66); if (state.failed) return ;
+        match(input,105,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -33777,19 +32403,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred6_InternalTableDSL
     public final void synpred6_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:5444:5: ( ( () '#' '[' ) )
-        // InternalTableDSL.g:5444:6: ( () '#' '[' )
+        // InternalTableDSL.g:4914:5: ( ( () '#' '[' ) )
+        // InternalTableDSL.g:4914:6: ( () '#' '[' )
         {
-        // InternalTableDSL.g:5444:6: ( () '#' '[' )
-        // InternalTableDSL.g:5445:6: () '#' '['
+        // InternalTableDSL.g:4914:6: ( () '#' '[' )
+        // InternalTableDSL.g:4915:6: () '#' '['
         {
-        // InternalTableDSL.g:5445:6: ()
-        // InternalTableDSL.g:5446:6: 
+        // InternalTableDSL.g:4915:6: ()
+        // InternalTableDSL.g:4916:6: 
         {
         }
 
-        match(input,107,FOLLOW_67); if (state.failed) return ;
-        match(input,108,FOLLOW_2); if (state.failed) return ;
+        match(input,104,FOLLOW_66); if (state.failed) return ;
+        match(input,105,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -33800,22 +32426,22 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred7_InternalTableDSL
     public final void synpred7_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:5672:6: ( ( () ( ( ruleOpMultiAssign ) ) ) )
-        // InternalTableDSL.g:5672:7: ( () ( ( ruleOpMultiAssign ) ) )
+        // InternalTableDSL.g:5142:6: ( ( () ( ( ruleOpMultiAssign ) ) ) )
+        // InternalTableDSL.g:5142:7: ( () ( ( ruleOpMultiAssign ) ) )
         {
-        // InternalTableDSL.g:5672:7: ( () ( ( ruleOpMultiAssign ) ) )
-        // InternalTableDSL.g:5673:7: () ( ( ruleOpMultiAssign ) )
+        // InternalTableDSL.g:5142:7: ( () ( ( ruleOpMultiAssign ) ) )
+        // InternalTableDSL.g:5143:7: () ( ( ruleOpMultiAssign ) )
         {
-        // InternalTableDSL.g:5673:7: ()
-        // InternalTableDSL.g:5674:7: 
+        // InternalTableDSL.g:5143:7: ()
+        // InternalTableDSL.g:5144:7: 
         {
         }
 
-        // InternalTableDSL.g:5675:7: ( ( ruleOpMultiAssign ) )
-        // InternalTableDSL.g:5676:8: ( ruleOpMultiAssign )
+        // InternalTableDSL.g:5145:7: ( ( ruleOpMultiAssign ) )
+        // InternalTableDSL.g:5146:8: ( ruleOpMultiAssign )
         {
-        // InternalTableDSL.g:5676:8: ( ruleOpMultiAssign )
-        // InternalTableDSL.g:5677:9: ruleOpMultiAssign
+        // InternalTableDSL.g:5146:8: ( ruleOpMultiAssign )
+        // InternalTableDSL.g:5147:9: ruleOpMultiAssign
         {
         pushFollow(FOLLOW_2);
         ruleOpMultiAssign();
@@ -33838,22 +32464,22 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred8_InternalTableDSL
     public final void synpred8_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:5866:5: ( ( () ( ( ruleOpOr ) ) ) )
-        // InternalTableDSL.g:5866:6: ( () ( ( ruleOpOr ) ) )
+        // InternalTableDSL.g:5336:5: ( ( () ( ( ruleOpOr ) ) ) )
+        // InternalTableDSL.g:5336:6: ( () ( ( ruleOpOr ) ) )
         {
-        // InternalTableDSL.g:5866:6: ( () ( ( ruleOpOr ) ) )
-        // InternalTableDSL.g:5867:6: () ( ( ruleOpOr ) )
+        // InternalTableDSL.g:5336:6: ( () ( ( ruleOpOr ) ) )
+        // InternalTableDSL.g:5337:6: () ( ( ruleOpOr ) )
         {
-        // InternalTableDSL.g:5867:6: ()
-        // InternalTableDSL.g:5868:6: 
+        // InternalTableDSL.g:5337:6: ()
+        // InternalTableDSL.g:5338:6: 
         {
         }
 
-        // InternalTableDSL.g:5869:6: ( ( ruleOpOr ) )
-        // InternalTableDSL.g:5870:7: ( ruleOpOr )
+        // InternalTableDSL.g:5339:6: ( ( ruleOpOr ) )
+        // InternalTableDSL.g:5340:7: ( ruleOpOr )
         {
-        // InternalTableDSL.g:5870:7: ( ruleOpOr )
-        // InternalTableDSL.g:5871:8: ruleOpOr
+        // InternalTableDSL.g:5340:7: ( ruleOpOr )
+        // InternalTableDSL.g:5341:8: ruleOpOr
         {
         pushFollow(FOLLOW_2);
         ruleOpOr();
@@ -33876,22 +32502,22 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred9_InternalTableDSL
     public final void synpred9_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:5973:5: ( ( () ( ( ruleOpAnd ) ) ) )
-        // InternalTableDSL.g:5973:6: ( () ( ( ruleOpAnd ) ) )
+        // InternalTableDSL.g:5443:5: ( ( () ( ( ruleOpAnd ) ) ) )
+        // InternalTableDSL.g:5443:6: ( () ( ( ruleOpAnd ) ) )
         {
-        // InternalTableDSL.g:5973:6: ( () ( ( ruleOpAnd ) ) )
-        // InternalTableDSL.g:5974:6: () ( ( ruleOpAnd ) )
+        // InternalTableDSL.g:5443:6: ( () ( ( ruleOpAnd ) ) )
+        // InternalTableDSL.g:5444:6: () ( ( ruleOpAnd ) )
         {
-        // InternalTableDSL.g:5974:6: ()
-        // InternalTableDSL.g:5975:6: 
+        // InternalTableDSL.g:5444:6: ()
+        // InternalTableDSL.g:5445:6: 
         {
         }
 
-        // InternalTableDSL.g:5976:6: ( ( ruleOpAnd ) )
-        // InternalTableDSL.g:5977:7: ( ruleOpAnd )
+        // InternalTableDSL.g:5446:6: ( ( ruleOpAnd ) )
+        // InternalTableDSL.g:5447:7: ( ruleOpAnd )
         {
-        // InternalTableDSL.g:5977:7: ( ruleOpAnd )
-        // InternalTableDSL.g:5978:8: ruleOpAnd
+        // InternalTableDSL.g:5447:7: ( ruleOpAnd )
+        // InternalTableDSL.g:5448:8: ruleOpAnd
         {
         pushFollow(FOLLOW_2);
         ruleOpAnd();
@@ -33914,22 +32540,22 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred10_InternalTableDSL
     public final void synpred10_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:6080:5: ( ( () ( ( ruleOpEquality ) ) ) )
-        // InternalTableDSL.g:6080:6: ( () ( ( ruleOpEquality ) ) )
+        // InternalTableDSL.g:5550:5: ( ( () ( ( ruleOpEquality ) ) ) )
+        // InternalTableDSL.g:5550:6: ( () ( ( ruleOpEquality ) ) )
         {
-        // InternalTableDSL.g:6080:6: ( () ( ( ruleOpEquality ) ) )
-        // InternalTableDSL.g:6081:6: () ( ( ruleOpEquality ) )
+        // InternalTableDSL.g:5550:6: ( () ( ( ruleOpEquality ) ) )
+        // InternalTableDSL.g:5551:6: () ( ( ruleOpEquality ) )
         {
-        // InternalTableDSL.g:6081:6: ()
-        // InternalTableDSL.g:6082:6: 
+        // InternalTableDSL.g:5551:6: ()
+        // InternalTableDSL.g:5552:6: 
         {
         }
 
-        // InternalTableDSL.g:6083:6: ( ( ruleOpEquality ) )
-        // InternalTableDSL.g:6084:7: ( ruleOpEquality )
+        // InternalTableDSL.g:5553:6: ( ( ruleOpEquality ) )
+        // InternalTableDSL.g:5554:7: ( ruleOpEquality )
         {
-        // InternalTableDSL.g:6084:7: ( ruleOpEquality )
-        // InternalTableDSL.g:6085:8: ruleOpEquality
+        // InternalTableDSL.g:5554:7: ( ruleOpEquality )
+        // InternalTableDSL.g:5555:8: ruleOpEquality
         {
         pushFollow(FOLLOW_2);
         ruleOpEquality();
@@ -33952,18 +32578,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred11_InternalTableDSL
     public final void synpred11_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:6208:6: ( ( () 'instanceof' ) )
-        // InternalTableDSL.g:6208:7: ( () 'instanceof' )
+        // InternalTableDSL.g:5678:6: ( ( () 'instanceof' ) )
+        // InternalTableDSL.g:5678:7: ( () 'instanceof' )
         {
-        // InternalTableDSL.g:6208:7: ( () 'instanceof' )
-        // InternalTableDSL.g:6209:7: () 'instanceof'
+        // InternalTableDSL.g:5678:7: ( () 'instanceof' )
+        // InternalTableDSL.g:5679:7: () 'instanceof'
         {
-        // InternalTableDSL.g:6209:7: ()
-        // InternalTableDSL.g:6210:7: 
+        // InternalTableDSL.g:5679:7: ()
+        // InternalTableDSL.g:5680:7: 
         {
         }
 
-        match(input,124,FOLLOW_2); if (state.failed) return ;
+        match(input,121,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -33974,22 +32600,22 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred12_InternalTableDSL
     public final void synpred12_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:6251:6: ( ( () ( ( ruleOpCompare ) ) ) )
-        // InternalTableDSL.g:6251:7: ( () ( ( ruleOpCompare ) ) )
+        // InternalTableDSL.g:5721:6: ( ( () ( ( ruleOpCompare ) ) ) )
+        // InternalTableDSL.g:5721:7: ( () ( ( ruleOpCompare ) ) )
         {
-        // InternalTableDSL.g:6251:7: ( () ( ( ruleOpCompare ) ) )
-        // InternalTableDSL.g:6252:7: () ( ( ruleOpCompare ) )
+        // InternalTableDSL.g:5721:7: ( () ( ( ruleOpCompare ) ) )
+        // InternalTableDSL.g:5722:7: () ( ( ruleOpCompare ) )
         {
-        // InternalTableDSL.g:6252:7: ()
-        // InternalTableDSL.g:6253:7: 
+        // InternalTableDSL.g:5722:7: ()
+        // InternalTableDSL.g:5723:7: 
         {
         }
 
-        // InternalTableDSL.g:6254:7: ( ( ruleOpCompare ) )
-        // InternalTableDSL.g:6255:8: ( ruleOpCompare )
+        // InternalTableDSL.g:5724:7: ( ( ruleOpCompare ) )
+        // InternalTableDSL.g:5725:8: ( ruleOpCompare )
         {
-        // InternalTableDSL.g:6255:8: ( ruleOpCompare )
-        // InternalTableDSL.g:6256:9: ruleOpCompare
+        // InternalTableDSL.g:5725:8: ( ruleOpCompare )
+        // InternalTableDSL.g:5726:9: ruleOpCompare
         {
         pushFollow(FOLLOW_2);
         ruleOpCompare();
@@ -34012,22 +32638,22 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred13_InternalTableDSL
     public final void synpred13_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:6386:5: ( ( () ( ( ruleOpOther ) ) ) )
-        // InternalTableDSL.g:6386:6: ( () ( ( ruleOpOther ) ) )
+        // InternalTableDSL.g:5856:5: ( ( () ( ( ruleOpOther ) ) ) )
+        // InternalTableDSL.g:5856:6: ( () ( ( ruleOpOther ) ) )
         {
-        // InternalTableDSL.g:6386:6: ( () ( ( ruleOpOther ) ) )
-        // InternalTableDSL.g:6387:6: () ( ( ruleOpOther ) )
+        // InternalTableDSL.g:5856:6: ( () ( ( ruleOpOther ) ) )
+        // InternalTableDSL.g:5857:6: () ( ( ruleOpOther ) )
         {
-        // InternalTableDSL.g:6387:6: ()
-        // InternalTableDSL.g:6388:6: 
+        // InternalTableDSL.g:5857:6: ()
+        // InternalTableDSL.g:5858:6: 
         {
         }
 
-        // InternalTableDSL.g:6389:6: ( ( ruleOpOther ) )
-        // InternalTableDSL.g:6390:7: ( ruleOpOther )
+        // InternalTableDSL.g:5859:6: ( ( ruleOpOther ) )
+        // InternalTableDSL.g:5860:7: ( ruleOpOther )
         {
-        // InternalTableDSL.g:6390:7: ( ruleOpOther )
-        // InternalTableDSL.g:6391:8: ruleOpOther
+        // InternalTableDSL.g:5860:7: ( ruleOpOther )
+        // InternalTableDSL.g:5861:8: ruleOpOther
         {
         pushFollow(FOLLOW_2);
         ruleOpOther();
@@ -34050,14 +32676,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred14_InternalTableDSL
     public final void synpred14_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:6506:6: ( ( '>' '>' ) )
-        // InternalTableDSL.g:6506:7: ( '>' '>' )
+        // InternalTableDSL.g:5976:6: ( ( '>' '>' ) )
+        // InternalTableDSL.g:5976:7: ( '>' '>' )
         {
-        // InternalTableDSL.g:6506:7: ( '>' '>' )
-        // InternalTableDSL.g:6507:7: '>' '>'
+        // InternalTableDSL.g:5976:7: ( '>' '>' )
+        // InternalTableDSL.g:5977:7: '>' '>'
         {
-        match(input,116,FOLLOW_82); if (state.failed) return ;
-        match(input,116,FOLLOW_2); if (state.failed) return ;
+        match(input,113,FOLLOW_81); if (state.failed) return ;
+        match(input,113,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -34068,14 +32694,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred15_InternalTableDSL
     public final void synpred15_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:6541:6: ( ( '<' '<' ) )
-        // InternalTableDSL.g:6541:7: ( '<' '<' )
+        // InternalTableDSL.g:6011:6: ( ( '<' '<' ) )
+        // InternalTableDSL.g:6011:7: ( '<' '<' )
         {
-        // InternalTableDSL.g:6541:7: ( '<' '<' )
-        // InternalTableDSL.g:6542:7: '<' '<'
+        // InternalTableDSL.g:6011:7: ( '<' '<' )
+        // InternalTableDSL.g:6012:7: '<' '<'
         {
-        match(input,115,FOLLOW_72); if (state.failed) return ;
-        match(input,115,FOLLOW_2); if (state.failed) return ;
+        match(input,112,FOLLOW_71); if (state.failed) return ;
+        match(input,112,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -34086,22 +32712,22 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred16_InternalTableDSL
     public final void synpred16_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:6614:5: ( ( () ( ( ruleOpAdd ) ) ) )
-        // InternalTableDSL.g:6614:6: ( () ( ( ruleOpAdd ) ) )
+        // InternalTableDSL.g:6084:5: ( ( () ( ( ruleOpAdd ) ) ) )
+        // InternalTableDSL.g:6084:6: ( () ( ( ruleOpAdd ) ) )
         {
-        // InternalTableDSL.g:6614:6: ( () ( ( ruleOpAdd ) ) )
-        // InternalTableDSL.g:6615:6: () ( ( ruleOpAdd ) )
+        // InternalTableDSL.g:6084:6: ( () ( ( ruleOpAdd ) ) )
+        // InternalTableDSL.g:6085:6: () ( ( ruleOpAdd ) )
         {
-        // InternalTableDSL.g:6615:6: ()
-        // InternalTableDSL.g:6616:6: 
+        // InternalTableDSL.g:6085:6: ()
+        // InternalTableDSL.g:6086:6: 
         {
         }
 
-        // InternalTableDSL.g:6617:6: ( ( ruleOpAdd ) )
-        // InternalTableDSL.g:6618:7: ( ruleOpAdd )
+        // InternalTableDSL.g:6087:6: ( ( ruleOpAdd ) )
+        // InternalTableDSL.g:6088:7: ( ruleOpAdd )
         {
-        // InternalTableDSL.g:6618:7: ( ruleOpAdd )
-        // InternalTableDSL.g:6619:8: ruleOpAdd
+        // InternalTableDSL.g:6088:7: ( ruleOpAdd )
+        // InternalTableDSL.g:6089:8: ruleOpAdd
         {
         pushFollow(FOLLOW_2);
         ruleOpAdd();
@@ -34124,22 +32750,22 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred17_InternalTableDSL
     public final void synpred17_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:6729:5: ( ( () ( ( ruleOpMulti ) ) ) )
-        // InternalTableDSL.g:6729:6: ( () ( ( ruleOpMulti ) ) )
+        // InternalTableDSL.g:6199:5: ( ( () ( ( ruleOpMulti ) ) ) )
+        // InternalTableDSL.g:6199:6: ( () ( ( ruleOpMulti ) ) )
         {
-        // InternalTableDSL.g:6729:6: ( () ( ( ruleOpMulti ) ) )
-        // InternalTableDSL.g:6730:6: () ( ( ruleOpMulti ) )
+        // InternalTableDSL.g:6199:6: ( () ( ( ruleOpMulti ) ) )
+        // InternalTableDSL.g:6200:6: () ( ( ruleOpMulti ) )
         {
-        // InternalTableDSL.g:6730:6: ()
-        // InternalTableDSL.g:6731:6: 
+        // InternalTableDSL.g:6200:6: ()
+        // InternalTableDSL.g:6201:6: 
         {
         }
 
-        // InternalTableDSL.g:6732:6: ( ( ruleOpMulti ) )
-        // InternalTableDSL.g:6733:7: ( ruleOpMulti )
+        // InternalTableDSL.g:6202:6: ( ( ruleOpMulti ) )
+        // InternalTableDSL.g:6203:7: ( ruleOpMulti )
         {
-        // InternalTableDSL.g:6733:7: ( ruleOpMulti )
-        // InternalTableDSL.g:6734:8: ruleOpMulti
+        // InternalTableDSL.g:6203:7: ( ruleOpMulti )
+        // InternalTableDSL.g:6204:8: ruleOpMulti
         {
         pushFollow(FOLLOW_2);
         ruleOpMulti();
@@ -34162,14 +32788,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred18_InternalTableDSL
     public final void synpred18_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:6964:5: ( ( () 'as' ) )
-        // InternalTableDSL.g:6964:6: ( () 'as' )
+        // InternalTableDSL.g:6434:5: ( ( () 'as' ) )
+        // InternalTableDSL.g:6434:6: ( () 'as' )
         {
-        // InternalTableDSL.g:6964:6: ( () 'as' )
-        // InternalTableDSL.g:6965:6: () 'as'
+        // InternalTableDSL.g:6434:6: ( () 'as' )
+        // InternalTableDSL.g:6435:6: () 'as'
         {
-        // InternalTableDSL.g:6965:6: ()
-        // InternalTableDSL.g:6966:6: 
+        // InternalTableDSL.g:6435:6: ()
+        // InternalTableDSL.g:6436:6: 
         {
         }
 
@@ -34184,22 +32810,22 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred19_InternalTableDSL
     public final void synpred19_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:7032:4: ( ( () ( ( ruleOpPostfix ) ) ) )
-        // InternalTableDSL.g:7032:5: ( () ( ( ruleOpPostfix ) ) )
+        // InternalTableDSL.g:6502:4: ( ( () ( ( ruleOpPostfix ) ) ) )
+        // InternalTableDSL.g:6502:5: ( () ( ( ruleOpPostfix ) ) )
         {
-        // InternalTableDSL.g:7032:5: ( () ( ( ruleOpPostfix ) ) )
-        // InternalTableDSL.g:7033:5: () ( ( ruleOpPostfix ) )
+        // InternalTableDSL.g:6502:5: ( () ( ( ruleOpPostfix ) ) )
+        // InternalTableDSL.g:6503:5: () ( ( ruleOpPostfix ) )
         {
-        // InternalTableDSL.g:7033:5: ()
-        // InternalTableDSL.g:7034:5: 
+        // InternalTableDSL.g:6503:5: ()
+        // InternalTableDSL.g:6504:5: 
         {
         }
 
-        // InternalTableDSL.g:7035:5: ( ( ruleOpPostfix ) )
-        // InternalTableDSL.g:7036:6: ( ruleOpPostfix )
+        // InternalTableDSL.g:6505:5: ( ( ruleOpPostfix ) )
+        // InternalTableDSL.g:6506:6: ( ruleOpPostfix )
         {
-        // InternalTableDSL.g:7036:6: ( ruleOpPostfix )
-        // InternalTableDSL.g:7037:7: ruleOpPostfix
+        // InternalTableDSL.g:6506:6: ( ruleOpPostfix )
+        // InternalTableDSL.g:6507:7: ruleOpPostfix
         {
         pushFollow(FOLLOW_2);
         ruleOpPostfix();
@@ -34222,52 +32848,52 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred20_InternalTableDSL
     public final void synpred20_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:7128:6: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
-        // InternalTableDSL.g:7128:7: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+        // InternalTableDSL.g:6598:6: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
+        // InternalTableDSL.g:6598:7: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
         {
-        // InternalTableDSL.g:7128:7: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
-        // InternalTableDSL.g:7129:7: () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
+        // InternalTableDSL.g:6598:7: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+        // InternalTableDSL.g:6599:7: () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
         {
-        // InternalTableDSL.g:7129:7: ()
-        // InternalTableDSL.g:7130:7: 
+        // InternalTableDSL.g:6599:7: ()
+        // InternalTableDSL.g:6600:7: 
         {
         }
 
-        // InternalTableDSL.g:7131:7: ( '.' | ( ( '::' ) ) )
-        int alt176=2;
-        int LA176_0 = input.LA(1);
+        // InternalTableDSL.g:6601:7: ( '.' | ( ( '::' ) ) )
+        int alt171=2;
+        int LA171_0 = input.LA(1);
 
-        if ( (LA176_0==78) ) {
-            alt176=1;
+        if ( (LA171_0==74) ) {
+            alt171=1;
         }
-        else if ( (LA176_0==137) ) {
-            alt176=2;
+        else if ( (LA171_0==134) ) {
+            alt171=2;
         }
         else {
             if (state.backtracking>0) {state.failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("", 176, 0, input);
+                new NoViableAltException("", 171, 0, input);
 
             throw nvae;
         }
-        switch (alt176) {
+        switch (alt171) {
             case 1 :
-                // InternalTableDSL.g:7132:8: '.'
+                // InternalTableDSL.g:6602:8: '.'
                 {
-                match(input,78,FOLLOW_89); if (state.failed) return ;
+                match(input,74,FOLLOW_88); if (state.failed) return ;
 
                 }
                 break;
             case 2 :
-                // InternalTableDSL.g:7134:8: ( ( '::' ) )
+                // InternalTableDSL.g:6604:8: ( ( '::' ) )
                 {
-                // InternalTableDSL.g:7134:8: ( ( '::' ) )
-                // InternalTableDSL.g:7135:9: ( '::' )
+                // InternalTableDSL.g:6604:8: ( ( '::' ) )
+                // InternalTableDSL.g:6605:9: ( '::' )
                 {
-                // InternalTableDSL.g:7135:9: ( '::' )
-                // InternalTableDSL.g:7136:10: '::'
+                // InternalTableDSL.g:6605:9: ( '::' )
+                // InternalTableDSL.g:6606:10: '::'
                 {
-                match(input,137,FOLLOW_89); if (state.failed) return ;
+                match(input,134,FOLLOW_88); if (state.failed) return ;
 
                 }
 
@@ -34280,13 +32906,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
         }
 
-        // InternalTableDSL.g:7140:7: ( ( ruleFeatureCallID ) )
-        // InternalTableDSL.g:7141:8: ( ruleFeatureCallID )
+        // InternalTableDSL.g:6610:7: ( ( ruleFeatureCallID ) )
+        // InternalTableDSL.g:6611:8: ( ruleFeatureCallID )
         {
-        // InternalTableDSL.g:7141:8: ( ruleFeatureCallID )
-        // InternalTableDSL.g:7142:9: ruleFeatureCallID
+        // InternalTableDSL.g:6611:8: ( ruleFeatureCallID )
+        // InternalTableDSL.g:6612:9: ruleFeatureCallID
         {
-        pushFollow(FOLLOW_65);
+        pushFollow(FOLLOW_64);
         ruleFeatureCallID();
 
         state._fsp--;
@@ -34312,61 +32938,61 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred21_InternalTableDSL
     public final void synpred21_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:7225:6: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )
-        // InternalTableDSL.g:7225:7: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
+        // InternalTableDSL.g:6695:6: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )
+        // InternalTableDSL.g:6695:7: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
         {
-        // InternalTableDSL.g:7225:7: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
-        // InternalTableDSL.g:7226:7: () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
+        // InternalTableDSL.g:6695:7: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
+        // InternalTableDSL.g:6696:7: () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
         {
-        // InternalTableDSL.g:7226:7: ()
-        // InternalTableDSL.g:7227:7: 
+        // InternalTableDSL.g:6696:7: ()
+        // InternalTableDSL.g:6697:7: 
         {
         }
 
-        // InternalTableDSL.g:7228:7: ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
-        int alt177=3;
+        // InternalTableDSL.g:6698:7: ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
+        int alt172=3;
         switch ( input.LA(1) ) {
-        case 78:
+        case 74:
             {
-            alt177=1;
+            alt172=1;
             }
             break;
-        case 138:
+        case 135:
             {
-            alt177=2;
+            alt172=2;
             }
             break;
-        case 137:
+        case 134:
             {
-            alt177=3;
+            alt172=3;
             }
             break;
         default:
             if (state.backtracking>0) {state.failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("", 177, 0, input);
+                new NoViableAltException("", 172, 0, input);
 
             throw nvae;
         }
 
-        switch (alt177) {
+        switch (alt172) {
             case 1 :
-                // InternalTableDSL.g:7229:8: '.'
+                // InternalTableDSL.g:6699:8: '.'
                 {
-                match(input,78,FOLLOW_2); if (state.failed) return ;
+                match(input,74,FOLLOW_2); if (state.failed) return ;
 
                 }
                 break;
             case 2 :
-                // InternalTableDSL.g:7231:8: ( ( '?.' ) )
+                // InternalTableDSL.g:6701:8: ( ( '?.' ) )
                 {
-                // InternalTableDSL.g:7231:8: ( ( '?.' ) )
-                // InternalTableDSL.g:7232:9: ( '?.' )
+                // InternalTableDSL.g:6701:8: ( ( '?.' ) )
+                // InternalTableDSL.g:6702:9: ( '?.' )
                 {
-                // InternalTableDSL.g:7232:9: ( '?.' )
-                // InternalTableDSL.g:7233:10: '?.'
+                // InternalTableDSL.g:6702:9: ( '?.' )
+                // InternalTableDSL.g:6703:10: '?.'
                 {
-                match(input,138,FOLLOW_2); if (state.failed) return ;
+                match(input,135,FOLLOW_2); if (state.failed) return ;
 
                 }
 
@@ -34377,15 +33003,15 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                 }
                 break;
             case 3 :
-                // InternalTableDSL.g:7237:8: ( ( '::' ) )
+                // InternalTableDSL.g:6707:8: ( ( '::' ) )
                 {
-                // InternalTableDSL.g:7237:8: ( ( '::' ) )
-                // InternalTableDSL.g:7238:9: ( '::' )
+                // InternalTableDSL.g:6707:8: ( ( '::' ) )
+                // InternalTableDSL.g:6708:9: ( '::' )
                 {
-                // InternalTableDSL.g:7238:9: ( '::' )
-                // InternalTableDSL.g:7239:10: '::'
+                // InternalTableDSL.g:6708:9: ( '::' )
+                // InternalTableDSL.g:6709:10: '::'
                 {
-                match(input,137,FOLLOW_2); if (state.failed) return ;
+                match(input,134,FOLLOW_2); if (state.failed) return ;
 
                 }
 
@@ -34408,13 +33034,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred22_InternalTableDSL
     public final void synpred22_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:7363:7: ( ( '(' ) )
-        // InternalTableDSL.g:7363:8: ( '(' )
+        // InternalTableDSL.g:6833:7: ( ( '(' ) )
+        // InternalTableDSL.g:6833:8: ( '(' )
         {
-        // InternalTableDSL.g:7363:8: ( '(' )
-        // InternalTableDSL.g:7364:8: '('
+        // InternalTableDSL.g:6833:8: ( '(' )
+        // InternalTableDSL.g:6834:8: '('
         {
-        match(input,103,FOLLOW_2); if (state.failed) return ;
+        match(input,100,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -34425,35 +33051,35 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred23_InternalTableDSL
     public final void synpred23_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:7382:8: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // InternalTableDSL.g:7382:9: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalTableDSL.g:6852:8: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalTableDSL.g:6852:9: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // InternalTableDSL.g:7382:9: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // InternalTableDSL.g:7383:9: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalTableDSL.g:6852:9: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalTableDSL.g:6853:9: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // InternalTableDSL.g:7383:9: ()
-        // InternalTableDSL.g:7384:9: 
+        // InternalTableDSL.g:6853:9: ()
+        // InternalTableDSL.g:6854:9: 
         {
         }
 
-        // InternalTableDSL.g:7385:9: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
-        int alt179=2;
-        int LA179_0 = input.LA(1);
+        // InternalTableDSL.g:6855:9: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        int alt174=2;
+        int LA174_0 = input.LA(1);
 
-        if ( (LA179_0==RULE_ID||LA179_0==103||LA179_0==128) ) {
-            alt179=1;
+        if ( (LA174_0==RULE_ID||LA174_0==100||LA174_0==125) ) {
+            alt174=1;
         }
-        switch (alt179) {
+        switch (alt174) {
             case 1 :
-                // InternalTableDSL.g:7386:10: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalTableDSL.g:6856:10: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // InternalTableDSL.g:7386:10: ( ( ruleJvmFormalParameter ) )
-                // InternalTableDSL.g:7387:11: ( ruleJvmFormalParameter )
+                // InternalTableDSL.g:6856:10: ( ( ruleJvmFormalParameter ) )
+                // InternalTableDSL.g:6857:11: ( ruleJvmFormalParameter )
                 {
-                // InternalTableDSL.g:7387:11: ( ruleJvmFormalParameter )
-                // InternalTableDSL.g:7388:12: ruleJvmFormalParameter
+                // InternalTableDSL.g:6857:11: ( ruleJvmFormalParameter )
+                // InternalTableDSL.g:6858:12: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_99);
+                pushFollow(FOLLOW_98);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -34464,29 +33090,29 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                 }
 
-                // InternalTableDSL.g:7391:10: ( ',' ( ( ruleJvmFormalParameter ) ) )*
-                loop178:
+                // InternalTableDSL.g:6861:10: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                loop173:
                 do {
-                    int alt178=2;
-                    int LA178_0 = input.LA(1);
+                    int alt173=2;
+                    int LA173_0 = input.LA(1);
 
-                    if ( (LA178_0==104) ) {
-                        alt178=1;
+                    if ( (LA173_0==101) ) {
+                        alt173=1;
                     }
 
 
-                    switch (alt178) {
+                    switch (alt173) {
                 	case 1 :
-                	    // InternalTableDSL.g:7392:11: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalTableDSL.g:6862:11: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,104,FOLLOW_79); if (state.failed) return ;
-                	    // InternalTableDSL.g:7393:11: ( ( ruleJvmFormalParameter ) )
-                	    // InternalTableDSL.g:7394:12: ( ruleJvmFormalParameter )
+                	    match(input,101,FOLLOW_78); if (state.failed) return ;
+                	    // InternalTableDSL.g:6863:11: ( ( ruleJvmFormalParameter ) )
+                	    // InternalTableDSL.g:6864:12: ( ruleJvmFormalParameter )
                 	    {
-                	    // InternalTableDSL.g:7394:12: ( ruleJvmFormalParameter )
-                	    // InternalTableDSL.g:7395:13: ruleJvmFormalParameter
+                	    // InternalTableDSL.g:6864:12: ( ruleJvmFormalParameter )
+                	    // InternalTableDSL.g:6865:13: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_99);
+                	    pushFollow(FOLLOW_98);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -34502,7 +33128,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                 	    break;
 
                 	default :
-                	    break loop178;
+                	    break loop173;
                     }
                 } while (true);
 
@@ -34512,13 +33138,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
         }
 
-        // InternalTableDSL.g:7400:9: ( ( '|' ) )
-        // InternalTableDSL.g:7401:10: ( '|' )
+        // InternalTableDSL.g:6870:9: ( ( '|' ) )
+        // InternalTableDSL.g:6871:10: ( '|' )
         {
-        // InternalTableDSL.g:7401:10: ( '|' )
-        // InternalTableDSL.g:7402:11: '|'
+        // InternalTableDSL.g:6871:10: ( '|' )
+        // InternalTableDSL.g:6872:11: '|'
         {
-        match(input,139,FOLLOW_2); if (state.failed) return ;
+        match(input,136,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -34535,18 +33161,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred24_InternalTableDSL
     public final void synpred24_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:7479:6: ( ( () '[' ) )
-        // InternalTableDSL.g:7479:7: ( () '[' )
+        // InternalTableDSL.g:6949:6: ( ( () '[' ) )
+        // InternalTableDSL.g:6949:7: ( () '[' )
         {
-        // InternalTableDSL.g:7479:7: ( () '[' )
-        // InternalTableDSL.g:7480:7: () '['
+        // InternalTableDSL.g:6949:7: ( () '[' )
+        // InternalTableDSL.g:6950:7: () '['
         {
-        // InternalTableDSL.g:7480:7: ()
-        // InternalTableDSL.g:7481:7: 
+        // InternalTableDSL.g:6950:7: ()
+        // InternalTableDSL.g:6951:7: 
         {
         }
 
-        match(input,108,FOLLOW_2); if (state.failed) return ;
+        match(input,105,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -34557,19 +33183,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred25_InternalTableDSL
     public final void synpred25_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:7552:4: ( ( () 'synchronized' '(' ) )
-        // InternalTableDSL.g:7552:5: ( () 'synchronized' '(' )
+        // InternalTableDSL.g:7022:4: ( ( () 'synchronized' '(' ) )
+        // InternalTableDSL.g:7022:5: ( () 'synchronized' '(' )
         {
-        // InternalTableDSL.g:7552:5: ( () 'synchronized' '(' )
-        // InternalTableDSL.g:7553:5: () 'synchronized' '('
+        // InternalTableDSL.g:7022:5: ( () 'synchronized' '(' )
+        // InternalTableDSL.g:7023:5: () 'synchronized' '('
         {
-        // InternalTableDSL.g:7553:5: ()
-        // InternalTableDSL.g:7554:5: 
+        // InternalTableDSL.g:7023:5: ()
+        // InternalTableDSL.g:7024:5: 
         {
         }
 
-        match(input,162,FOLLOW_104); if (state.failed) return ;
-        match(input,103,FOLLOW_2); if (state.failed) return ;
+        match(input,159,FOLLOW_103); if (state.failed) return ;
+        match(input,100,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -34580,26 +33206,26 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred26_InternalTableDSL
     public final void synpred26_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:7597:4: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // InternalTableDSL.g:7597:5: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalTableDSL.g:7067:4: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // InternalTableDSL.g:7067:5: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // InternalTableDSL.g:7597:5: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
-        // InternalTableDSL.g:7598:5: () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':'
+        // InternalTableDSL.g:7067:5: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalTableDSL.g:7068:5: () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':'
         {
-        // InternalTableDSL.g:7598:5: ()
-        // InternalTableDSL.g:7599:5: 
+        // InternalTableDSL.g:7068:5: ()
+        // InternalTableDSL.g:7069:5: 
         {
         }
 
-        match(input,146,FOLLOW_104); if (state.failed) return ;
-        match(input,103,FOLLOW_79); if (state.failed) return ;
-        // InternalTableDSL.g:7602:5: ( ( ruleJvmFormalParameter ) )
-        // InternalTableDSL.g:7603:6: ( ruleJvmFormalParameter )
+        match(input,143,FOLLOW_103); if (state.failed) return ;
+        match(input,100,FOLLOW_78); if (state.failed) return ;
+        // InternalTableDSL.g:7072:5: ( ( ruleJvmFormalParameter ) )
+        // InternalTableDSL.g:7073:6: ( ruleJvmFormalParameter )
         {
-        // InternalTableDSL.g:7603:6: ( ruleJvmFormalParameter )
-        // InternalTableDSL.g:7604:7: ruleJvmFormalParameter
+        // InternalTableDSL.g:7073:6: ( ruleJvmFormalParameter )
+        // InternalTableDSL.g:7074:7: ruleJvmFormalParameter
         {
-        pushFollow(FOLLOW_107);
+        pushFollow(FOLLOW_106);
         ruleJvmFormalParameter();
 
         state._fsp--;
@@ -34610,7 +33236,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
         }
 
-        match(input,143,FOLLOW_2); if (state.failed) return ;
+        match(input,140,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -34621,18 +33247,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred27_InternalTableDSL
     public final void synpred27_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:7711:4: ( ( () '[' ) )
-        // InternalTableDSL.g:7711:5: ( () '[' )
+        // InternalTableDSL.g:7181:4: ( ( () '[' ) )
+        // InternalTableDSL.g:7181:5: ( () '[' )
         {
-        // InternalTableDSL.g:7711:5: ( () '[' )
-        // InternalTableDSL.g:7712:5: () '['
+        // InternalTableDSL.g:7181:5: ( () '[' )
+        // InternalTableDSL.g:7182:5: () '['
         {
-        // InternalTableDSL.g:7712:5: ()
-        // InternalTableDSL.g:7713:5: 
+        // InternalTableDSL.g:7182:5: ()
+        // InternalTableDSL.g:7183:5: 
         {
         }
 
-        match(input,108,FOLLOW_2); if (state.failed) return ;
+        match(input,105,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -34643,30 +33269,30 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred29_InternalTableDSL
     public final void synpred29_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:8016:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // InternalTableDSL.g:8016:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalTableDSL.g:7486:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalTableDSL.g:7486:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // InternalTableDSL.g:8016:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // InternalTableDSL.g:8017:5: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalTableDSL.g:7486:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalTableDSL.g:7487:5: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // InternalTableDSL.g:8017:5: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
-        int alt181=2;
-        int LA181_0 = input.LA(1);
+        // InternalTableDSL.g:7487:5: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        int alt176=2;
+        int LA176_0 = input.LA(1);
 
-        if ( (LA181_0==RULE_ID||LA181_0==103||LA181_0==128) ) {
-            alt181=1;
+        if ( (LA176_0==RULE_ID||LA176_0==100||LA176_0==125) ) {
+            alt176=1;
         }
-        switch (alt181) {
+        switch (alt176) {
             case 1 :
-                // InternalTableDSL.g:8018:6: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalTableDSL.g:7488:6: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // InternalTableDSL.g:8018:6: ( ( ruleJvmFormalParameter ) )
-                // InternalTableDSL.g:8019:7: ( ruleJvmFormalParameter )
+                // InternalTableDSL.g:7488:6: ( ( ruleJvmFormalParameter ) )
+                // InternalTableDSL.g:7489:7: ( ruleJvmFormalParameter )
                 {
-                // InternalTableDSL.g:8019:7: ( ruleJvmFormalParameter )
-                // InternalTableDSL.g:8020:8: ruleJvmFormalParameter
+                // InternalTableDSL.g:7489:7: ( ruleJvmFormalParameter )
+                // InternalTableDSL.g:7490:8: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_99);
+                pushFollow(FOLLOW_98);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -34677,29 +33303,29 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                 }
 
-                // InternalTableDSL.g:8023:6: ( ',' ( ( ruleJvmFormalParameter ) ) )*
-                loop180:
+                // InternalTableDSL.g:7493:6: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                loop175:
                 do {
-                    int alt180=2;
-                    int LA180_0 = input.LA(1);
+                    int alt175=2;
+                    int LA175_0 = input.LA(1);
 
-                    if ( (LA180_0==104) ) {
-                        alt180=1;
+                    if ( (LA175_0==101) ) {
+                        alt175=1;
                     }
 
 
-                    switch (alt180) {
+                    switch (alt175) {
                 	case 1 :
-                	    // InternalTableDSL.g:8024:7: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalTableDSL.g:7494:7: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,104,FOLLOW_79); if (state.failed) return ;
-                	    // InternalTableDSL.g:8025:7: ( ( ruleJvmFormalParameter ) )
-                	    // InternalTableDSL.g:8026:8: ( ruleJvmFormalParameter )
+                	    match(input,101,FOLLOW_78); if (state.failed) return ;
+                	    // InternalTableDSL.g:7495:7: ( ( ruleJvmFormalParameter ) )
+                	    // InternalTableDSL.g:7496:8: ( ruleJvmFormalParameter )
                 	    {
-                	    // InternalTableDSL.g:8026:8: ( ruleJvmFormalParameter )
-                	    // InternalTableDSL.g:8027:9: ruleJvmFormalParameter
+                	    // InternalTableDSL.g:7496:8: ( ruleJvmFormalParameter )
+                	    // InternalTableDSL.g:7497:9: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_99);
+                	    pushFollow(FOLLOW_98);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -34715,7 +33341,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                 	    break;
 
                 	default :
-                	    break loop180;
+                	    break loop175;
                     }
                 } while (true);
 
@@ -34725,13 +33351,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
         }
 
-        // InternalTableDSL.g:8032:5: ( ( '|' ) )
-        // InternalTableDSL.g:8033:6: ( '|' )
+        // InternalTableDSL.g:7502:5: ( ( '|' ) )
+        // InternalTableDSL.g:7503:6: ( '|' )
         {
-        // InternalTableDSL.g:8033:6: ( '|' )
-        // InternalTableDSL.g:8034:7: '|'
+        // InternalTableDSL.g:7503:6: ( '|' )
+        // InternalTableDSL.g:7504:7: '|'
         {
-        match(input,139,FOLLOW_2); if (state.failed) return ;
+        match(input,136,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -34748,10 +33374,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred31_InternalTableDSL
     public final void synpred31_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:8425:5: ( 'else' )
-        // InternalTableDSL.g:8425:6: 'else'
+        // InternalTableDSL.g:7895:5: ( 'else' )
+        // InternalTableDSL.g:7895:6: 'else'
         {
-        match(input,141,FOLLOW_2); if (state.failed) return ;
+        match(input,138,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -34759,20 +33385,20 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred32_InternalTableDSL
     public final void synpred32_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:8484:6: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // InternalTableDSL.g:8484:7: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalTableDSL.g:7954:6: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // InternalTableDSL.g:7954:7: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // InternalTableDSL.g:8484:7: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
-        // InternalTableDSL.g:8485:7: '(' ( ( ruleJvmFormalParameter ) ) ':'
+        // InternalTableDSL.g:7954:7: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalTableDSL.g:7955:7: '(' ( ( ruleJvmFormalParameter ) ) ':'
         {
-        match(input,103,FOLLOW_79); if (state.failed) return ;
-        // InternalTableDSL.g:8486:7: ( ( ruleJvmFormalParameter ) )
-        // InternalTableDSL.g:8487:8: ( ruleJvmFormalParameter )
+        match(input,100,FOLLOW_78); if (state.failed) return ;
+        // InternalTableDSL.g:7956:7: ( ( ruleJvmFormalParameter ) )
+        // InternalTableDSL.g:7957:8: ( ruleJvmFormalParameter )
         {
-        // InternalTableDSL.g:8487:8: ( ruleJvmFormalParameter )
-        // InternalTableDSL.g:8488:9: ruleJvmFormalParameter
+        // InternalTableDSL.g:7957:8: ( ruleJvmFormalParameter )
+        // InternalTableDSL.g:7958:9: ruleJvmFormalParameter
         {
-        pushFollow(FOLLOW_107);
+        pushFollow(FOLLOW_106);
         ruleJvmFormalParameter();
 
         state._fsp--;
@@ -34783,7 +33409,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
         }
 
-        match(input,143,FOLLOW_2); if (state.failed) return ;
+        match(input,140,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -34794,19 +33420,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred33_InternalTableDSL
     public final void synpred33_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:8551:6: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // InternalTableDSL.g:8551:7: ( ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalTableDSL.g:8021:6: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // InternalTableDSL.g:8021:7: ( ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // InternalTableDSL.g:8551:7: ( ( ( ruleJvmFormalParameter ) ) ':' )
-        // InternalTableDSL.g:8552:7: ( ( ruleJvmFormalParameter ) ) ':'
+        // InternalTableDSL.g:8021:7: ( ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalTableDSL.g:8022:7: ( ( ruleJvmFormalParameter ) ) ':'
         {
-        // InternalTableDSL.g:8552:7: ( ( ruleJvmFormalParameter ) )
-        // InternalTableDSL.g:8553:8: ( ruleJvmFormalParameter )
+        // InternalTableDSL.g:8022:7: ( ( ruleJvmFormalParameter ) )
+        // InternalTableDSL.g:8023:8: ( ruleJvmFormalParameter )
         {
-        // InternalTableDSL.g:8553:8: ( ruleJvmFormalParameter )
-        // InternalTableDSL.g:8554:9: ruleJvmFormalParameter
+        // InternalTableDSL.g:8023:8: ( ruleJvmFormalParameter )
+        // InternalTableDSL.g:8024:9: ruleJvmFormalParameter
         {
-        pushFollow(FOLLOW_107);
+        pushFollow(FOLLOW_106);
         ruleJvmFormalParameter();
 
         state._fsp--;
@@ -34817,7 +33443,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
         }
 
-        match(input,143,FOLLOW_2); if (state.failed) return ;
+        match(input,140,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -34828,17 +33454,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred35_InternalTableDSL
     public final void synpred35_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:9369:5: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )
-        // InternalTableDSL.g:9369:6: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
+        // InternalTableDSL.g:8839:5: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )
+        // InternalTableDSL.g:8839:6: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
         {
-        // InternalTableDSL.g:9369:6: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
-        // InternalTableDSL.g:9370:6: ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) )
+        // InternalTableDSL.g:8839:6: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
+        // InternalTableDSL.g:8840:6: ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) )
         {
-        // InternalTableDSL.g:9370:6: ( ( ruleJvmTypeReference ) )
-        // InternalTableDSL.g:9371:7: ( ruleJvmTypeReference )
+        // InternalTableDSL.g:8840:6: ( ( ruleJvmTypeReference ) )
+        // InternalTableDSL.g:8841:7: ( ruleJvmTypeReference )
         {
-        // InternalTableDSL.g:9371:7: ( ruleJvmTypeReference )
-        // InternalTableDSL.g:9372:8: ruleJvmTypeReference
+        // InternalTableDSL.g:8841:7: ( ruleJvmTypeReference )
+        // InternalTableDSL.g:8842:8: ruleJvmTypeReference
         {
         pushFollow(FOLLOW_4);
         ruleJvmTypeReference();
@@ -34851,11 +33477,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
         }
 
-        // InternalTableDSL.g:9375:6: ( ( ruleValidID ) )
-        // InternalTableDSL.g:9376:7: ( ruleValidID )
+        // InternalTableDSL.g:8845:6: ( ( ruleValidID ) )
+        // InternalTableDSL.g:8846:7: ( ruleValidID )
         {
-        // InternalTableDSL.g:9376:7: ( ruleValidID )
-        // InternalTableDSL.g:9377:8: ruleValidID
+        // InternalTableDSL.g:8846:7: ( ruleValidID )
+        // InternalTableDSL.g:8847:8: ruleValidID
         {
         pushFollow(FOLLOW_2);
         ruleValidID();
@@ -34878,13 +33504,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred36_InternalTableDSL
     public final void synpred36_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:9681:5: ( ( '(' ) )
-        // InternalTableDSL.g:9681:6: ( '(' )
+        // InternalTableDSL.g:9151:5: ( ( '(' ) )
+        // InternalTableDSL.g:9151:6: ( '(' )
         {
-        // InternalTableDSL.g:9681:6: ( '(' )
-        // InternalTableDSL.g:9682:6: '('
+        // InternalTableDSL.g:9151:6: ( '(' )
+        // InternalTableDSL.g:9152:6: '('
         {
-        match(input,103,FOLLOW_2); if (state.failed) return ;
+        match(input,100,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -34895,35 +33521,35 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred37_InternalTableDSL
     public final void synpred37_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:9700:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // InternalTableDSL.g:9700:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalTableDSL.g:9170:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalTableDSL.g:9170:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // InternalTableDSL.g:9700:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // InternalTableDSL.g:9701:7: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalTableDSL.g:9170:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalTableDSL.g:9171:7: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // InternalTableDSL.g:9701:7: ()
-        // InternalTableDSL.g:9702:7: 
+        // InternalTableDSL.g:9171:7: ()
+        // InternalTableDSL.g:9172:7: 
         {
         }
 
-        // InternalTableDSL.g:9703:7: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
-        int alt185=2;
-        int LA185_0 = input.LA(1);
+        // InternalTableDSL.g:9173:7: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        int alt180=2;
+        int LA180_0 = input.LA(1);
 
-        if ( (LA185_0==RULE_ID||LA185_0==103||LA185_0==128) ) {
-            alt185=1;
+        if ( (LA180_0==RULE_ID||LA180_0==100||LA180_0==125) ) {
+            alt180=1;
         }
-        switch (alt185) {
+        switch (alt180) {
             case 1 :
-                // InternalTableDSL.g:9704:8: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalTableDSL.g:9174:8: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // InternalTableDSL.g:9704:8: ( ( ruleJvmFormalParameter ) )
-                // InternalTableDSL.g:9705:9: ( ruleJvmFormalParameter )
+                // InternalTableDSL.g:9174:8: ( ( ruleJvmFormalParameter ) )
+                // InternalTableDSL.g:9175:9: ( ruleJvmFormalParameter )
                 {
-                // InternalTableDSL.g:9705:9: ( ruleJvmFormalParameter )
-                // InternalTableDSL.g:9706:10: ruleJvmFormalParameter
+                // InternalTableDSL.g:9175:9: ( ruleJvmFormalParameter )
+                // InternalTableDSL.g:9176:10: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_99);
+                pushFollow(FOLLOW_98);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -34934,29 +33560,29 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                 }
 
-                // InternalTableDSL.g:9709:8: ( ',' ( ( ruleJvmFormalParameter ) ) )*
-                loop184:
+                // InternalTableDSL.g:9179:8: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                loop179:
                 do {
-                    int alt184=2;
-                    int LA184_0 = input.LA(1);
+                    int alt179=2;
+                    int LA179_0 = input.LA(1);
 
-                    if ( (LA184_0==104) ) {
-                        alt184=1;
+                    if ( (LA179_0==101) ) {
+                        alt179=1;
                     }
 
 
-                    switch (alt184) {
+                    switch (alt179) {
                 	case 1 :
-                	    // InternalTableDSL.g:9710:9: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalTableDSL.g:9180:9: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,104,FOLLOW_79); if (state.failed) return ;
-                	    // InternalTableDSL.g:9711:9: ( ( ruleJvmFormalParameter ) )
-                	    // InternalTableDSL.g:9712:10: ( ruleJvmFormalParameter )
+                	    match(input,101,FOLLOW_78); if (state.failed) return ;
+                	    // InternalTableDSL.g:9181:9: ( ( ruleJvmFormalParameter ) )
+                	    // InternalTableDSL.g:9182:10: ( ruleJvmFormalParameter )
                 	    {
-                	    // InternalTableDSL.g:9712:10: ( ruleJvmFormalParameter )
-                	    // InternalTableDSL.g:9713:11: ruleJvmFormalParameter
+                	    // InternalTableDSL.g:9182:10: ( ruleJvmFormalParameter )
+                	    // InternalTableDSL.g:9183:11: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_99);
+                	    pushFollow(FOLLOW_98);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -34972,7 +33598,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                 	    break;
 
                 	default :
-                	    break loop184;
+                	    break loop179;
                     }
                 } while (true);
 
@@ -34982,13 +33608,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
         }
 
-        // InternalTableDSL.g:9718:7: ( ( '|' ) )
-        // InternalTableDSL.g:9719:8: ( '|' )
+        // InternalTableDSL.g:9188:7: ( ( '|' ) )
+        // InternalTableDSL.g:9189:8: ( '|' )
         {
-        // InternalTableDSL.g:9719:8: ( '|' )
-        // InternalTableDSL.g:9720:9: '|'
+        // InternalTableDSL.g:9189:8: ( '|' )
+        // InternalTableDSL.g:9190:9: '|'
         {
-        match(input,139,FOLLOW_2); if (state.failed) return ;
+        match(input,136,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -35005,18 +33631,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred38_InternalTableDSL
     public final void synpred38_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:9797:4: ( ( () '[' ) )
-        // InternalTableDSL.g:9797:5: ( () '[' )
+        // InternalTableDSL.g:9267:4: ( ( () '[' ) )
+        // InternalTableDSL.g:9267:5: ( () '[' )
         {
-        // InternalTableDSL.g:9797:5: ( () '[' )
-        // InternalTableDSL.g:9798:5: () '['
+        // InternalTableDSL.g:9267:5: ( () '[' )
+        // InternalTableDSL.g:9268:5: () '['
         {
-        // InternalTableDSL.g:9798:5: ()
-        // InternalTableDSL.g:9799:5: 
+        // InternalTableDSL.g:9268:5: ()
+        // InternalTableDSL.g:9269:5: 
         {
         }
 
-        match(input,108,FOLLOW_2); if (state.failed) return ;
+        match(input,105,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -35027,10 +33653,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred39_InternalTableDSL
     public final void synpred39_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:9957:5: ( '<' )
-        // InternalTableDSL.g:9957:6: '<'
+        // InternalTableDSL.g:9427:5: ( '<' )
+        // InternalTableDSL.g:9427:6: '<'
         {
-        match(input,115,FOLLOW_2); if (state.failed) return ;
+        match(input,112,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -35038,13 +33664,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred40_InternalTableDSL
     public final void synpred40_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:10014:5: ( ( '(' ) )
-        // InternalTableDSL.g:10014:6: ( '(' )
+        // InternalTableDSL.g:9484:5: ( ( '(' ) )
+        // InternalTableDSL.g:9484:6: ( '(' )
         {
-        // InternalTableDSL.g:10014:6: ( '(' )
-        // InternalTableDSL.g:10015:6: '('
+        // InternalTableDSL.g:9484:6: ( '(' )
+        // InternalTableDSL.g:9485:6: '('
         {
-        match(input,103,FOLLOW_2); if (state.failed) return ;
+        match(input,100,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -35055,35 +33681,35 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred41_InternalTableDSL
     public final void synpred41_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:10033:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // InternalTableDSL.g:10033:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalTableDSL.g:9503:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalTableDSL.g:9503:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // InternalTableDSL.g:10033:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // InternalTableDSL.g:10034:7: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalTableDSL.g:9503:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalTableDSL.g:9504:7: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // InternalTableDSL.g:10034:7: ()
-        // InternalTableDSL.g:10035:7: 
+        // InternalTableDSL.g:9504:7: ()
+        // InternalTableDSL.g:9505:7: 
         {
         }
 
-        // InternalTableDSL.g:10036:7: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
-        int alt187=2;
-        int LA187_0 = input.LA(1);
+        // InternalTableDSL.g:9506:7: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        int alt182=2;
+        int LA182_0 = input.LA(1);
 
-        if ( (LA187_0==RULE_ID||LA187_0==103||LA187_0==128) ) {
-            alt187=1;
+        if ( (LA182_0==RULE_ID||LA182_0==100||LA182_0==125) ) {
+            alt182=1;
         }
-        switch (alt187) {
+        switch (alt182) {
             case 1 :
-                // InternalTableDSL.g:10037:8: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalTableDSL.g:9507:8: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // InternalTableDSL.g:10037:8: ( ( ruleJvmFormalParameter ) )
-                // InternalTableDSL.g:10038:9: ( ruleJvmFormalParameter )
+                // InternalTableDSL.g:9507:8: ( ( ruleJvmFormalParameter ) )
+                // InternalTableDSL.g:9508:9: ( ruleJvmFormalParameter )
                 {
-                // InternalTableDSL.g:10038:9: ( ruleJvmFormalParameter )
-                // InternalTableDSL.g:10039:10: ruleJvmFormalParameter
+                // InternalTableDSL.g:9508:9: ( ruleJvmFormalParameter )
+                // InternalTableDSL.g:9509:10: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_99);
+                pushFollow(FOLLOW_98);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -35094,29 +33720,29 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
                 }
 
-                // InternalTableDSL.g:10042:8: ( ',' ( ( ruleJvmFormalParameter ) ) )*
-                loop186:
+                // InternalTableDSL.g:9512:8: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                loop181:
                 do {
-                    int alt186=2;
-                    int LA186_0 = input.LA(1);
+                    int alt181=2;
+                    int LA181_0 = input.LA(1);
 
-                    if ( (LA186_0==104) ) {
-                        alt186=1;
+                    if ( (LA181_0==101) ) {
+                        alt181=1;
                     }
 
 
-                    switch (alt186) {
+                    switch (alt181) {
                 	case 1 :
-                	    // InternalTableDSL.g:10043:9: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalTableDSL.g:9513:9: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,104,FOLLOW_79); if (state.failed) return ;
-                	    // InternalTableDSL.g:10044:9: ( ( ruleJvmFormalParameter ) )
-                	    // InternalTableDSL.g:10045:10: ( ruleJvmFormalParameter )
+                	    match(input,101,FOLLOW_78); if (state.failed) return ;
+                	    // InternalTableDSL.g:9514:9: ( ( ruleJvmFormalParameter ) )
+                	    // InternalTableDSL.g:9515:10: ( ruleJvmFormalParameter )
                 	    {
-                	    // InternalTableDSL.g:10045:10: ( ruleJvmFormalParameter )
-                	    // InternalTableDSL.g:10046:11: ruleJvmFormalParameter
+                	    // InternalTableDSL.g:9515:10: ( ruleJvmFormalParameter )
+                	    // InternalTableDSL.g:9516:11: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_99);
+                	    pushFollow(FOLLOW_98);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -35132,7 +33758,7 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                 	    break;
 
                 	default :
-                	    break loop186;
+                	    break loop181;
                     }
                 } while (true);
 
@@ -35142,13 +33768,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
         }
 
-        // InternalTableDSL.g:10051:7: ( ( '|' ) )
-        // InternalTableDSL.g:10052:8: ( '|' )
+        // InternalTableDSL.g:9521:7: ( ( '|' ) )
+        // InternalTableDSL.g:9522:8: ( '|' )
         {
-        // InternalTableDSL.g:10052:8: ( '|' )
-        // InternalTableDSL.g:10053:9: '|'
+        // InternalTableDSL.g:9522:8: ( '|' )
+        // InternalTableDSL.g:9523:9: '|'
         {
-        match(input,139,FOLLOW_2); if (state.failed) return ;
+        match(input,136,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -35165,18 +33791,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred42_InternalTableDSL
     public final void synpred42_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:10130:4: ( ( () '[' ) )
-        // InternalTableDSL.g:10130:5: ( () '[' )
+        // InternalTableDSL.g:9600:4: ( ( () '[' ) )
+        // InternalTableDSL.g:9600:5: ( () '[' )
         {
-        // InternalTableDSL.g:10130:5: ( () '[' )
-        // InternalTableDSL.g:10131:5: () '['
+        // InternalTableDSL.g:9600:5: ( () '[' )
+        // InternalTableDSL.g:9601:5: () '['
         {
-        // InternalTableDSL.g:10131:5: ()
-        // InternalTableDSL.g:10132:5: 
+        // InternalTableDSL.g:9601:5: ()
+        // InternalTableDSL.g:9602:5: 
         {
         }
 
-        match(input,108,FOLLOW_2); if (state.failed) return ;
+        match(input,105,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -35187,10 +33813,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred43_InternalTableDSL
     public final void synpred43_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:10473:4: ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )
+        // InternalTableDSL.g:9943:4: ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )
         // InternalTableDSL.g:
         {
-        if ( (input.LA(1)>=RULE_ID && input.LA(1)<=RULE_STRING)||(input.LA(1)>=RULE_INT && input.LA(1)<=RULE_DECIMAL)||input.LA(1)==16||(input.LA(1)>=94 && input.LA(1)<=98)||input.LA(1)==103||(input.LA(1)>=107 && input.LA(1)<=108)||input.LA(1)==115||input.LA(1)==134||input.LA(1)==140||input.LA(1)==142||(input.LA(1)>=146 && input.LA(1)<=148)||(input.LA(1)>=151 && input.LA(1)<=160)||input.LA(1)==162 ) {
+        if ( (input.LA(1)>=RULE_ID && input.LA(1)<=RULE_STRING)||(input.LA(1)>=RULE_INT && input.LA(1)<=RULE_DECIMAL)||input.LA(1)==16||(input.LA(1)>=91 && input.LA(1)<=95)||input.LA(1)==100||(input.LA(1)>=104 && input.LA(1)<=105)||input.LA(1)==112||input.LA(1)==131||input.LA(1)==137||input.LA(1)==139||(input.LA(1)>=143 && input.LA(1)<=145)||(input.LA(1)>=148 && input.LA(1)<=157)||input.LA(1)==159 ) {
             input.consume();
             state.errorRecovery=false;state.failed=false;
         }
@@ -35207,10 +33833,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred44_InternalTableDSL
     public final void synpred44_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:10544:6: ( 'catch' )
-        // InternalTableDSL.g:10544:7: 'catch'
+        // InternalTableDSL.g:10014:6: ( 'catch' )
+        // InternalTableDSL.g:10014:7: 'catch'
         {
-        match(input,163,FOLLOW_2); if (state.failed) return ;
+        match(input,160,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -35218,10 +33844,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred45_InternalTableDSL
     public final void synpred45_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:10565:7: ( 'finally' )
-        // InternalTableDSL.g:10565:8: 'finally'
+        // InternalTableDSL.g:10035:7: ( 'finally' )
+        // InternalTableDSL.g:10035:8: 'finally'
         {
-        match(input,161,FOLLOW_2); if (state.failed) return ;
+        match(input,158,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -35229,10 +33855,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred48_InternalTableDSL
     public final void synpred48_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:10809:5: ( '.' )
-        // InternalTableDSL.g:10809:6: '.'
+        // InternalTableDSL.g:10279:5: ( '.' )
+        // InternalTableDSL.g:10279:6: '.'
         {
-        match(input,78,FOLLOW_2); if (state.failed) return ;
+        match(input,74,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -35240,14 +33866,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred49_InternalTableDSL
     public final void synpred49_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:10935:5: ( ( () ruleArrayBrackets ) )
-        // InternalTableDSL.g:10935:6: ( () ruleArrayBrackets )
+        // InternalTableDSL.g:10405:5: ( ( () ruleArrayBrackets ) )
+        // InternalTableDSL.g:10405:6: ( () ruleArrayBrackets )
         {
-        // InternalTableDSL.g:10935:6: ( () ruleArrayBrackets )
-        // InternalTableDSL.g:10936:6: () ruleArrayBrackets
+        // InternalTableDSL.g:10405:6: ( () ruleArrayBrackets )
+        // InternalTableDSL.g:10406:6: () ruleArrayBrackets
         {
-        // InternalTableDSL.g:10936:6: ()
-        // InternalTableDSL.g:10937:6: 
+        // InternalTableDSL.g:10406:6: ()
+        // InternalTableDSL.g:10407:6: 
         {
         }
 
@@ -35266,10 +33892,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred50_InternalTableDSL
     public final void synpred50_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:11132:5: ( '<' )
-        // InternalTableDSL.g:11132:6: '<'
+        // InternalTableDSL.g:10602:5: ( '<' )
+        // InternalTableDSL.g:10602:6: '<'
         {
-        match(input,115,FOLLOW_2); if (state.failed) return ;
+        match(input,112,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -35277,18 +33903,18 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred51_InternalTableDSL
     public final void synpred51_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:11188:6: ( ( () '.' ) )
-        // InternalTableDSL.g:11188:7: ( () '.' )
+        // InternalTableDSL.g:10658:6: ( ( () '.' ) )
+        // InternalTableDSL.g:10658:7: ( () '.' )
         {
-        // InternalTableDSL.g:11188:7: ( () '.' )
-        // InternalTableDSL.g:11189:7: () '.'
+        // InternalTableDSL.g:10658:7: ( () '.' )
+        // InternalTableDSL.g:10659:7: () '.'
         {
-        // InternalTableDSL.g:11189:7: ()
-        // InternalTableDSL.g:11190:7: 
+        // InternalTableDSL.g:10659:7: ()
+        // InternalTableDSL.g:10660:7: 
         {
         }
 
-        match(input,78,FOLLOW_2); if (state.failed) return ;
+        match(input,74,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -35299,10 +33925,10 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred52_InternalTableDSL
     public final void synpred52_InternalTableDSL_fragment() throws RecognitionException {   
-        // InternalTableDSL.g:11226:7: ( '<' )
-        // InternalTableDSL.g:11226:8: '<'
+        // InternalTableDSL.g:10696:7: ( '<' )
+        // InternalTableDSL.g:10696:8: '<'
         {
-        match(input,115,FOLLOW_2); if (state.failed) return ;
+        match(input,112,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -35942,45 +34568,45 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     }
 
 
-    protected DFA51 dfa51 = new DFA51(this);
-    protected DFA54 dfa54 = new DFA54(this);
+    protected DFA46 dfa46 = new DFA46(this);
+    protected DFA49 dfa49 = new DFA49(this);
+    protected DFA55 dfa55 = new DFA55(this);
+    protected DFA58 dfa58 = new DFA58(this);
     protected DFA60 dfa60 = new DFA60(this);
-    protected DFA63 dfa63 = new DFA63(this);
-    protected DFA65 dfa65 = new DFA65(this);
-    protected DFA75 dfa75 = new DFA75(this);
-    protected DFA78 dfa78 = new DFA78(this);
-    protected DFA94 dfa94 = new DFA94(this);
-    protected DFA93 dfa93 = new DFA93(this);
-    protected DFA95 dfa95 = new DFA95(this);
-    protected DFA97 dfa97 = new DFA97(this);
-    protected DFA106 dfa106 = new DFA106(this);
-    protected DFA113 dfa113 = new DFA113(this);
-    protected DFA112 dfa112 = new DFA112(this);
+    protected DFA70 dfa70 = new DFA70(this);
+    protected DFA73 dfa73 = new DFA73(this);
+    protected DFA89 dfa89 = new DFA89(this);
+    protected DFA88 dfa88 = new DFA88(this);
+    protected DFA90 dfa90 = new DFA90(this);
+    protected DFA92 dfa92 = new DFA92(this);
+    protected DFA101 dfa101 = new DFA101(this);
+    protected DFA108 dfa108 = new DFA108(this);
+    protected DFA107 dfa107 = new DFA107(this);
+    protected DFA130 dfa130 = new DFA130(this);
+    protected DFA129 dfa129 = new DFA129(this);
+    protected DFA131 dfa131 = new DFA131(this);
     protected DFA135 dfa135 = new DFA135(this);
-    protected DFA134 dfa134 = new DFA134(this);
-    protected DFA136 dfa136 = new DFA136(this);
-    protected DFA140 dfa140 = new DFA140(this);
-    protected DFA143 dfa143 = new DFA143(this);
+    protected DFA138 dfa138 = new DFA138(this);
+    protected DFA137 dfa137 = new DFA137(this);
+    protected DFA139 dfa139 = new DFA139(this);
     protected DFA142 dfa142 = new DFA142(this);
-    protected DFA144 dfa144 = new DFA144(this);
-    protected DFA147 dfa147 = new DFA147(this);
-    protected DFA165 dfa165 = new DFA165(this);
-    protected DFA163 dfa163 = new DFA163(this);
+    protected DFA160 dfa160 = new DFA160(this);
+    protected DFA158 dfa158 = new DFA158(this);
     static final String dfa_1s = "\10\uffff";
-    static final String dfa_2s = "\2\uffff\1\5\3\uffff\1\5\1\uffff";
-    static final String dfa_3s = "\1\4\1\uffff\1\17\1\uffff\1\4\1\uffff\1\17\1\uffff";
-    static final String dfa_4s = "\1\144\1\uffff\1\145\1\uffff\1\143\1\uffff\1\145\1\uffff";
-    static final String dfa_5s = "\1\uffff\1\1\1\uffff\1\4\1\uffff\1\2\1\uffff\1\3";
+    static final String dfa_2s = "\2\uffff\1\5\4\uffff\1\5";
+    static final String dfa_3s = "\1\4\1\uffff\1\17\1\uffff\1\4\2\uffff\1\17";
+    static final String dfa_4s = "\1\141\1\uffff\1\142\1\uffff\1\140\2\uffff\1\142";
+    static final String dfa_5s = "\1\uffff\1\1\1\uffff\1\4\1\uffff\1\2\1\3\1\uffff";
     static final String dfa_6s = "\10\uffff}>";
     static final String[] dfa_7s = {
-            "\1\2\134\uffff\1\1\2\uffff\1\3",
+            "\1\2\131\uffff\1\1\2\uffff\1\3",
             "",
-            "\1\5\76\uffff\1\4\21\uffff\1\5\4\uffff\1\5",
+            "\1\5\72\uffff\1\4\22\uffff\1\5\4\uffff\1\5",
             "",
-            "\1\6\136\uffff\1\7",
+            "\1\7\133\uffff\1\6",
             "",
-            "\1\5\76\uffff\1\4\21\uffff\1\5\4\uffff\1\5",
-            ""
+            "",
+            "\1\5\72\uffff\1\4\22\uffff\1\5\4\uffff\1\5"
     };
 
     static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
@@ -35991,11 +34617,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final short[] dfa_6 = DFA.unpackEncodedString(dfa_6s);
     static final short[][] dfa_7 = unpackEncodedStringArray(dfa_7s);
 
-    class DFA51 extends DFA {
+    class DFA46 extends DFA {
 
-        public DFA51(BaseRecognizer recognizer) {
+        public DFA46(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 51;
+            this.decisionNumber = 46;
             this.eot = dfa_1;
             this.eof = dfa_2;
             this.min = dfa_3;
@@ -36005,16 +34631,16 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_7;
         }
         public String getDescription() {
-            return "4902:3: ( ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) ) | ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) ) )";
+            return "4372:3: ( ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) ) | ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) ) )";
         }
     }
     static final String dfa_8s = "\44\uffff";
     static final String dfa_9s = "\1\4\1\0\42\uffff";
-    static final String dfa_10s = "\1\u00a2\1\0\42\uffff";
+    static final String dfa_10s = "\1\u009f\1\0\42\uffff";
     static final String dfa_11s = "\2\uffff\1\2\37\uffff\1\3\1\1";
     static final String dfa_12s = "\1\uffff\1\0\42\uffff}>";
     static final String[] dfa_13s = {
-            "\1\1\1\2\1\uffff\3\2\6\uffff\1\2\115\uffff\5\2\3\uffff\2\2\1\uffff\1\42\1\uffff\2\2\6\uffff\1\2\22\uffff\1\2\5\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2",
+            "\1\1\1\2\1\uffff\3\2\6\uffff\1\2\112\uffff\5\2\3\uffff\2\2\1\uffff\1\42\1\uffff\2\2\6\uffff\1\2\22\uffff\1\2\5\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -36059,11 +34685,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final short[] dfa_12 = DFA.unpackEncodedString(dfa_12s);
     static final short[][] dfa_13 = unpackEncodedStringArray(dfa_13s);
 
-    class DFA54 extends DFA {
+    class DFA49 extends DFA {
 
-        public DFA54(BaseRecognizer recognizer) {
+        public DFA49(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 54;
+            this.decisionNumber = 49;
             this.eot = dfa_8;
             this.eof = dfa_8;
             this.min = dfa_9;
@@ -36073,17 +34699,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_13;
         }
         public String getDescription() {
-            return "5119:4: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?";
+            return "4589:4: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA54_1 = input.LA(1);
+                        int LA49_1 = input.LA(1);
 
                          
-                        int index54_1 = input.index();
+                        int index49_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred2_InternalTableDSL()) ) {s = 35;}
@@ -36091,24 +34717,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index54_1);
+                        input.seek(index49_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 54, _s, input);
+                new NoViableAltException(getDescription(), 49, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String dfa_14s = "\43\uffff";
     static final String dfa_15s = "\1\4\1\0\41\uffff";
-    static final String dfa_16s = "\1\u00a2\1\0\41\uffff";
+    static final String dfa_16s = "\1\u009f\1\0\41\uffff";
     static final String dfa_17s = "\2\uffff\1\2\37\uffff\1\1";
     static final String dfa_18s = "\1\uffff\1\0\41\uffff}>";
     static final String[] dfa_19s = {
-            "\2\2\1\uffff\3\2\6\uffff\1\2\115\uffff\5\2\3\uffff\2\2\3\uffff\1\1\1\2\6\uffff\1\2\22\uffff\1\2\5\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2",
+            "\2\2\1\uffff\3\2\6\uffff\1\2\112\uffff\5\2\3\uffff\2\2\3\uffff\1\1\1\2\6\uffff\1\2\22\uffff\1\2\5\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -36152,11 +34778,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final short[] dfa_18 = DFA.unpackEncodedString(dfa_18s);
     static final short[][] dfa_19 = unpackEncodedStringArray(dfa_19s);
 
-    class DFA60 extends DFA {
+    class DFA55 extends DFA {
 
-        public DFA60(BaseRecognizer recognizer) {
+        public DFA55(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 60;
+            this.decisionNumber = 55;
             this.eot = dfa_14;
             this.eof = dfa_14;
             this.min = dfa_15;
@@ -36166,17 +34792,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_19;
         }
         public String getDescription() {
-            return "5299:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )";
+            return "4769:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA60_1 = input.LA(1);
+                        int LA55_1 = input.LA(1);
 
                          
-                        int index60_1 = input.index();
+                        int index55_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred5_InternalTableDSL()) ) {s = 34;}
@@ -36184,23 +34810,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index60_1);
+                        input.seek(index55_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 60, _s, input);
+                new NoViableAltException(getDescription(), 55, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA63 extends DFA {
+    class DFA58 extends DFA {
 
-        public DFA63(BaseRecognizer recognizer) {
+        public DFA58(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 63;
+            this.decisionNumber = 58;
             this.eot = dfa_14;
             this.eof = dfa_14;
             this.min = dfa_15;
@@ -36210,17 +34836,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_19;
         }
         public String getDescription() {
-            return "5441:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )";
+            return "4911:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA63_1 = input.LA(1);
+                        int LA58_1 = input.LA(1);
 
                          
-                        int index63_1 = input.index();
+                        int index58_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred6_InternalTableDSL()) ) {s = 34;}
@@ -36228,13 +34854,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index63_1);
+                        input.seek(index58_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 63, _s, input);
+                new NoViableAltException(getDescription(), 58, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -36242,11 +34868,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final String dfa_20s = "\12\uffff";
     static final String dfa_21s = "\1\10\11\uffff";
     static final String dfa_22s = "\1\4\7\0\2\uffff";
-    static final String dfa_23s = "\1\u00a3\7\0\2\uffff";
+    static final String dfa_23s = "\1\u00a0\7\0\2\uffff";
     static final String dfa_24s = "\10\uffff\1\2\1\1";
     static final String dfa_25s = "\1\uffff\1\1\1\2\1\3\1\4\1\5\1\0\1\6\2\uffff}>";
     static final String[] dfa_26s = {
-            "\2\10\1\uffff\3\10\6\uffff\2\10\2\uffff\1\10\71\uffff\1\10\17\uffff\6\10\1\uffff\1\10\1\uffff\3\10\1\uffff\3\10\1\1\1\2\1\3\1\4\1\5\1\6\1\7\26\10\1\uffff\30\10",
+            "\2\10\1\uffff\3\10\6\uffff\2\10\2\uffff\1\10\65\uffff\1\10\20\uffff\6\10\1\uffff\1\10\1\uffff\3\10\1\uffff\3\10\1\1\1\2\1\3\1\4\1\5\1\6\1\7\26\10\1\uffff\30\10",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -36266,11 +34892,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final short[] dfa_25 = DFA.unpackEncodedString(dfa_25s);
     static final short[][] dfa_26 = unpackEncodedStringArray(dfa_26s);
 
-    class DFA65 extends DFA {
+    class DFA60 extends DFA {
 
-        public DFA65(BaseRecognizer recognizer) {
+        public DFA60(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 65;
+            this.decisionNumber = 60;
             this.eot = dfa_20;
             this.eof = dfa_21;
             this.min = dfa_22;
@@ -36280,17 +34906,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_26;
         }
         public String getDescription() {
-            return "5670:4: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?";
+            return "5140:4: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA65_6 = input.LA(1);
+                        int LA60_6 = input.LA(1);
 
                          
-                        int index65_6 = input.index();
+                        int index60_6 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7_InternalTableDSL()) ) {s = 9;}
@@ -36298,14 +34924,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index65_6);
+                        input.seek(index60_6);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA65_1 = input.LA(1);
+                        int LA60_1 = input.LA(1);
 
                          
-                        int index65_1 = input.index();
+                        int index60_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7_InternalTableDSL()) ) {s = 9;}
@@ -36313,14 +34939,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index65_1);
+                        input.seek(index60_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA65_2 = input.LA(1);
+                        int LA60_2 = input.LA(1);
 
                          
-                        int index65_2 = input.index();
+                        int index60_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7_InternalTableDSL()) ) {s = 9;}
@@ -36328,14 +34954,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index65_2);
+                        input.seek(index60_2);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA65_3 = input.LA(1);
+                        int LA60_3 = input.LA(1);
 
                          
-                        int index65_3 = input.index();
+                        int index60_3 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7_InternalTableDSL()) ) {s = 9;}
@@ -36343,14 +34969,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index65_3);
+                        input.seek(index60_3);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA65_4 = input.LA(1);
+                        int LA60_4 = input.LA(1);
 
                          
-                        int index65_4 = input.index();
+                        int index60_4 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7_InternalTableDSL()) ) {s = 9;}
@@ -36358,14 +34984,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index65_4);
+                        input.seek(index60_4);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA65_5 = input.LA(1);
+                        int LA60_5 = input.LA(1);
 
                          
-                        int index65_5 = input.index();
+                        int index60_5 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7_InternalTableDSL()) ) {s = 9;}
@@ -36373,14 +34999,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index65_5);
+                        input.seek(index60_5);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA65_7 = input.LA(1);
+                        int LA60_7 = input.LA(1);
 
                          
-                        int index65_7 = input.index();
+                        int index60_7 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7_InternalTableDSL()) ) {s = 9;}
@@ -36388,13 +35014,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index65_7);
+                        input.seek(index60_7);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 65, _s, input);
+                new NoViableAltException(getDescription(), 60, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -36402,11 +35028,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final String dfa_27s = "\13\uffff";
     static final String dfa_28s = "\1\1\12\uffff";
     static final String dfa_29s = "\1\4\1\uffff\10\0\1\uffff";
-    static final String dfa_30s = "\1\u00a3\1\uffff\10\0\1\uffff";
+    static final String dfa_30s = "\1\u00a0\1\uffff\10\0\1\uffff";
     static final String dfa_31s = "\1\uffff\1\2\10\uffff\1\1";
-    static final String dfa_32s = "\2\uffff\1\2\1\4\1\5\1\6\1\7\1\3\1\0\1\1\1\uffff}>";
+    static final String dfa_32s = "\2\uffff\1\0\1\4\1\2\1\3\1\1\1\5\1\6\1\7\1\uffff}>";
     static final String[] dfa_33s = {
-            "\2\1\1\uffff\3\1\6\uffff\2\1\2\uffff\1\1\71\uffff\1\1\17\uffff\6\1\1\uffff\1\1\1\uffff\3\1\1\uffff\10\1\1\2\1\3\10\1\1\4\1\5\1\6\1\7\1\10\1\11\10\1\1\uffff\30\1",
+            "\2\1\1\uffff\3\1\6\uffff\2\1\2\uffff\1\1\65\uffff\1\1\20\uffff\6\1\1\uffff\1\1\1\uffff\3\1\1\uffff\10\1\1\2\1\3\10\1\1\4\1\5\1\6\1\7\1\10\1\11\10\1\1\uffff\30\1",
             "",
             "\1\uffff",
             "\1\uffff",
@@ -36427,11 +35053,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final short[] dfa_32 = DFA.unpackEncodedString(dfa_32s);
     static final short[][] dfa_33 = unpackEncodedStringArray(dfa_33s);
 
-    class DFA75 extends DFA {
+    class DFA70 extends DFA {
 
-        public DFA75(BaseRecognizer recognizer) {
+        public DFA70(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 75;
+            this.decisionNumber = 70;
             this.eot = dfa_27;
             this.eof = dfa_28;
             this.min = dfa_29;
@@ -36441,17 +35067,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_33;
         }
         public String getDescription() {
-            return "()* loopback of 6384:3: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*";
+            return "()* loopback of 5854:3: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA75_8 = input.LA(1);
+                        int LA70_2 = input.LA(1);
 
                          
-                        int index75_8 = input.index();
+                        int index70_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalTableDSL()) ) {s = 10;}
@@ -36459,14 +35085,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index75_8);
+                        input.seek(index70_2);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA75_9 = input.LA(1);
+                        int LA70_6 = input.LA(1);
 
                          
-                        int index75_9 = input.index();
+                        int index70_6 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalTableDSL()) ) {s = 10;}
@@ -36474,14 +35100,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index75_9);
+                        input.seek(index70_6);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA75_2 = input.LA(1);
+                        int LA70_4 = input.LA(1);
 
                          
-                        int index75_2 = input.index();
+                        int index70_4 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalTableDSL()) ) {s = 10;}
@@ -36489,14 +35115,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index75_2);
+                        input.seek(index70_4);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA75_7 = input.LA(1);
+                        int LA70_5 = input.LA(1);
 
                          
-                        int index75_7 = input.index();
+                        int index70_5 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalTableDSL()) ) {s = 10;}
@@ -36504,14 +35130,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index75_7);
+                        input.seek(index70_5);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA75_3 = input.LA(1);
+                        int LA70_3 = input.LA(1);
 
                          
-                        int index75_3 = input.index();
+                        int index70_3 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalTableDSL()) ) {s = 10;}
@@ -36519,14 +35145,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index75_3);
+                        input.seek(index70_3);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA75_4 = input.LA(1);
+                        int LA70_7 = input.LA(1);
 
                          
-                        int index75_4 = input.index();
+                        int index70_7 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalTableDSL()) ) {s = 10;}
@@ -36534,14 +35160,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index75_4);
+                        input.seek(index70_7);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA75_5 = input.LA(1);
+                        int LA70_8 = input.LA(1);
 
                          
-                        int index75_5 = input.index();
+                        int index70_8 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalTableDSL()) ) {s = 10;}
@@ -36549,14 +35175,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index75_5);
+                        input.seek(index70_8);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA75_6 = input.LA(1);
+                        int LA70_9 = input.LA(1);
 
                          
-                        int index75_6 = input.index();
+                        int index70_9 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalTableDSL()) ) {s = 10;}
@@ -36564,19 +35190,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index75_6);
+                        input.seek(index70_9);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 75, _s, input);
+                new NoViableAltException(getDescription(), 70, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String dfa_34s = "\1\163\2\uffff\1\164\7\uffff";
-    static final String dfa_35s = "\1\u0082\2\uffff\1\177\7\uffff";
+    static final String dfa_34s = "\1\160\2\uffff\1\161\7\uffff";
+    static final String dfa_35s = "\1\177\2\uffff\1\174\7\uffff";
     static final String dfa_36s = "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\3\1\6";
     static final String dfa_37s = "\13\uffff}>";
     static final String[] dfa_38s = {
@@ -36598,11 +35224,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final short[] dfa_37 = DFA.unpackEncodedString(dfa_37s);
     static final short[][] dfa_38 = unpackEncodedStringArray(dfa_38s);
 
-    class DFA78 extends DFA {
+    class DFA73 extends DFA {
 
-        public DFA78(BaseRecognizer recognizer) {
+        public DFA73(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 78;
+            this.decisionNumber = 73;
             this.eot = dfa_27;
             this.eof = dfa_27;
             this.min = dfa_34;
@@ -36612,17 +35238,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_38;
         }
         public String getDescription() {
-            return "6460:2: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )";
+            return "5930:2: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )";
         }
     }
     static final String dfa_39s = "\116\uffff";
     static final String dfa_40s = "\1\2\115\uffff";
     static final String dfa_41s = "\1\4\1\0\114\uffff";
-    static final String dfa_42s = "\1\u00a3\1\0\114\uffff";
+    static final String dfa_42s = "\1\u00a0\1\0\114\uffff";
     static final String dfa_43s = "\2\uffff\1\2\112\uffff\1\1";
     static final String dfa_44s = "\1\uffff\1\0\114\uffff}>";
     static final String[] dfa_45s = {
-            "\2\2\1\uffff\3\2\6\uffff\2\2\2\uffff\1\2\71\uffff\1\2\17\uffff\6\2\1\uffff\1\2\1\uffff\1\1\2\2\1\uffff\40\2\1\uffff\30\2",
+            "\2\2\1\uffff\3\2\6\uffff\2\2\2\uffff\1\2\65\uffff\1\2\20\uffff\6\2\1\uffff\1\2\1\uffff\1\1\2\2\1\uffff\40\2\1\uffff\30\2",
             "\1\uffff",
             "",
             "",
@@ -36710,11 +35336,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final short[] dfa_44 = DFA.unpackEncodedString(dfa_44s);
     static final short[][] dfa_45 = unpackEncodedStringArray(dfa_45s);
 
-    class DFA94 extends DFA {
+    class DFA89 extends DFA {
 
-        public DFA94(BaseRecognizer recognizer) {
+        public DFA89(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 94;
+            this.decisionNumber = 89;
             this.eot = dfa_39;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -36724,17 +35350,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_45;
         }
         public String getDescription() {
-            return "7361:5: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?";
+            return "6831:5: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA94_1 = input.LA(1);
+                        int LA89_1 = input.LA(1);
 
                          
-                        int index94_1 = input.index();
+                        int index89_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred22_InternalTableDSL()) ) {s = 77;}
@@ -36742,23 +35368,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index94_1);
+                        input.seek(index89_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 94, _s, input);
+                new NoViableAltException(getDescription(), 89, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String dfa_46s = "\1\4\2\0\41\uffff";
-    static final String dfa_47s = "\1\u00a2\2\0\41\uffff";
+    static final String dfa_47s = "\1\u009f\2\0\41\uffff";
     static final String dfa_48s = "\3\uffff\2\1\1\2\35\uffff\1\3";
     static final String dfa_49s = "\1\0\1\1\1\2\41\uffff}>";
     static final String[] dfa_50s = {
-            "\1\1\1\5\1\uffff\3\5\6\uffff\1\5\115\uffff\5\5\4\uffff\1\2\1\uffff\1\43\1\uffff\2\5\6\uffff\1\5\14\uffff\1\3\5\uffff\1\5\4\uffff\1\4\1\5\1\uffff\1\5\3\uffff\3\5\2\uffff\12\5\1\uffff\1\5",
+            "\1\1\1\5\1\uffff\3\5\6\uffff\1\5\112\uffff\5\5\4\uffff\1\2\1\uffff\1\43\1\uffff\2\5\6\uffff\1\5\14\uffff\1\3\5\uffff\1\5\4\uffff\1\4\1\5\1\uffff\1\5\3\uffff\3\5\2\uffff\12\5\1\uffff\1\5",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -36801,11 +35427,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final short[] dfa_49 = DFA.unpackEncodedString(dfa_49s);
     static final short[][] dfa_50 = unpackEncodedStringArray(dfa_50s);
 
-    class DFA93 extends DFA {
+    class DFA88 extends DFA {
 
-        public DFA93(BaseRecognizer recognizer) {
+        public DFA88(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 93;
+            this.decisionNumber = 88;
             this.eot = dfa_8;
             this.eof = dfa_8;
             this.min = dfa_46;
@@ -36815,40 +35441,40 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_50;
         }
         public String getDescription() {
-            return "7380:6: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?";
+            return "6850:6: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA93_0 = input.LA(1);
+                        int LA88_0 = input.LA(1);
 
                          
-                        int index93_0 = input.index();
+                        int index88_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA93_0==RULE_ID) ) {s = 1;}
+                        if ( (LA88_0==RULE_ID) ) {s = 1;}
 
-                        else if ( (LA93_0==103) ) {s = 2;}
+                        else if ( (LA88_0==100) ) {s = 2;}
 
-                        else if ( (LA93_0==128) && (synpred23_InternalTableDSL())) {s = 3;}
+                        else if ( (LA88_0==125) && (synpred23_InternalTableDSL())) {s = 3;}
 
-                        else if ( (LA93_0==139) && (synpred23_InternalTableDSL())) {s = 4;}
+                        else if ( (LA88_0==136) && (synpred23_InternalTableDSL())) {s = 4;}
 
-                        else if ( (LA93_0==RULE_STRING||(LA93_0>=RULE_INT && LA93_0<=RULE_DECIMAL)||LA93_0==16||(LA93_0>=94 && LA93_0<=98)||(LA93_0>=107 && LA93_0<=108)||LA93_0==115||LA93_0==134||LA93_0==140||LA93_0==142||(LA93_0>=146 && LA93_0<=148)||(LA93_0>=151 && LA93_0<=160)||LA93_0==162) ) {s = 5;}
+                        else if ( (LA88_0==RULE_STRING||(LA88_0>=RULE_INT && LA88_0<=RULE_DECIMAL)||LA88_0==16||(LA88_0>=91 && LA88_0<=95)||(LA88_0>=104 && LA88_0<=105)||LA88_0==112||LA88_0==131||LA88_0==137||LA88_0==139||(LA88_0>=143 && LA88_0<=145)||(LA88_0>=148 && LA88_0<=157)||LA88_0==159) ) {s = 5;}
 
-                        else if ( (LA93_0==105) ) {s = 35;}
+                        else if ( (LA88_0==102) ) {s = 35;}
 
                          
-                        input.seek(index93_0);
+                        input.seek(index88_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA93_1 = input.LA(1);
+                        int LA88_1 = input.LA(1);
 
                          
-                        int index93_1 = input.index();
+                        int index88_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred23_InternalTableDSL()) ) {s = 4;}
@@ -36856,14 +35482,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index93_1);
+                        input.seek(index88_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA93_2 = input.LA(1);
+                        int LA88_2 = input.LA(1);
 
                          
-                        int index93_2 = input.index();
+                        int index88_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred23_InternalTableDSL()) ) {s = 4;}
@@ -36871,19 +35497,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index93_2);
+                        input.seek(index88_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 93, _s, input);
+                new NoViableAltException(getDescription(), 88, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String[] dfa_51s = {
-            "\2\2\1\uffff\3\2\6\uffff\2\2\2\uffff\1\2\71\uffff\1\2\17\uffff\6\2\1\uffff\1\2\1\uffff\3\2\1\uffff\1\2\1\1\36\2\1\uffff\30\2",
+            "\2\2\1\uffff\3\2\6\uffff\2\2\2\uffff\1\2\65\uffff\1\2\20\uffff\6\2\1\uffff\1\2\1\uffff\3\2\1\uffff\1\2\1\1\36\2\1\uffff\30\2",
             "\1\uffff",
             "",
             "",
@@ -36964,11 +35590,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     };
     static final short[][] dfa_51 = unpackEncodedStringArray(dfa_51s);
 
-    class DFA95 extends DFA {
+    class DFA90 extends DFA {
 
-        public DFA95(BaseRecognizer recognizer) {
+        public DFA90(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 95;
+            this.decisionNumber = 90;
             this.eot = dfa_39;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -36978,17 +35604,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_51;
         }
         public String getDescription() {
-            return "7478:5: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?";
+            return "6948:5: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA95_1 = input.LA(1);
+                        int LA90_1 = input.LA(1);
 
                          
-                        int index95_1 = input.index();
+                        int index90_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred24_InternalTableDSL()) ) {s = 77;}
@@ -36996,24 +35622,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index95_1);
+                        input.seek(index90_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 95, _s, input);
+                new NoViableAltException(getDescription(), 90, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String dfa_52s = "\40\uffff";
     static final String dfa_53s = "\1\4\26\uffff\1\0\10\uffff";
-    static final String dfa_54s = "\1\u00a2\26\uffff\1\0\10\uffff";
+    static final String dfa_54s = "\1\u009f\26\uffff\1\0\10\uffff";
     static final String dfa_55s = "\1\uffff\1\1\1\2\1\3\1\4\1\5\6\uffff\1\6\11\uffff\1\7\1\uffff\1\12\1\13\1\14\1\15\1\16\1\17\1\10\1\11";
     static final String dfa_56s = "\1\0\26\uffff\1\1\10\uffff}>";
     static final String[] dfa_57s = {
-            "\1\5\1\14\1\uffff\3\14\6\uffff\1\2\117\uffff\3\5\4\uffff\1\35\3\uffff\2\14\6\uffff\1\5\30\uffff\1\26\1\uffff\1\3\3\uffff\1\27\1\30\1\31\2\uffff\2\5\1\1\4\14\1\32\1\33\1\34\1\uffff\1\4",
+            "\1\5\1\14\1\uffff\3\14\6\uffff\1\2\114\uffff\3\5\4\uffff\1\35\3\uffff\2\14\6\uffff\1\5\30\uffff\1\26\1\uffff\1\3\3\uffff\1\27\1\30\1\31\2\uffff\2\5\1\1\4\14\1\32\1\33\1\34\1\uffff\1\4",
             "",
             "",
             "",
@@ -37054,11 +35680,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final short[] dfa_56 = DFA.unpackEncodedString(dfa_56s);
     static final short[][] dfa_57 = unpackEncodedStringArray(dfa_57s);
 
-    class DFA97 extends DFA {
+    class DFA92 extends DFA {
 
-        public DFA97(BaseRecognizer recognizer) {
+        public DFA92(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 97;
+            this.decisionNumber = 92;
             this.eot = dfa_52;
             this.eof = dfa_52;
             this.min = dfa_53;
@@ -37068,56 +35694,56 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_57;
         }
         public String getDescription() {
-            return "7523:2: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )";
+            return "6993:2: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA97_0 = input.LA(1);
+                        int LA92_0 = input.LA(1);
 
                          
-                        int index97_0 = input.index();
+                        int index92_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA97_0==153) ) {s = 1;}
+                        if ( (LA92_0==150) ) {s = 1;}
 
-                        else if ( (LA97_0==16) ) {s = 2;}
+                        else if ( (LA92_0==16) ) {s = 2;}
 
-                        else if ( (LA97_0==142) ) {s = 3;}
+                        else if ( (LA92_0==139) ) {s = 3;}
 
-                        else if ( (LA97_0==162) && (synpred25_InternalTableDSL())) {s = 4;}
+                        else if ( (LA92_0==159) && (synpred25_InternalTableDSL())) {s = 4;}
 
-                        else if ( (LA97_0==RULE_ID||(LA97_0>=96 && LA97_0<=98)||LA97_0==115||(LA97_0>=151 && LA97_0<=152)) ) {s = 5;}
+                        else if ( (LA92_0==RULE_ID||(LA92_0>=93 && LA92_0<=95)||LA92_0==112||(LA92_0>=148 && LA92_0<=149)) ) {s = 5;}
 
-                        else if ( (LA97_0==RULE_STRING||(LA97_0>=RULE_INT && LA97_0<=RULE_DECIMAL)||(LA97_0>=107 && LA97_0<=108)||(LA97_0>=154 && LA97_0<=157)) ) {s = 12;}
+                        else if ( (LA92_0==RULE_STRING||(LA92_0>=RULE_INT && LA92_0<=RULE_DECIMAL)||(LA92_0>=104 && LA92_0<=105)||(LA92_0>=151 && LA92_0<=154)) ) {s = 12;}
 
-                        else if ( (LA97_0==140) ) {s = 22;}
+                        else if ( (LA92_0==137) ) {s = 22;}
 
-                        else if ( (LA97_0==146) ) {s = 23;}
+                        else if ( (LA92_0==143) ) {s = 23;}
 
-                        else if ( (LA97_0==147) ) {s = 24;}
+                        else if ( (LA92_0==144) ) {s = 24;}
 
-                        else if ( (LA97_0==148) ) {s = 25;}
+                        else if ( (LA92_0==145) ) {s = 25;}
 
-                        else if ( (LA97_0==158) ) {s = 26;}
+                        else if ( (LA92_0==155) ) {s = 26;}
 
-                        else if ( (LA97_0==159) ) {s = 27;}
+                        else if ( (LA92_0==156) ) {s = 27;}
 
-                        else if ( (LA97_0==160) ) {s = 28;}
+                        else if ( (LA92_0==157) ) {s = 28;}
 
-                        else if ( (LA97_0==103) ) {s = 29;}
+                        else if ( (LA92_0==100) ) {s = 29;}
 
                          
-                        input.seek(index97_0);
+                        input.seek(index92_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA97_23 = input.LA(1);
+                        int LA92_23 = input.LA(1);
 
                          
-                        int index97_23 = input.index();
+                        int index92_23 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred26_InternalTableDSL()) ) {s = 30;}
@@ -37125,24 +35751,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 31;}
 
                          
-                        input.seek(index97_23);
+                        input.seek(index92_23);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 97, _s, input);
+                new NoViableAltException(getDescription(), 92, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String dfa_58s = "\46\uffff";
     static final String dfa_59s = "\1\4\2\0\43\uffff";
-    static final String dfa_60s = "\1\u00a2\2\0\43\uffff";
+    static final String dfa_60s = "\1\u009f\2\0\43\uffff";
     static final String dfa_61s = "\3\uffff\2\1\1\2\40\uffff";
     static final String dfa_62s = "\1\0\1\1\1\2\43\uffff}>";
     static final String[] dfa_63s = {
-            "\1\1\1\5\1\uffff\3\5\6\uffff\1\5\115\uffff\5\5\4\uffff\1\2\3\uffff\3\5\5\uffff\1\5\14\uffff\1\3\5\uffff\1\5\4\uffff\1\4\1\5\1\uffff\1\5\3\uffff\17\5\1\uffff\1\5",
+            "\1\1\1\5\1\uffff\3\5\6\uffff\1\5\112\uffff\5\5\4\uffff\1\2\3\uffff\3\5\5\uffff\1\5\14\uffff\1\3\5\uffff\1\5\4\uffff\1\4\1\5\1\uffff\1\5\3\uffff\17\5\1\uffff\1\5",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -37189,11 +35815,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final short[] dfa_62 = DFA.unpackEncodedString(dfa_62s);
     static final short[][] dfa_63 = unpackEncodedStringArray(dfa_63s);
 
-    class DFA106 extends DFA {
+    class DFA101 extends DFA {
 
-        public DFA106(BaseRecognizer recognizer) {
+        public DFA101(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 106;
+            this.decisionNumber = 101;
             this.eot = dfa_58;
             this.eof = dfa_58;
             this.min = dfa_59;
@@ -37203,38 +35829,38 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_63;
         }
         public String getDescription() {
-            return "8015:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?";
+            return "7485:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA106_0 = input.LA(1);
+                        int LA101_0 = input.LA(1);
 
                          
-                        int index106_0 = input.index();
+                        int index101_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA106_0==RULE_ID) ) {s = 1;}
+                        if ( (LA101_0==RULE_ID) ) {s = 1;}
 
-                        else if ( (LA106_0==103) ) {s = 2;}
+                        else if ( (LA101_0==100) ) {s = 2;}
 
-                        else if ( (LA106_0==128) && (synpred29_InternalTableDSL())) {s = 3;}
+                        else if ( (LA101_0==125) && (synpred29_InternalTableDSL())) {s = 3;}
 
-                        else if ( (LA106_0==139) && (synpred29_InternalTableDSL())) {s = 4;}
+                        else if ( (LA101_0==136) && (synpred29_InternalTableDSL())) {s = 4;}
 
-                        else if ( (LA106_0==RULE_STRING||(LA106_0>=RULE_INT && LA106_0<=RULE_DECIMAL)||LA106_0==16||(LA106_0>=94 && LA106_0<=98)||(LA106_0>=107 && LA106_0<=109)||LA106_0==115||LA106_0==134||LA106_0==140||LA106_0==142||(LA106_0>=146 && LA106_0<=160)||LA106_0==162) ) {s = 5;}
+                        else if ( (LA101_0==RULE_STRING||(LA101_0>=RULE_INT && LA101_0<=RULE_DECIMAL)||LA101_0==16||(LA101_0>=91 && LA101_0<=95)||(LA101_0>=104 && LA101_0<=106)||LA101_0==112||LA101_0==131||LA101_0==137||LA101_0==139||(LA101_0>=143 && LA101_0<=157)||LA101_0==159) ) {s = 5;}
 
                          
-                        input.seek(index106_0);
+                        input.seek(index101_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA106_1 = input.LA(1);
+                        int LA101_1 = input.LA(1);
 
                          
-                        int index106_1 = input.index();
+                        int index101_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred29_InternalTableDSL()) ) {s = 4;}
@@ -37242,14 +35868,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index106_1);
+                        input.seek(index101_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA106_2 = input.LA(1);
+                        int LA101_2 = input.LA(1);
 
                          
-                        int index106_2 = input.index();
+                        int index101_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred29_InternalTableDSL()) ) {s = 4;}
@@ -37257,19 +35883,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index106_2);
+                        input.seek(index101_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 106, _s, input);
+                new NoViableAltException(getDescription(), 101, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String[] dfa_64s = {
-            "\2\2\1\uffff\3\2\6\uffff\1\2\115\uffff\5\2\4\uffff\1\1\3\uffff\2\2\6\uffff\1\2\14\uffff\1\2\5\uffff\1\2\5\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2",
+            "\2\2\1\uffff\3\2\6\uffff\1\2\112\uffff\5\2\4\uffff\1\1\3\uffff\2\2\6\uffff\1\2\14\uffff\1\2\5\uffff\1\2\5\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -37307,11 +35933,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     };
     static final short[][] dfa_64 = unpackEncodedStringArray(dfa_64s);
 
-    class DFA113 extends DFA {
+    class DFA108 extends DFA {
 
-        public DFA113(BaseRecognizer recognizer) {
+        public DFA108(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 113;
+            this.decisionNumber = 108;
             this.eot = dfa_14;
             this.eof = dfa_14;
             this.min = dfa_15;
@@ -37321,17 +35947,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_64;
         }
         public String getDescription() {
-            return "8481:3: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )";
+            return "7951:3: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA113_1 = input.LA(1);
+                        int LA108_1 = input.LA(1);
 
                          
-                        int index113_1 = input.index();
+                        int index108_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred32_InternalTableDSL()) ) {s = 34;}
@@ -37339,24 +35965,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index113_1);
+                        input.seek(index108_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 113, _s, input);
+                new NoViableAltException(getDescription(), 108, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String dfa_65s = "\42\uffff";
     static final String dfa_66s = "\1\4\2\0\37\uffff";
-    static final String dfa_67s = "\1\u00a2\2\0\37\uffff";
+    static final String dfa_67s = "\1\u009f\2\0\37\uffff";
     static final String dfa_68s = "\3\uffff\1\1\1\2\35\uffff";
     static final String dfa_69s = "\1\0\1\1\1\2\37\uffff}>";
     static final String[] dfa_70s = {
-            "\1\1\1\4\1\uffff\3\4\6\uffff\1\4\115\uffff\5\4\4\uffff\1\2\3\uffff\2\4\6\uffff\1\4\14\uffff\1\3\5\uffff\1\4\5\uffff\1\4\1\uffff\1\4\3\uffff\3\4\2\uffff\12\4\1\uffff\1\4",
+            "\1\1\1\4\1\uffff\3\4\6\uffff\1\4\112\uffff\5\4\4\uffff\1\2\3\uffff\2\4\6\uffff\1\4\14\uffff\1\3\5\uffff\1\4\5\uffff\1\4\1\uffff\1\4\3\uffff\3\4\2\uffff\12\4\1\uffff\1\4",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -37399,11 +36025,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final short[] dfa_69 = DFA.unpackEncodedString(dfa_69s);
     static final short[][] dfa_70 = unpackEncodedStringArray(dfa_70s);
 
-    class DFA112 extends DFA {
+    class DFA107 extends DFA {
 
-        public DFA112(BaseRecognizer recognizer) {
+        public DFA107(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 112;
+            this.decisionNumber = 107;
             this.eot = dfa_65;
             this.eof = dfa_65;
             this.min = dfa_66;
@@ -37413,36 +36039,36 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_70;
         }
         public String getDescription() {
-            return "8550:5: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?";
+            return "8020:5: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA112_0 = input.LA(1);
+                        int LA107_0 = input.LA(1);
 
                          
-                        int index112_0 = input.index();
+                        int index107_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA112_0==RULE_ID) ) {s = 1;}
+                        if ( (LA107_0==RULE_ID) ) {s = 1;}
 
-                        else if ( (LA112_0==103) ) {s = 2;}
+                        else if ( (LA107_0==100) ) {s = 2;}
 
-                        else if ( (LA112_0==128) && (synpred33_InternalTableDSL())) {s = 3;}
+                        else if ( (LA107_0==125) && (synpred33_InternalTableDSL())) {s = 3;}
 
-                        else if ( (LA112_0==RULE_STRING||(LA112_0>=RULE_INT && LA112_0<=RULE_DECIMAL)||LA112_0==16||(LA112_0>=94 && LA112_0<=98)||(LA112_0>=107 && LA112_0<=108)||LA112_0==115||LA112_0==134||LA112_0==140||LA112_0==142||(LA112_0>=146 && LA112_0<=148)||(LA112_0>=151 && LA112_0<=160)||LA112_0==162) ) {s = 4;}
+                        else if ( (LA107_0==RULE_STRING||(LA107_0>=RULE_INT && LA107_0<=RULE_DECIMAL)||LA107_0==16||(LA107_0>=91 && LA107_0<=95)||(LA107_0>=104 && LA107_0<=105)||LA107_0==112||LA107_0==131||LA107_0==137||LA107_0==139||(LA107_0>=143 && LA107_0<=145)||(LA107_0>=148 && LA107_0<=157)||LA107_0==159) ) {s = 4;}
 
                          
-                        input.seek(index112_0);
+                        input.seek(index107_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA112_1 = input.LA(1);
+                        int LA107_1 = input.LA(1);
 
                          
-                        int index112_1 = input.index();
+                        int index107_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred33_InternalTableDSL()) ) {s = 3;}
@@ -37450,14 +36076,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 4;}
 
                          
-                        input.seek(index112_1);
+                        input.seek(index107_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA112_2 = input.LA(1);
+                        int LA107_2 = input.LA(1);
 
                          
-                        int index112_2 = input.index();
+                        int index107_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred33_InternalTableDSL()) ) {s = 3;}
@@ -37465,23 +36091,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 4;}
 
                          
-                        input.seek(index112_2);
+                        input.seek(index107_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 112, _s, input);
+                new NoViableAltException(getDescription(), 107, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA135 extends DFA {
+    class DFA130 extends DFA {
 
-        public DFA135(BaseRecognizer recognizer) {
+        public DFA130(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 135;
+            this.decisionNumber = 130;
             this.eot = dfa_39;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -37491,17 +36117,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_45;
         }
         public String getDescription() {
-            return "9679:3: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?";
+            return "9149:3: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA135_1 = input.LA(1);
+                        int LA130_1 = input.LA(1);
 
                          
-                        int index135_1 = input.index();
+                        int index130_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred36_InternalTableDSL()) ) {s = 77;}
@@ -37509,23 +36135,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index135_1);
+                        input.seek(index130_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 135, _s, input);
+                new NoViableAltException(getDescription(), 130, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA134 extends DFA {
+    class DFA129 extends DFA {
 
-        public DFA134(BaseRecognizer recognizer) {
+        public DFA129(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 134;
+            this.decisionNumber = 129;
             this.eot = dfa_8;
             this.eof = dfa_8;
             this.min = dfa_46;
@@ -37535,40 +36161,40 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_50;
         }
         public String getDescription() {
-            return "9698:4: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?";
+            return "9168:4: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA134_0 = input.LA(1);
+                        int LA129_0 = input.LA(1);
 
                          
-                        int index134_0 = input.index();
+                        int index129_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA134_0==RULE_ID) ) {s = 1;}
+                        if ( (LA129_0==RULE_ID) ) {s = 1;}
 
-                        else if ( (LA134_0==103) ) {s = 2;}
+                        else if ( (LA129_0==100) ) {s = 2;}
 
-                        else if ( (LA134_0==128) && (synpred37_InternalTableDSL())) {s = 3;}
+                        else if ( (LA129_0==125) && (synpred37_InternalTableDSL())) {s = 3;}
 
-                        else if ( (LA134_0==139) && (synpred37_InternalTableDSL())) {s = 4;}
+                        else if ( (LA129_0==136) && (synpred37_InternalTableDSL())) {s = 4;}
 
-                        else if ( (LA134_0==RULE_STRING||(LA134_0>=RULE_INT && LA134_0<=RULE_DECIMAL)||LA134_0==16||(LA134_0>=94 && LA134_0<=98)||(LA134_0>=107 && LA134_0<=108)||LA134_0==115||LA134_0==134||LA134_0==140||LA134_0==142||(LA134_0>=146 && LA134_0<=148)||(LA134_0>=151 && LA134_0<=160)||LA134_0==162) ) {s = 5;}
+                        else if ( (LA129_0==RULE_STRING||(LA129_0>=RULE_INT && LA129_0<=RULE_DECIMAL)||LA129_0==16||(LA129_0>=91 && LA129_0<=95)||(LA129_0>=104 && LA129_0<=105)||LA129_0==112||LA129_0==131||LA129_0==137||LA129_0==139||(LA129_0>=143 && LA129_0<=145)||(LA129_0>=148 && LA129_0<=157)||LA129_0==159) ) {s = 5;}
 
-                        else if ( (LA134_0==105) ) {s = 35;}
+                        else if ( (LA129_0==102) ) {s = 35;}
 
                          
-                        input.seek(index134_0);
+                        input.seek(index129_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA134_1 = input.LA(1);
+                        int LA129_1 = input.LA(1);
 
                          
-                        int index134_1 = input.index();
+                        int index129_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred37_InternalTableDSL()) ) {s = 4;}
@@ -37576,14 +36202,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index134_1);
+                        input.seek(index129_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA134_2 = input.LA(1);
+                        int LA129_2 = input.LA(1);
 
                          
-                        int index134_2 = input.index();
+                        int index129_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred37_InternalTableDSL()) ) {s = 4;}
@@ -37591,23 +36217,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index134_2);
+                        input.seek(index129_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 134, _s, input);
+                new NoViableAltException(getDescription(), 129, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA136 extends DFA {
+    class DFA131 extends DFA {
 
-        public DFA136(BaseRecognizer recognizer) {
+        public DFA131(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 136;
+            this.decisionNumber = 131;
             this.eot = dfa_39;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -37617,17 +36243,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_51;
         }
         public String getDescription() {
-            return "9796:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?";
+            return "9266:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA136_1 = input.LA(1);
+                        int LA131_1 = input.LA(1);
 
                          
-                        int index136_1 = input.index();
+                        int index131_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred38_InternalTableDSL()) ) {s = 77;}
@@ -37635,19 +36261,19 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index136_1);
+                        input.seek(index131_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 136, _s, input);
+                new NoViableAltException(getDescription(), 131, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String[] dfa_71s = {
-            "\2\2\1\uffff\3\2\6\uffff\2\2\2\uffff\1\2\71\uffff\1\2\17\uffff\6\2\1\uffff\1\2\1\uffff\3\2\1\uffff\10\2\1\1\27\2\1\uffff\30\2",
+            "\2\2\1\uffff\3\2\6\uffff\2\2\2\uffff\1\2\65\uffff\1\2\20\uffff\6\2\1\uffff\1\2\1\uffff\3\2\1\uffff\10\2\1\1\27\2\1\uffff\30\2",
             "\1\uffff",
             "",
             "",
@@ -37728,11 +36354,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     };
     static final short[][] dfa_71 = unpackEncodedStringArray(dfa_71s);
 
-    class DFA140 extends DFA {
+    class DFA135 extends DFA {
 
-        public DFA140(BaseRecognizer recognizer) {
+        public DFA135(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 140;
+            this.decisionNumber = 135;
             this.eot = dfa_39;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -37742,17 +36368,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_71;
         }
         public String getDescription() {
-            return "9955:3: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?";
+            return "9425:3: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA140_1 = input.LA(1);
+                        int LA135_1 = input.LA(1);
 
                          
-                        int index140_1 = input.index();
+                        int index135_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred39_InternalTableDSL()) ) {s = 77;}
@@ -37760,23 +36386,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index140_1);
+                        input.seek(index135_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 140, _s, input);
+                new NoViableAltException(getDescription(), 135, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA143 extends DFA {
+    class DFA138 extends DFA {
 
-        public DFA143(BaseRecognizer recognizer) {
+        public DFA138(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 143;
+            this.decisionNumber = 138;
             this.eot = dfa_39;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -37786,17 +36412,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_45;
         }
         public String getDescription() {
-            return "10012:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?";
+            return "9482:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA143_1 = input.LA(1);
+                        int LA138_1 = input.LA(1);
 
                          
-                        int index143_1 = input.index();
+                        int index138_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred40_InternalTableDSL()) ) {s = 77;}
@@ -37804,23 +36430,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index143_1);
+                        input.seek(index138_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 143, _s, input);
+                new NoViableAltException(getDescription(), 138, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA142 extends DFA {
+    class DFA137 extends DFA {
 
-        public DFA142(BaseRecognizer recognizer) {
+        public DFA137(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 142;
+            this.decisionNumber = 137;
             this.eot = dfa_8;
             this.eof = dfa_8;
             this.min = dfa_46;
@@ -37830,40 +36456,40 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_50;
         }
         public String getDescription() {
-            return "10031:4: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?";
+            return "9501:4: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA142_0 = input.LA(1);
+                        int LA137_0 = input.LA(1);
 
                          
-                        int index142_0 = input.index();
+                        int index137_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA142_0==RULE_ID) ) {s = 1;}
+                        if ( (LA137_0==RULE_ID) ) {s = 1;}
 
-                        else if ( (LA142_0==103) ) {s = 2;}
+                        else if ( (LA137_0==100) ) {s = 2;}
 
-                        else if ( (LA142_0==128) && (synpred41_InternalTableDSL())) {s = 3;}
+                        else if ( (LA137_0==125) && (synpred41_InternalTableDSL())) {s = 3;}
 
-                        else if ( (LA142_0==139) && (synpred41_InternalTableDSL())) {s = 4;}
+                        else if ( (LA137_0==136) && (synpred41_InternalTableDSL())) {s = 4;}
 
-                        else if ( (LA142_0==RULE_STRING||(LA142_0>=RULE_INT && LA142_0<=RULE_DECIMAL)||LA142_0==16||(LA142_0>=94 && LA142_0<=98)||(LA142_0>=107 && LA142_0<=108)||LA142_0==115||LA142_0==134||LA142_0==140||LA142_0==142||(LA142_0>=146 && LA142_0<=148)||(LA142_0>=151 && LA142_0<=160)||LA142_0==162) ) {s = 5;}
+                        else if ( (LA137_0==RULE_STRING||(LA137_0>=RULE_INT && LA137_0<=RULE_DECIMAL)||LA137_0==16||(LA137_0>=91 && LA137_0<=95)||(LA137_0>=104 && LA137_0<=105)||LA137_0==112||LA137_0==131||LA137_0==137||LA137_0==139||(LA137_0>=143 && LA137_0<=145)||(LA137_0>=148 && LA137_0<=157)||LA137_0==159) ) {s = 5;}
 
-                        else if ( (LA142_0==105) ) {s = 35;}
+                        else if ( (LA137_0==102) ) {s = 35;}
 
                          
-                        input.seek(index142_0);
+                        input.seek(index137_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA142_1 = input.LA(1);
+                        int LA137_1 = input.LA(1);
 
                          
-                        int index142_1 = input.index();
+                        int index137_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred41_InternalTableDSL()) ) {s = 4;}
@@ -37871,14 +36497,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index142_1);
+                        input.seek(index137_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA142_2 = input.LA(1);
+                        int LA137_2 = input.LA(1);
 
                          
-                        int index142_2 = input.index();
+                        int index137_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred41_InternalTableDSL()) ) {s = 4;}
@@ -37886,23 +36512,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index142_2);
+                        input.seek(index137_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 142, _s, input);
+                new NoViableAltException(getDescription(), 137, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA144 extends DFA {
+    class DFA139 extends DFA {
 
-        public DFA144(BaseRecognizer recognizer) {
+        public DFA139(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 144;
+            this.decisionNumber = 139;
             this.eot = dfa_39;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -37912,17 +36538,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_51;
         }
         public String getDescription() {
-            return "10129:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?";
+            return "9599:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA144_1 = input.LA(1);
+                        int LA139_1 = input.LA(1);
 
                          
-                        int index144_1 = input.index();
+                        int index139_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred42_InternalTableDSL()) ) {s = 77;}
@@ -37930,24 +36556,24 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index144_1);
+                        input.seek(index139_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 144, _s, input);
+                new NoViableAltException(getDescription(), 139, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String dfa_72s = "\1\41\115\uffff";
     static final String dfa_73s = "\1\4\40\0\55\uffff";
-    static final String dfa_74s = "\1\u00a3\40\0\55\uffff";
+    static final String dfa_74s = "\1\u00a0\40\0\55\uffff";
     static final String dfa_75s = "\41\uffff\1\2\53\uffff\1\1";
     static final String dfa_76s = "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35\1\36\1\37\55\uffff}>";
     static final String[] dfa_77s = {
-            "\1\1\1\27\1\uffff\1\24\1\23\1\25\6\uffff\1\12\1\41\2\uffff\1\41\71\uffff\1\41\17\uffff\1\10\1\7\1\4\1\3\1\5\1\41\1\uffff\1\41\1\uffff\1\40\2\41\1\uffff\1\17\1\20\6\41\1\15\22\41\1\6\4\41\1\uffff\1\31\1\41\1\13\3\41\1\32\1\33\1\34\2\41\1\2\1\16\1\11\1\21\1\22\1\26\1\30\1\35\1\36\1\37\1\41\1\14\1\41",
+            "\1\1\1\27\1\uffff\1\24\1\23\1\25\6\uffff\1\12\1\41\2\uffff\1\41\65\uffff\1\41\20\uffff\1\10\1\7\1\4\1\3\1\5\1\41\1\uffff\1\41\1\uffff\1\40\2\41\1\uffff\1\17\1\20\6\41\1\15\22\41\1\6\4\41\1\uffff\1\31\1\41\1\13\3\41\1\32\1\33\1\34\2\41\1\2\1\16\1\11\1\21\1\22\1\26\1\30\1\35\1\36\1\37\1\41\1\14\1\41",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -38033,11 +36659,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final short[] dfa_76 = DFA.unpackEncodedString(dfa_76s);
     static final short[][] dfa_77 = unpackEncodedStringArray(dfa_77s);
 
-    class DFA147 extends DFA {
+    class DFA142 extends DFA {
 
-        public DFA147(BaseRecognizer recognizer) {
+        public DFA142(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 147;
+            this.decisionNumber = 142;
             this.eot = dfa_39;
             this.eof = dfa_72;
             this.min = dfa_73;
@@ -38047,17 +36673,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_77;
         }
         public String getDescription() {
-            return "10472:3: ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?";
+            return "9942:3: ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA147_1 = input.LA(1);
+                        int LA142_1 = input.LA(1);
 
                          
-                        int index147_1 = input.index();
+                        int index142_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38065,14 +36691,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_1);
+                        input.seek(index142_1);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA147_2 = input.LA(1);
+                        int LA142_2 = input.LA(1);
 
                          
-                        int index147_2 = input.index();
+                        int index142_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38080,14 +36706,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_2);
+                        input.seek(index142_2);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA147_3 = input.LA(1);
+                        int LA142_3 = input.LA(1);
 
                          
-                        int index147_3 = input.index();
+                        int index142_3 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38095,14 +36721,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_3);
+                        input.seek(index142_3);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA147_4 = input.LA(1);
+                        int LA142_4 = input.LA(1);
 
                          
-                        int index147_4 = input.index();
+                        int index142_4 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38110,14 +36736,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_4);
+                        input.seek(index142_4);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA147_5 = input.LA(1);
+                        int LA142_5 = input.LA(1);
 
                          
-                        int index147_5 = input.index();
+                        int index142_5 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38125,14 +36751,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_5);
+                        input.seek(index142_5);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA147_6 = input.LA(1);
+                        int LA142_6 = input.LA(1);
 
                          
-                        int index147_6 = input.index();
+                        int index142_6 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38140,14 +36766,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_6);
+                        input.seek(index142_6);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA147_7 = input.LA(1);
+                        int LA142_7 = input.LA(1);
 
                          
-                        int index147_7 = input.index();
+                        int index142_7 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38155,14 +36781,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_7);
+                        input.seek(index142_7);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA147_8 = input.LA(1);
+                        int LA142_8 = input.LA(1);
 
                          
-                        int index147_8 = input.index();
+                        int index142_8 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38170,14 +36796,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_8);
+                        input.seek(index142_8);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA147_9 = input.LA(1);
+                        int LA142_9 = input.LA(1);
 
                          
-                        int index147_9 = input.index();
+                        int index142_9 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38185,14 +36811,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_9);
+                        input.seek(index142_9);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA147_10 = input.LA(1);
+                        int LA142_10 = input.LA(1);
 
                          
-                        int index147_10 = input.index();
+                        int index142_10 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38200,14 +36826,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_10);
+                        input.seek(index142_10);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA147_11 = input.LA(1);
+                        int LA142_11 = input.LA(1);
 
                          
-                        int index147_11 = input.index();
+                        int index142_11 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38215,14 +36841,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_11);
+                        input.seek(index142_11);
                         if ( s>=0 ) return s;
                         break;
                     case 11 : 
-                        int LA147_12 = input.LA(1);
+                        int LA142_12 = input.LA(1);
 
                          
-                        int index147_12 = input.index();
+                        int index142_12 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38230,14 +36856,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_12);
+                        input.seek(index142_12);
                         if ( s>=0 ) return s;
                         break;
                     case 12 : 
-                        int LA147_13 = input.LA(1);
+                        int LA142_13 = input.LA(1);
 
                          
-                        int index147_13 = input.index();
+                        int index142_13 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38245,14 +36871,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_13);
+                        input.seek(index142_13);
                         if ( s>=0 ) return s;
                         break;
                     case 13 : 
-                        int LA147_14 = input.LA(1);
+                        int LA142_14 = input.LA(1);
 
                          
-                        int index147_14 = input.index();
+                        int index142_14 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38260,14 +36886,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_14);
+                        input.seek(index142_14);
                         if ( s>=0 ) return s;
                         break;
                     case 14 : 
-                        int LA147_15 = input.LA(1);
+                        int LA142_15 = input.LA(1);
 
                          
-                        int index147_15 = input.index();
+                        int index142_15 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38275,14 +36901,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_15);
+                        input.seek(index142_15);
                         if ( s>=0 ) return s;
                         break;
                     case 15 : 
-                        int LA147_16 = input.LA(1);
+                        int LA142_16 = input.LA(1);
 
                          
-                        int index147_16 = input.index();
+                        int index142_16 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38290,14 +36916,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_16);
+                        input.seek(index142_16);
                         if ( s>=0 ) return s;
                         break;
                     case 16 : 
-                        int LA147_17 = input.LA(1);
+                        int LA142_17 = input.LA(1);
 
                          
-                        int index147_17 = input.index();
+                        int index142_17 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38305,14 +36931,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_17);
+                        input.seek(index142_17);
                         if ( s>=0 ) return s;
                         break;
                     case 17 : 
-                        int LA147_18 = input.LA(1);
+                        int LA142_18 = input.LA(1);
 
                          
-                        int index147_18 = input.index();
+                        int index142_18 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38320,14 +36946,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_18);
+                        input.seek(index142_18);
                         if ( s>=0 ) return s;
                         break;
                     case 18 : 
-                        int LA147_19 = input.LA(1);
+                        int LA142_19 = input.LA(1);
 
                          
-                        int index147_19 = input.index();
+                        int index142_19 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38335,14 +36961,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_19);
+                        input.seek(index142_19);
                         if ( s>=0 ) return s;
                         break;
                     case 19 : 
-                        int LA147_20 = input.LA(1);
+                        int LA142_20 = input.LA(1);
 
                          
-                        int index147_20 = input.index();
+                        int index142_20 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38350,14 +36976,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_20);
+                        input.seek(index142_20);
                         if ( s>=0 ) return s;
                         break;
                     case 20 : 
-                        int LA147_21 = input.LA(1);
+                        int LA142_21 = input.LA(1);
 
                          
-                        int index147_21 = input.index();
+                        int index142_21 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38365,14 +36991,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_21);
+                        input.seek(index142_21);
                         if ( s>=0 ) return s;
                         break;
                     case 21 : 
-                        int LA147_22 = input.LA(1);
+                        int LA142_22 = input.LA(1);
 
                          
-                        int index147_22 = input.index();
+                        int index142_22 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38380,14 +37006,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_22);
+                        input.seek(index142_22);
                         if ( s>=0 ) return s;
                         break;
                     case 22 : 
-                        int LA147_23 = input.LA(1);
+                        int LA142_23 = input.LA(1);
 
                          
-                        int index147_23 = input.index();
+                        int index142_23 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38395,14 +37021,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_23);
+                        input.seek(index142_23);
                         if ( s>=0 ) return s;
                         break;
                     case 23 : 
-                        int LA147_24 = input.LA(1);
+                        int LA142_24 = input.LA(1);
 
                          
-                        int index147_24 = input.index();
+                        int index142_24 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38410,14 +37036,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_24);
+                        input.seek(index142_24);
                         if ( s>=0 ) return s;
                         break;
                     case 24 : 
-                        int LA147_25 = input.LA(1);
+                        int LA142_25 = input.LA(1);
 
                          
-                        int index147_25 = input.index();
+                        int index142_25 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38425,14 +37051,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_25);
+                        input.seek(index142_25);
                         if ( s>=0 ) return s;
                         break;
                     case 25 : 
-                        int LA147_26 = input.LA(1);
+                        int LA142_26 = input.LA(1);
 
                          
-                        int index147_26 = input.index();
+                        int index142_26 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38440,14 +37066,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_26);
+                        input.seek(index142_26);
                         if ( s>=0 ) return s;
                         break;
                     case 26 : 
-                        int LA147_27 = input.LA(1);
+                        int LA142_27 = input.LA(1);
 
                          
-                        int index147_27 = input.index();
+                        int index142_27 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38455,14 +37081,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_27);
+                        input.seek(index142_27);
                         if ( s>=0 ) return s;
                         break;
                     case 27 : 
-                        int LA147_28 = input.LA(1);
+                        int LA142_28 = input.LA(1);
 
                          
-                        int index147_28 = input.index();
+                        int index142_28 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38470,14 +37096,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_28);
+                        input.seek(index142_28);
                         if ( s>=0 ) return s;
                         break;
                     case 28 : 
-                        int LA147_29 = input.LA(1);
+                        int LA142_29 = input.LA(1);
 
                          
-                        int index147_29 = input.index();
+                        int index142_29 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38485,14 +37111,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_29);
+                        input.seek(index142_29);
                         if ( s>=0 ) return s;
                         break;
                     case 29 : 
-                        int LA147_30 = input.LA(1);
+                        int LA142_30 = input.LA(1);
 
                          
-                        int index147_30 = input.index();
+                        int index142_30 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38500,14 +37126,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_30);
+                        input.seek(index142_30);
                         if ( s>=0 ) return s;
                         break;
                     case 30 : 
-                        int LA147_31 = input.LA(1);
+                        int LA142_31 = input.LA(1);
 
                          
-                        int index147_31 = input.index();
+                        int index142_31 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38515,14 +37141,14 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_31);
+                        input.seek(index142_31);
                         if ( s>=0 ) return s;
                         break;
                     case 31 : 
-                        int LA147_32 = input.LA(1);
+                        int LA142_32 = input.LA(1);
 
                          
-                        int index147_32 = input.index();
+                        int index142_32 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalTableDSL()) ) {s = 77;}
@@ -38530,13 +37156,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index147_32);
+                        input.seek(index142_32);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 147, _s, input);
+                new NoViableAltException(getDescription(), 142, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -38544,11 +37170,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final String dfa_78s = "\117\uffff";
     static final String dfa_79s = "\1\2\116\uffff";
     static final String dfa_80s = "\1\4\1\0\115\uffff";
-    static final String dfa_81s = "\1\u00a5\1\0\115\uffff";
+    static final String dfa_81s = "\1\u00a2\1\0\115\uffff";
     static final String dfa_82s = "\2\uffff\1\2\113\uffff\1\1";
     static final String dfa_83s = "\1\uffff\1\0\115\uffff}>";
     static final String[] dfa_84s = {
-            "\2\2\1\uffff\3\2\6\uffff\2\2\2\uffff\1\2\71\uffff\1\2\17\uffff\6\2\1\uffff\1\2\1\uffff\3\2\1\uffff\10\2\1\1\27\2\1\uffff\30\2\1\uffff\1\2",
+            "\2\2\1\uffff\3\2\6\uffff\2\2\2\uffff\1\2\65\uffff\1\2\20\uffff\6\2\1\uffff\1\2\1\uffff\3\2\1\uffff\10\2\1\1\27\2\1\uffff\30\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -38637,11 +37263,11 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     static final short[] dfa_83 = DFA.unpackEncodedString(dfa_83s);
     static final short[][] dfa_84 = unpackEncodedStringArray(dfa_84s);
 
-    class DFA165 extends DFA {
+    class DFA160 extends DFA {
 
-        public DFA165(BaseRecognizer recognizer) {
+        public DFA160(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 165;
+            this.decisionNumber = 160;
             this.eot = dfa_78;
             this.eof = dfa_79;
             this.min = dfa_80;
@@ -38651,17 +37277,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_84;
         }
         public String getDescription() {
-            return "11130:3: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?";
+            return "10600:3: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA165_1 = input.LA(1);
+                        int LA160_1 = input.LA(1);
 
                          
-                        int index165_1 = input.index();
+                        int index160_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred50_InternalTableDSL()) ) {s = 78;}
@@ -38669,23 +37295,23 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index165_1);
+                        input.seek(index160_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 165, _s, input);
+                new NoViableAltException(getDescription(), 160, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA163 extends DFA {
+    class DFA158 extends DFA {
 
-        public DFA163(BaseRecognizer recognizer) {
+        public DFA158(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 163;
+            this.decisionNumber = 158;
             this.eot = dfa_78;
             this.eof = dfa_79;
             this.min = dfa_80;
@@ -38695,17 +37321,17 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
             this.transition = dfa_84;
         }
         public String getDescription() {
-            return "11224:5: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?";
+            return "10694:5: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA163_1 = input.LA(1);
+                        int LA158_1 = input.LA(1);
 
                          
-                        int index163_1 = input.index();
+                        int index158_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred52_InternalTableDSL()) ) {s = 78;}
@@ -38713,13 +37339,13 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index163_1);
+                        input.seek(index158_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 163, _s, input);
+                new NoViableAltException(getDescription(), 158, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -38735,134 +37361,133 @@ public class InternalTableDSLParser extends AbstractInternalAntlrParser {
     public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000180000L});
     public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000000020L});
     public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000100240000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000040200000L,0x0000000000000040L});
     public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000C00000L});
-    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x000000007F000002L});
-    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x000E000000000000L});
-    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000000380L});
-    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x00000000FF000002L});
-    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x00FF800000000000L});
-    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000400000002L});
-    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x000046F000000002L});
-    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000010000010000L});
-    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0700000000020000L});
-    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000028000000002L});
-    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x3C00000000020000L});
-    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000310000000002L});
-    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000000380L,0x0000000080000000L});
-    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000002000000000L,0x0000000000000078L});
-    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000000080L,0x0000000080000000L});
-    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x8000000000020000L});
-    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x01F0000000010000L});
-    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000200000002L,0x0000000000000007L});
-    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000800020000L});
-    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000004L});
-    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x00FF800000020000L});
-    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0001F00000000000L});
-    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x000000007C000002L,0x0000000000000300L});
-    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x000000007C000002L});
-    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001000L});
-    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000000000000L,0x00000000196E8000L});
-    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000020000L,0x0000000000000C00L});
-    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x000000003F000002L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0001C00000000000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x2000000000000000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x00000000BF000002L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x007FC00000000000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000237800000002L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000040000000000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000008000010000L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0380000000020000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000014000000002L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x1E00000000020000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000188000000002L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000000000380L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000000380L,0x0000000010000000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000001000000000L,0x000000000000003CL});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000000080L,0x0000000010000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x4000000000020000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x003E000000002000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x8000000100000002L,0x0000000000000003L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000400020000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000002L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x007FC00000020000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x00003E0000000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000000000000L,0x000000000396E800L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000000020000L,0x00000000000000C0L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001000L});
     public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010000L});
-    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000000080L,0x00000000C0000000L});
-    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
-    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000000000010000L,0x0000000000010000L});
-    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x3000000000020000L});
-    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x00000FC000000000L});
-    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000000000000010L,0x0000001200000000L});
-    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0000000000000010L,0x0000000400000000L});
-    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0000000000000010L,0x0000000800000000L});
-    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000000000000002L,0x0000002000000000L});
-    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000000000000002L,0x0000008000000000L});
-    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x00000000000103B0L,0x00081AC7C0000000L,0x00000005FF9C5040L});
-    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0000000000000000L,0x0000030000000000L});
-    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x0000000000000000L,0x0000020000000000L});
-    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x0000000000000000L,0x0000040000000000L});
-    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x00000000000103B0L,0x000818C7C0000000L,0x00000005FF9C5040L});
-    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x0000000000000000L,0x0000100000000000L});
-    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x00000000000103B0L,0x000838C7C0000000L,0x00000005FF9C5040L});
-    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0000000000000000L,0x0000210000000000L});
-    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x0000000000000002L,0x0000010000000000L});
-    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x0000000000000002L,0x001FC00000000000L});
-    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
-    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x0000000000000000L,0x0030000000000000L});
-    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x0000000000000000L,0x0020000000000000L});
-    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x0000000000000002L,0x0040000000000000L});
-    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x0000000000000002L,0x0080000000000000L});
-    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x0000000000000002L,0x0F00000000000000L});
-    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x0000000000000002L,0x1038000000000000L});
-    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0000000000000010L,0x0000008000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x0000000000000002L,0xE018000000000000L,0x0000000000000007L});
-    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x0000000000000000L,0x8000000000000000L});
-    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x0000000000000000L,0x0010000000000000L});
-    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x0000000000000002L,0x00000000C0000000L});
-    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x0000000000000002L,0x0000000800000000L,0x0000000000000038L});
-    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x0000000000100002L});
-    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000000000180L});
-    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L,0x0000000000000600L});
-    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x0000000000000010L,0x0000000700000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x0000000000000010L,0x0008000700000000L,0x0000000001800000L});
-    public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x0000000000000010L,0x0000008000000000L,0x0000001000000001L});
-    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0000000000000000L,0x0010010000000000L});
-    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x0000000000000002L,0x0000108000004000L,0x0000000000000600L});
-    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x00000000000103B0L,0x00081AC7C0000000L,0x00000005FF9C5841L});
-    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0000000000000002L,0x0000100000004000L,0x0000000000000600L});
-    public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x00000000000303B0L,0x000818C7C0000000L,0x00000005FF9C5040L});
-    public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x0000000000020000L,0x0000010000000000L});
-    public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x00000000000103B0L,0x000838C7C0000000L,0x00000005FFFC5841L});
-    public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000000000000000L,0x0000010000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x00000000000103B0L,0x000838C7C0000000L,0x00000005FFFC5040L});
-    public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x0000000000000000L,0x0000200000000000L});
-    public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x00000000000103B2L,0x000818E7C0000000L,0x00000005FFFC5040L});
-    public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x00000000000103B2L,0x000818C7C0000000L,0x00000005FFFC5040L});
-    public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0000000000000000L,0x0000008000000000L});
-    public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x00000000000103B0L,0x000818C7C0000000L,0x00000005FF9C5041L});
-    public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x0000000000020010L,0x0000018000000000L,0x0000000000038001L});
-    public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x0000000000020000L});
-    public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x0000000000000000L,0x0000010000000000L,0x0000000000028000L});
-    public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x0000000000000000L,0x0000010000000000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_112 = new BitSet(new long[]{0x00000000000103B0L,0x000818E7C0000000L,0x00000005FFFC5040L});
-    public static final BitSet FOLLOW_113 = new BitSet(new long[]{0x0000000000000000L,0x0000012000000000L});
-    public static final BitSet FOLLOW_114 = new BitSet(new long[]{0x00000000000103B0L,0x000818C7C0000000L,0x00000005FFFC5040L});
-    public static final BitSet FOLLOW_115 = new BitSet(new long[]{0x00000000000103B0L,0x000818E7C0000000L,0x00000005FF9C5040L});
-    public static final BitSet FOLLOW_116 = new BitSet(new long[]{0x0000000000000000L,0x0000002000000000L});
-    public static final BitSet FOLLOW_117 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_118 = new BitSet(new long[]{0x00000000000303B0L,0x000818C7C0000000L,0x00000005FFFC5040L});
-    public static final BitSet FOLLOW_119 = new BitSet(new long[]{0x00000000000303B0L,0x000818E7C0000000L,0x00000005FFFC5040L});
-    public static final BitSet FOLLOW_120 = new BitSet(new long[]{0x0000000000000002L,0x0000040000000000L});
-    public static final BitSet FOLLOW_121 = new BitSet(new long[]{0x0000000000000002L,0x0000108000000000L});
-    public static final BitSet FOLLOW_122 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
-    public static final BitSet FOLLOW_123 = new BitSet(new long[]{0x0000000000000002L,0x0008108000000000L});
-    public static final BitSet FOLLOW_124 = new BitSet(new long[]{0x0000000000000000L,0x0000120000000000L});
-    public static final BitSet FOLLOW_125 = new BitSet(new long[]{0x00000000000103B2L,0x000818C7C0000000L,0x00000005FF9C5040L});
-    public static final BitSet FOLLOW_126 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000A00000000L});
-    public static final BitSet FOLLOW_127 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000A00000000L});
-    public static final BitSet FOLLOW_128 = new BitSet(new long[]{0x0000000000000280L});
-    public static final BitSet FOLLOW_129 = new BitSet(new long[]{0x0000000000000010L,0x0000028000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_130 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_131 = new BitSet(new long[]{0x0000000000000002L,0x0008000000000000L});
-    public static final BitSet FOLLOW_132 = new BitSet(new long[]{0x0000000000000002L,0x0008000000004000L});
-    public static final BitSet FOLLOW_133 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000001800000L});
-    public static final BitSet FOLLOW_134 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000002000000000L});
-    public static final BitSet FOLLOW_135 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_136 = new BitSet(new long[]{0x0000000000000000L,0x0000000800000000L});
-    public static final BitSet FOLLOW_137 = new BitSet(new long[]{0x0000000000000002L,0x0000000100000000L});
-    public static final BitSet FOLLOW_138 = new BitSet(new long[]{0x0000000000000012L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000000000000080L,0x0000000018000000L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000000010000L,0x0000000000001000L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x1800000000020000L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x000001F800000000L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0000000000000010L,0x0000000240000000L});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000000000000010L,0x0000000080000000L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0000000000000010L,0x0000000100000000L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000000000000002L,0x0000001000000000L});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x00000000000103B0L,0x00010358F8000000L,0x00000000BFF38A08L});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000000000000000L,0x0000006000000000L});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0000000000000000L,0x0000004000000000L});
+    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x0000000000000000L,0x0000008000000000L});
+    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x00000000000103B0L,0x00010318F8000000L,0x00000000BFF38A08L});
+    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x0000000000000000L,0x0000020000000000L});
+    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x00000000000103B0L,0x00010718F8000000L,0x00000000BFF38A08L});
+    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x0000000000000000L,0x0000042000000000L});
+    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0000000000000002L,0x0000002000000000L});
+    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x0000000000000002L,0x0003F80000000000L});
+    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x0000000000000000L,0x0001000000000000L});
+    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x0000000000000000L,0x0006000000000000L});
+    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L});
+    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x0000000000000002L,0x0008000000000000L});
+    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x0000000000000002L,0x0010000000000000L});
+    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x0000000000000002L,0x01E0000000000000L});
+    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x0000000000000002L,0x0207000000000000L});
+    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x0000000000000010L,0x2000001000000000L});
+    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0000000000000002L,0xFC03000000000000L});
+    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x0000000000000000L,0x1000000000000000L});
+    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x0000000000000000L,0x0002000000000000L});
+    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x0000000000000000L,0x2001000000000000L});
+    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x0000000000000002L,0x0000000018000000L});
+    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x0000000000000002L,0x0000000100000000L,0x0000000000000007L});
+    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x0000000000100002L});
+    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000000000030L});
+    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L,0x00000000000000C0L});
+    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x0000000000000010L,0x00000000E0000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x0000000000000010L,0x00010000E0000000L,0x0000000000300000L});
+    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x0000000000000010L,0x2000001000000000L,0x0000000200000000L});
+    public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x0000000000000000L,0x0002002000000000L});
+    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0000000000000002L,0x0000021000000400L,0x00000000000000C0L});
+    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x00000000000103B0L,0x20010358F8000000L,0x00000000BFF38B08L});
+    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0000000000000002L,0x0000020000000400L,0x00000000000000C0L});
+    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x00000000000303B0L,0x00010318F8000000L,0x00000000BFF38A08L});
+    public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x0000000000020000L,0x0000002000000000L});
+    public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x00000000000103B0L,0x20010718F8000000L,0x00000000BFFF8B08L});
+    public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000000000000000L,0x0000002000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x00000000000103B0L,0x00010718F8000000L,0x00000000BFFF8A08L});
+    public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000000000000000L,0x0000040000000000L});
+    public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x00000000000103B2L,0x0001031CF8000000L,0x00000000BFFF8A08L});
+    public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x00000000000103B2L,0x00010318F8000000L,0x00000000BFFF8A08L});
+    public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x0000000000000000L,0x0000001000000000L});
+    public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x00000000000103B0L,0x20010318F8000000L,0x00000000BFF38A08L});
+    public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000001000L});
+    public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x0000000000020010L,0x2000003000000000L,0x0000000000007000L});
+    public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x0000000000020000L});
+    public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x0000000000000000L,0x0000002000000000L,0x0000000000005000L});
+    public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x0000000000000000L,0x0000002000000000L,0x0000000000001000L});
+    public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x00000000000103B0L,0x0001031CF8000000L,0x00000000BFFF8A08L});
+    public static final BitSet FOLLOW_112 = new BitSet(new long[]{0x0000000000000000L,0x0000002400000000L});
+    public static final BitSet FOLLOW_113 = new BitSet(new long[]{0x00000000000103B0L,0x00010318F8000000L,0x00000000BFFF8A08L});
+    public static final BitSet FOLLOW_114 = new BitSet(new long[]{0x00000000000103B0L,0x0001031CF8000000L,0x00000000BFF38A08L});
+    public static final BitSet FOLLOW_115 = new BitSet(new long[]{0x0000000000000000L,0x0000000400000000L});
+    public static final BitSet FOLLOW_116 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000010000L});
+    public static final BitSet FOLLOW_117 = new BitSet(new long[]{0x00000000000303B0L,0x00010318F8000000L,0x00000000BFFF8A08L});
+    public static final BitSet FOLLOW_118 = new BitSet(new long[]{0x00000000000303B0L,0x0001031CF8000000L,0x00000000BFFF8A08L});
+    public static final BitSet FOLLOW_119 = new BitSet(new long[]{0x0000000000000002L,0x0000008000000000L});
+    public static final BitSet FOLLOW_120 = new BitSet(new long[]{0x0000000000000002L,0x0000021000000000L});
+    public static final BitSet FOLLOW_121 = new BitSet(new long[]{0x0000000000000002L,0x0000020000000000L});
+    public static final BitSet FOLLOW_122 = new BitSet(new long[]{0x0000000000000002L,0x0001021000000000L});
+    public static final BitSet FOLLOW_123 = new BitSet(new long[]{0x0000000000000000L,0x0000024000000000L});
+    public static final BitSet FOLLOW_124 = new BitSet(new long[]{0x00000000000103B2L,0x00010318F8000000L,0x00000000BFF38A08L});
+    public static final BitSet FOLLOW_125 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000140000000L});
+    public static final BitSet FOLLOW_126 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000140000000L});
+    public static final BitSet FOLLOW_127 = new BitSet(new long[]{0x0000000000000280L});
+    public static final BitSet FOLLOW_128 = new BitSet(new long[]{0x0000000000000010L,0x2000005000000000L});
+    public static final BitSet FOLLOW_129 = new BitSet(new long[]{0x0000000000000000L,0x2000000000000000L});
+    public static final BitSet FOLLOW_130 = new BitSet(new long[]{0x0000000000000002L,0x0001000000000000L});
+    public static final BitSet FOLLOW_131 = new BitSet(new long[]{0x0000000000000002L,0x0001000000000400L});
+    public static final BitSet FOLLOW_132 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000000300000L});
+    public static final BitSet FOLLOW_133 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000400000000L});
+    public static final BitSet FOLLOW_134 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_135 = new BitSet(new long[]{0x0000000000000000L,0x0000000100000000L});
+    public static final BitSet FOLLOW_136 = new BitSet(new long[]{0x0000000000000002L,0x0000000020000000L});
+    public static final BitSet FOLLOW_137 = new BitSet(new long[]{0x0000000000000012L});
 
 }
diff --git a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/scoping/AbstractTableDSLScopeProvider.java b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/scoping/AbstractTableDSLScopeProvider.java
index 581c121..2e5d00a 100644
--- a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/scoping/AbstractTableDSLScopeProvider.java
+++ b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/scoping/AbstractTableDSLScopeProvider.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.scoping;
 
diff --git a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/serializer/TableDSLSemanticSequencer.java b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/serializer/TableDSLSemanticSequencer.java
index 5ee2e0a..90a7429 100644
--- a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/serializer/TableDSLSemanticSequencer.java
+++ b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/serializer/TableDSLSemanticSequencer.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.serializer;
 
@@ -11,6 +22,7 @@ import org.eclipse.osbp.infogrid.model.gridsource.CxGridNestedField;
 import org.eclipse.osbp.infogrid.model.gridsource.CxGridNestedPath;
 import org.eclipse.osbp.infogrid.model.gridsource.CxGridProperty;
 import org.eclipse.osbp.infogrid.model.gridsource.CxGridSourcePackage;
+import org.eclipse.osbp.infogrid.model.gridsource.style.CxGridPropBlobImageStyle;
 import org.eclipse.osbp.infogrid.model.gridsource.style.CxGridPropBooleanStyle;
 import org.eclipse.osbp.infogrid.model.gridsource.style.CxGridPropButtonStyle;
 import org.eclipse.osbp.infogrid.model.gridsource.style.CxGridPropDateStyle;
@@ -33,7 +45,6 @@ import org.eclipse.osbp.xtext.table.TableAggregation;
 import org.eclipse.osbp.xtext.table.TableAllColumns;
 import org.eclipse.osbp.xtext.table.TableAttribute;
 import org.eclipse.osbp.xtext.table.TableAxis;
-import org.eclipse.osbp.xtext.table.TableBean;
 import org.eclipse.osbp.xtext.table.TableCellColor;
 import org.eclipse.osbp.xtext.table.TableColumn;
 import org.eclipse.osbp.xtext.table.TableDSLPackage;
@@ -153,6 +164,9 @@ public class TableDSLSemanticSequencer extends OXtypeSemanticSequencer {
 			}
 		else if (epackage == CxGridStylePackage.eINSTANCE)
 			switch (semanticObject.eClass().getClassifierID()) {
+			case CxGridStylePackage.CX_GRID_PROP_BLOB_IMAGE_STYLE:
+				sequence_PropertyBlobImageStyle(context, (CxGridPropBlobImageStyle) semanticObject); 
+				return; 
 			case CxGridStylePackage.CX_GRID_PROP_BOOLEAN_STYLE:
 				sequence_PropertyBooleanStyle(context, (CxGridPropBooleanStyle) semanticObject); 
 				return; 
@@ -210,9 +224,6 @@ public class TableDSLSemanticSequencer extends OXtypeSemanticSequencer {
 			case TableDSLPackage.TABLE_AXIS:
 				sequence_TableAxis(context, (TableAxis) semanticObject); 
 				return; 
-			case TableDSLPackage.TABLE_BEAN:
-				sequence_TableBean(context, (TableBean) semanticObject); 
-				return; 
 			case TableDSLPackage.TABLE_CELL_COLOR:
 				sequence_TableCellColor(context, (TableCellColor) semanticObject); 
 				return; 
@@ -681,6 +692,19 @@ public class TableDSLSemanticSequencer extends OXtypeSemanticSequencer {
 	
 	/**
 	 * Contexts:
+	 *     PropertyStyle returns CxGridPropBlobImageStyle
+	 *     PropertyBlobImageStyle returns CxGridPropBlobImageStyle
+	 *
+	 * Constraint:
+	 *     {CxGridPropBlobImageStyle}
+	 */
+	protected void sequence_PropertyBlobImageStyle(ISerializationContext context, CxGridPropBlobImageStyle semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
 	 *     PropertyStyle returns CxGridPropBooleanStyle
 	 *     PropertyBooleanStyle returns CxGridPropBooleanStyle
 	 *
@@ -939,32 +963,6 @@ public class TableDSLSemanticSequencer extends OXtypeSemanticSequencer {
 	
 	/**
 	 * Contexts:
-	 *     TableOption returns TableBean
-	 *     TableBean returns TableBean
-	 *
-	 * Constraint:
-	 *     (
-	 *         (
-	 *             (
-	 *                 selectalways?='alwaysSelected' | 
-	 *                 selectById?='selectById' | 
-	 *                 headerMode=RowHeaderMode | 
-	 *                 filtering?='filtering' | 
-	 *                 embedded?='embedded' | 
-	 *                 toolbar=[ActionToolbar|ID]
-	 *             )? 
-	 *             (polling?='polling' pollingTime=Number)?
-	 *         )+ 
-	 *         source=TableDatamart?
-	 *     )
-	 */
-	protected void sequence_TableBean(ISerializationContext context, TableBean semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-	
-	
-	/**
-	 * Contexts:
 	 *     TableRangeElement returns TableCellColor
 	 *     TableCellColor returns TableCellColor
 	 *
@@ -1130,15 +1128,16 @@ public class TableDSLSemanticSequencer extends OXtypeSemanticSequencer {
 	 *     TableGrid returns TableGrid
 	 *
 	 * Constraint:
-	 *     (
-	 *         (selectalways?='selectalways' | headerMode=RowHeaderMode)* 
-	 *         embedded?='embedded'? 
-	 *         (((polling?='polling' pollingTime=Number) | filtering?='filtering' | toolbar=[ActionToolbar|ID])? embedded?='embedded'?)* 
-	 *         source=TableDtoDatasource?
-	 *     )
+	 *     source=TableDtoDatasource
 	 */
 	protected void sequence_TableGrid(ISerializationContext context, TableGrid semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, TableDSLPackage.Literals.TABLE_GRID__SOURCE) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, TableDSLPackage.Literals.TABLE_GRID__SOURCE));
+		}
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getTableGridAccess().getSourceTableDtoDatasourceParserRuleCall_3_0(), semanticObject.getSource());
+		feeder.finish();
 	}
 	
 	
@@ -1362,10 +1361,7 @@ public class TableDSLSemanticSequencer extends OXtypeSemanticSequencer {
 	 * Constraint:
 	 *     (
 	 *         multiSelection?='multiple'? 
-	 *         (
-	 *             (selectalways?='alwaysSelected' | headerMode=RowHeaderMode | filtering?='filtering' | embedded?='embedded' | toolbar=[ActionToolbar|ID])? 
-	 *             (polling?='polling' pollingTime=Number)?
-	 *         )+ 
+	 *         (selectalways?='alwaysSelected' | headerMode=RowHeaderMode | filtering?='filtering' | embedded?='embedded' | toolbar=[ActionToolbar|ID])* 
 	 *         source=TableDatamart?
 	 *     )
 	 */
@@ -1404,16 +1400,13 @@ public class TableDSLSemanticSequencer extends OXtypeSemanticSequencer {
 	 * Constraint:
 	 *     (
 	 *         (
-	 *             (
-	 *                 selectalways?='alwaysSelected' | 
-	 *                 selectById?='selectById' | 
-	 *                 headerMode=RowHeaderMode | 
-	 *                 filtering?='filtering' | 
-	 *                 embedded?='embedded' | 
-	 *                 toolbar=[ActionToolbar|ID]
-	 *             )? 
-	 *             (polling?='polling' pollingTime=Number)?
-	 *         )+ 
+	 *             selectalways?='alwaysSelected' | 
+	 *             selectById?='selectById' | 
+	 *             headerMode=RowHeaderMode | 
+	 *             filtering?='filtering' | 
+	 *             embedded?='embedded' | 
+	 *             toolbar=[ActionToolbar|ID]
+	 *         )* 
 	 *         source=TableDatamart?
 	 *     )
 	 */
diff --git a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/serializer/TableDSLSyntacticSequencer.java b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/serializer/TableDSLSyntacticSequencer.java
index 7c70413..2dd2d55 100644
--- a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/serializer/TableDSLSyntacticSequencer.java
+++ b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/serializer/TableDSLSyntacticSequencer.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.serializer;
 
diff --git a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/services/TableDSLGrammarAccess.java b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/services/TableDSLGrammarAccess.java
index e1cee54..6e9a1c5 100644
--- a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/services/TableDSLGrammarAccess.java
+++ b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/services/TableDSLGrammarAccess.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.services;
 
@@ -172,13 +183,12 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cTableSelectionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cTableTableParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		private final RuleCall cTableGridParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
-		private final RuleCall cTableBeanParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3);
 		
 		//TableOption:
-		//	TableSelection | TableTable | TableGrid | TableBean;
+		//	TableSelection | TableTable | TableGrid;
 		@Override public ParserRule getRule() { return rule; }
 		
-		//TableSelection | TableTable | TableGrid | TableBean
+		//TableSelection | TableTable | TableGrid
 		public Alternatives getAlternatives() { return cAlternatives; }
 		
 		//TableSelection
@@ -189,9 +199,6 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//TableGrid
 		public RuleCall getTableGridParserRuleCall_2() { return cTableGridParserRuleCall_2; }
-		
-		//TableBean
-		public RuleCall getTableBeanParserRuleCall_3() { return cTableBeanParserRuleCall_3; }
 	}
 	public class TableSelectionElements extends AbstractParserRuleElementFinder {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.osbp.xtext.table.TableDSL.TableSelection");
@@ -209,20 +216,15 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRowHeaderKeyword_3_1_0 = (Keyword)cGroup_3_1.eContents().get(0);
 		private final Assignment cHeaderModeAssignment_3_1_1 = (Assignment)cGroup_3_1.eContents().get(1);
 		private final RuleCall cHeaderModeRowHeaderModeEnumRuleCall_3_1_1_0 = (RuleCall)cHeaderModeAssignment_3_1_1.eContents().get(0);
-		private final Group cGroup_3_2 = (Group)cUnorderedGroup_3.eContents().get(2);
-		private final Assignment cPollingAssignment_3_2_0 = (Assignment)cGroup_3_2.eContents().get(0);
-		private final Keyword cPollingPollingKeyword_3_2_0_0 = (Keyword)cPollingAssignment_3_2_0.eContents().get(0);
-		private final Assignment cPollingTimeAssignment_3_2_1 = (Assignment)cGroup_3_2.eContents().get(1);
-		private final RuleCall cPollingTimeNumberParserRuleCall_3_2_1_0 = (RuleCall)cPollingTimeAssignment_3_2_1.eContents().get(0);
-		private final Assignment cFilteringAssignment_3_3 = (Assignment)cUnorderedGroup_3.eContents().get(3);
-		private final Keyword cFilteringFilteringKeyword_3_3_0 = (Keyword)cFilteringAssignment_3_3.eContents().get(0);
-		private final Assignment cEmbeddedAssignment_3_4 = (Assignment)cUnorderedGroup_3.eContents().get(4);
-		private final Keyword cEmbeddedEmbeddedKeyword_3_4_0 = (Keyword)cEmbeddedAssignment_3_4.eContents().get(0);
-		private final Group cGroup_3_5 = (Group)cUnorderedGroup_3.eContents().get(5);
-		private final Keyword cToolbarKeyword_3_5_0 = (Keyword)cGroup_3_5.eContents().get(0);
-		private final Assignment cToolbarAssignment_3_5_1 = (Assignment)cGroup_3_5.eContents().get(1);
-		private final CrossReference cToolbarActionToolbarCrossReference_3_5_1_0 = (CrossReference)cToolbarAssignment_3_5_1.eContents().get(0);
-		private final RuleCall cToolbarActionToolbarIDTerminalRuleCall_3_5_1_0_1 = (RuleCall)cToolbarActionToolbarCrossReference_3_5_1_0.eContents().get(1);
+		private final Assignment cFilteringAssignment_3_2 = (Assignment)cUnorderedGroup_3.eContents().get(2);
+		private final Keyword cFilteringFilteringKeyword_3_2_0 = (Keyword)cFilteringAssignment_3_2.eContents().get(0);
+		private final Assignment cEmbeddedAssignment_3_3 = (Assignment)cUnorderedGroup_3.eContents().get(3);
+		private final Keyword cEmbeddedEmbeddedKeyword_3_3_0 = (Keyword)cEmbeddedAssignment_3_3.eContents().get(0);
+		private final Group cGroup_3_4 = (Group)cUnorderedGroup_3.eContents().get(4);
+		private final Keyword cToolbarKeyword_3_4_0 = (Keyword)cGroup_3_4.eContents().get(0);
+		private final Assignment cToolbarAssignment_3_4_1 = (Assignment)cGroup_3_4.eContents().get(1);
+		private final CrossReference cToolbarActionToolbarCrossReference_3_4_1_0 = (CrossReference)cToolbarAssignment_3_4_1.eContents().get(0);
+		private final RuleCall cToolbarActionToolbarIDTerminalRuleCall_3_4_1_0_1 = (RuleCall)cToolbarActionToolbarCrossReference_3_4_1_0.eContents().get(1);
 		private final Group cGroup_4 = (Group)cGroup.eContents().get(4);
 		private final Keyword cUsingKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);
 		private final Assignment cSourceAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);
@@ -230,13 +232,13 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		
 		//TableSelection:
 		//	{TableSelection} 'selection' (multiSelection?='multiple' | 'single') (selectalways?='alwaysSelected'? & ('rowHeader'
-		//	headerMode=RowHeaderMode)? & (polling?='polling' pollingTime=Number)? & filtering?='filtering'? &
-		//	embedded?='embedded'? & ('toolbar' toolbar=[action::ActionToolbar])?) ('using' source=TableDatamart)?;
+		//	headerMode=RowHeaderMode)? & filtering?='filtering'? & embedded?='embedded'? & ('toolbar'
+		//	toolbar=[action::ActionToolbar])?) ('using' source=TableDatamart)?;
 		@Override public ParserRule getRule() { return rule; }
 		
 		//{TableSelection} 'selection' (multiSelection?='multiple' | 'single') (selectalways?='alwaysSelected'? & ('rowHeader'
-		//headerMode=RowHeaderMode)? & (polling?='polling' pollingTime=Number)? & filtering?='filtering'? & embedded?='embedded'?
-		//& ('toolbar' toolbar=[action::ActionToolbar])?) ('using' source=TableDatamart)?
+		//headerMode=RowHeaderMode)? & filtering?='filtering'? & embedded?='embedded'? & ('toolbar'
+		//toolbar=[action::ActionToolbar])?) ('using' source=TableDatamart)?
 		public Group getGroup() { return cGroup; }
 		
 		//{TableSelection}
@@ -257,8 +259,8 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		//'single'
 		public Keyword getSingleKeyword_2_1() { return cSingleKeyword_2_1; }
 		
-		//selectalways?='alwaysSelected'? & ('rowHeader' headerMode=RowHeaderMode)? & (polling?='polling' pollingTime=Number)? &
-		//filtering?='filtering'? & embedded?='embedded'? & ('toolbar' toolbar=[action::ActionToolbar])?
+		//selectalways?='alwaysSelected'? & ('rowHeader' headerMode=RowHeaderMode)? & filtering?='filtering'? &
+		//embedded?='embedded'? & ('toolbar' toolbar=[action::ActionToolbar])?
 		public UnorderedGroup getUnorderedGroup_3() { return cUnorderedGroup_3; }
 		
 		//selectalways?='alwaysSelected'?
@@ -279,47 +281,32 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		//RowHeaderMode
 		public RuleCall getHeaderModeRowHeaderModeEnumRuleCall_3_1_1_0() { return cHeaderModeRowHeaderModeEnumRuleCall_3_1_1_0; }
 		
-		//(polling?='polling' pollingTime=Number)?
-		public Group getGroup_3_2() { return cGroup_3_2; }
-		
-		//polling?='polling'
-		public Assignment getPollingAssignment_3_2_0() { return cPollingAssignment_3_2_0; }
-		
-		//'polling'
-		public Keyword getPollingPollingKeyword_3_2_0_0() { return cPollingPollingKeyword_3_2_0_0; }
-		
-		//pollingTime=Number
-		public Assignment getPollingTimeAssignment_3_2_1() { return cPollingTimeAssignment_3_2_1; }
-		
-		//Number
-		public RuleCall getPollingTimeNumberParserRuleCall_3_2_1_0() { return cPollingTimeNumberParserRuleCall_3_2_1_0; }
-		
 		//filtering?='filtering'?
-		public Assignment getFilteringAssignment_3_3() { return cFilteringAssignment_3_3; }
+		public Assignment getFilteringAssignment_3_2() { return cFilteringAssignment_3_2; }
 		
 		//'filtering'
-		public Keyword getFilteringFilteringKeyword_3_3_0() { return cFilteringFilteringKeyword_3_3_0; }
+		public Keyword getFilteringFilteringKeyword_3_2_0() { return cFilteringFilteringKeyword_3_2_0; }
 		
 		//embedded?='embedded'?
-		public Assignment getEmbeddedAssignment_3_4() { return cEmbeddedAssignment_3_4; }
+		public Assignment getEmbeddedAssignment_3_3() { return cEmbeddedAssignment_3_3; }
 		
 		//'embedded'
-		public Keyword getEmbeddedEmbeddedKeyword_3_4_0() { return cEmbeddedEmbeddedKeyword_3_4_0; }
+		public Keyword getEmbeddedEmbeddedKeyword_3_3_0() { return cEmbeddedEmbeddedKeyword_3_3_0; }
 		
 		//('toolbar' toolbar=[action::ActionToolbar])?
-		public Group getGroup_3_5() { return cGroup_3_5; }
+		public Group getGroup_3_4() { return cGroup_3_4; }
 		
 		//'toolbar'
-		public Keyword getToolbarKeyword_3_5_0() { return cToolbarKeyword_3_5_0; }
+		public Keyword getToolbarKeyword_3_4_0() { return cToolbarKeyword_3_4_0; }
 		
 		//toolbar=[action::ActionToolbar]
-		public Assignment getToolbarAssignment_3_5_1() { return cToolbarAssignment_3_5_1; }
+		public Assignment getToolbarAssignment_3_4_1() { return cToolbarAssignment_3_4_1; }
 		
 		//[action::ActionToolbar]
-		public CrossReference getToolbarActionToolbarCrossReference_3_5_1_0() { return cToolbarActionToolbarCrossReference_3_5_1_0; }
+		public CrossReference getToolbarActionToolbarCrossReference_3_4_1_0() { return cToolbarActionToolbarCrossReference_3_4_1_0; }
 		
 		//ID
-		public RuleCall getToolbarActionToolbarIDTerminalRuleCall_3_5_1_0_1() { return cToolbarActionToolbarIDTerminalRuleCall_3_5_1_0_1; }
+		public RuleCall getToolbarActionToolbarIDTerminalRuleCall_3_4_1_0_1() { return cToolbarActionToolbarIDTerminalRuleCall_3_4_1_0_1; }
 		
 		//('using' source=TableDatamart)?
 		public Group getGroup_4() { return cGroup_4; }
@@ -337,7 +324,7 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.osbp.xtext.table.TableDSL.TableTable");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cTableTableAction_0 = (Action)cGroup.eContents().get(0);
-		private final Keyword cTableKeyword_1 = (Keyword)cGroup.eContents().get(1);
+		private final Keyword cReadOnlyKeyword_1 = (Keyword)cGroup.eContents().get(1);
 		private final UnorderedGroup cUnorderedGroup_2 = (UnorderedGroup)cGroup.eContents().get(2);
 		private final Assignment cSelectalwaysAssignment_2_0 = (Assignment)cUnorderedGroup_2.eContents().get(0);
 		private final Keyword cSelectalwaysAlwaysSelectedKeyword_2_0_0 = (Keyword)cSelectalwaysAssignment_2_0.eContents().get(0);
@@ -347,178 +334,39 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRowHeaderKeyword_2_2_0 = (Keyword)cGroup_2_2.eContents().get(0);
 		private final Assignment cHeaderModeAssignment_2_2_1 = (Assignment)cGroup_2_2.eContents().get(1);
 		private final RuleCall cHeaderModeRowHeaderModeEnumRuleCall_2_2_1_0 = (RuleCall)cHeaderModeAssignment_2_2_1.eContents().get(0);
-		private final Group cGroup_2_3 = (Group)cUnorderedGroup_2.eContents().get(3);
-		private final Assignment cPollingAssignment_2_3_0 = (Assignment)cGroup_2_3.eContents().get(0);
-		private final Keyword cPollingPollingKeyword_2_3_0_0 = (Keyword)cPollingAssignment_2_3_0.eContents().get(0);
-		private final Assignment cPollingTimeAssignment_2_3_1 = (Assignment)cGroup_2_3.eContents().get(1);
-		private final RuleCall cPollingTimeNumberParserRuleCall_2_3_1_0 = (RuleCall)cPollingTimeAssignment_2_3_1.eContents().get(0);
-		private final Assignment cFilteringAssignment_2_4 = (Assignment)cUnorderedGroup_2.eContents().get(4);
-		private final Keyword cFilteringFilteringKeyword_2_4_0 = (Keyword)cFilteringAssignment_2_4.eContents().get(0);
-		private final Assignment cEmbeddedAssignment_2_5 = (Assignment)cUnorderedGroup_2.eContents().get(5);
-		private final Keyword cEmbeddedEmbeddedKeyword_2_5_0 = (Keyword)cEmbeddedAssignment_2_5.eContents().get(0);
-		private final Group cGroup_2_6 = (Group)cUnorderedGroup_2.eContents().get(6);
-		private final Keyword cToolbarKeyword_2_6_0 = (Keyword)cGroup_2_6.eContents().get(0);
-		private final Assignment cToolbarAssignment_2_6_1 = (Assignment)cGroup_2_6.eContents().get(1);
-		private final CrossReference cToolbarActionToolbarCrossReference_2_6_1_0 = (CrossReference)cToolbarAssignment_2_6_1.eContents().get(0);
-		private final RuleCall cToolbarActionToolbarIDTerminalRuleCall_2_6_1_0_1 = (RuleCall)cToolbarActionToolbarCrossReference_2_6_1_0.eContents().get(1);
+		private final Assignment cFilteringAssignment_2_3 = (Assignment)cUnorderedGroup_2.eContents().get(3);
+		private final Keyword cFilteringFilteringKeyword_2_3_0 = (Keyword)cFilteringAssignment_2_3.eContents().get(0);
+		private final Assignment cEmbeddedAssignment_2_4 = (Assignment)cUnorderedGroup_2.eContents().get(4);
+		private final Keyword cEmbeddedEmbeddedKeyword_2_4_0 = (Keyword)cEmbeddedAssignment_2_4.eContents().get(0);
+		private final Group cGroup_2_5 = (Group)cUnorderedGroup_2.eContents().get(5);
+		private final Keyword cToolbarKeyword_2_5_0 = (Keyword)cGroup_2_5.eContents().get(0);
+		private final Assignment cToolbarAssignment_2_5_1 = (Assignment)cGroup_2_5.eContents().get(1);
+		private final CrossReference cToolbarActionToolbarCrossReference_2_5_1_0 = (CrossReference)cToolbarAssignment_2_5_1.eContents().get(0);
+		private final RuleCall cToolbarActionToolbarIDTerminalRuleCall_2_5_1_0_1 = (RuleCall)cToolbarActionToolbarCrossReference_2_5_1_0.eContents().get(1);
 		private final Group cGroup_3 = (Group)cGroup.eContents().get(3);
 		private final Keyword cUsingKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);
 		private final Assignment cSourceAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);
 		private final RuleCall cSourceTableDatamartParserRuleCall_3_1_0 = (RuleCall)cSourceAssignment_3_1.eContents().get(0);
 		
 		//TableTable:
-		//	{TableTable} 'table' (selectalways?='alwaysSelected'? & selectById?='selectById'? & ('rowHeader'
-		//	headerMode=RowHeaderMode)? & (polling?='polling' pollingTime=Number)? & filtering?='filtering'? &
-		//	embedded?='embedded'? & ('toolbar' toolbar=[action::ActionToolbar])?) ('using' source=TableDatamart)?;
+		//	{TableTable} 'readOnly' (selectalways?='alwaysSelected'? & selectById?='selectById'? & ('rowHeader'
+		//	headerMode=RowHeaderMode)? & filtering?='filtering'? & embedded?='embedded'? & ('toolbar'
+		//	toolbar=[action::ActionToolbar])?) ('using' source=TableDatamart)?;
 		@Override public ParserRule getRule() { return rule; }
 		
-		//{TableTable} 'table' (selectalways?='alwaysSelected'? & selectById?='selectById'? & ('rowHeader'
-		//headerMode=RowHeaderMode)? & (polling?='polling' pollingTime=Number)? & filtering?='filtering'? & embedded?='embedded'?
-		//& ('toolbar' toolbar=[action::ActionToolbar])?) ('using' source=TableDatamart)?
+		//{TableTable} 'readOnly' (selectalways?='alwaysSelected'? & selectById?='selectById'? & ('rowHeader'
+		//headerMode=RowHeaderMode)? & filtering?='filtering'? & embedded?='embedded'? & ('toolbar'
+		//toolbar=[action::ActionToolbar])?) ('using' source=TableDatamart)?
 		public Group getGroup() { return cGroup; }
 		
 		//{TableTable}
 		public Action getTableTableAction_0() { return cTableTableAction_0; }
 		
-		//'table'
-		public Keyword getTableKeyword_1() { return cTableKeyword_1; }
+		//'readOnly'
+		public Keyword getReadOnlyKeyword_1() { return cReadOnlyKeyword_1; }
 		
 		//selectalways?='alwaysSelected'? & selectById?='selectById'? & ('rowHeader' headerMode=RowHeaderMode)? &
-		//(polling?='polling' pollingTime=Number)? & filtering?='filtering'? & embedded?='embedded'? & ('toolbar'
-		//toolbar=[action::ActionToolbar])?
-		public UnorderedGroup getUnorderedGroup_2() { return cUnorderedGroup_2; }
-		
-		//selectalways?='alwaysSelected'?
-		public Assignment getSelectalwaysAssignment_2_0() { return cSelectalwaysAssignment_2_0; }
-		
-		//'alwaysSelected'
-		public Keyword getSelectalwaysAlwaysSelectedKeyword_2_0_0() { return cSelectalwaysAlwaysSelectedKeyword_2_0_0; }
-		
-		//selectById?='selectById'?
-		public Assignment getSelectByIdAssignment_2_1() { return cSelectByIdAssignment_2_1; }
-		
-		//'selectById'
-		public Keyword getSelectByIdSelectByIdKeyword_2_1_0() { return cSelectByIdSelectByIdKeyword_2_1_0; }
-		
-		//('rowHeader' headerMode=RowHeaderMode)?
-		public Group getGroup_2_2() { return cGroup_2_2; }
-		
-		//'rowHeader'
-		public Keyword getRowHeaderKeyword_2_2_0() { return cRowHeaderKeyword_2_2_0; }
-		
-		//headerMode=RowHeaderMode
-		public Assignment getHeaderModeAssignment_2_2_1() { return cHeaderModeAssignment_2_2_1; }
-		
-		//RowHeaderMode
-		public RuleCall getHeaderModeRowHeaderModeEnumRuleCall_2_2_1_0() { return cHeaderModeRowHeaderModeEnumRuleCall_2_2_1_0; }
-		
-		//(polling?='polling' pollingTime=Number)?
-		public Group getGroup_2_3() { return cGroup_2_3; }
-		
-		//polling?='polling'
-		public Assignment getPollingAssignment_2_3_0() { return cPollingAssignment_2_3_0; }
-		
-		//'polling'
-		public Keyword getPollingPollingKeyword_2_3_0_0() { return cPollingPollingKeyword_2_3_0_0; }
-		
-		//pollingTime=Number
-		public Assignment getPollingTimeAssignment_2_3_1() { return cPollingTimeAssignment_2_3_1; }
-		
-		//Number
-		public RuleCall getPollingTimeNumberParserRuleCall_2_3_1_0() { return cPollingTimeNumberParserRuleCall_2_3_1_0; }
-		
-		//filtering?='filtering'?
-		public Assignment getFilteringAssignment_2_4() { return cFilteringAssignment_2_4; }
-		
-		//'filtering'
-		public Keyword getFilteringFilteringKeyword_2_4_0() { return cFilteringFilteringKeyword_2_4_0; }
-		
-		//embedded?='embedded'?
-		public Assignment getEmbeddedAssignment_2_5() { return cEmbeddedAssignment_2_5; }
-		
-		//'embedded'
-		public Keyword getEmbeddedEmbeddedKeyword_2_5_0() { return cEmbeddedEmbeddedKeyword_2_5_0; }
-		
-		//('toolbar' toolbar=[action::ActionToolbar])?
-		public Group getGroup_2_6() { return cGroup_2_6; }
-		
-		//'toolbar'
-		public Keyword getToolbarKeyword_2_6_0() { return cToolbarKeyword_2_6_0; }
-		
-		//toolbar=[action::ActionToolbar]
-		public Assignment getToolbarAssignment_2_6_1() { return cToolbarAssignment_2_6_1; }
-		
-		//[action::ActionToolbar]
-		public CrossReference getToolbarActionToolbarCrossReference_2_6_1_0() { return cToolbarActionToolbarCrossReference_2_6_1_0; }
-		
-		//ID
-		public RuleCall getToolbarActionToolbarIDTerminalRuleCall_2_6_1_0_1() { return cToolbarActionToolbarIDTerminalRuleCall_2_6_1_0_1; }
-		
-		//('using' source=TableDatamart)?
-		public Group getGroup_3() { return cGroup_3; }
-		
-		//'using'
-		public Keyword getUsingKeyword_3_0() { return cUsingKeyword_3_0; }
-		
-		//source=TableDatamart
-		public Assignment getSourceAssignment_3_1() { return cSourceAssignment_3_1; }
-		
-		//TableDatamart
-		public RuleCall getSourceTableDatamartParserRuleCall_3_1_0() { return cSourceTableDatamartParserRuleCall_3_1_0; }
-	}
-	public class TableBeanElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.osbp.xtext.table.TableDSL.TableBean");
-		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Action cTableBeanAction_0 = (Action)cGroup.eContents().get(0);
-		private final Keyword cBeanKeyword_1 = (Keyword)cGroup.eContents().get(1);
-		private final UnorderedGroup cUnorderedGroup_2 = (UnorderedGroup)cGroup.eContents().get(2);
-		private final Assignment cSelectalwaysAssignment_2_0 = (Assignment)cUnorderedGroup_2.eContents().get(0);
-		private final Keyword cSelectalwaysAlwaysSelectedKeyword_2_0_0 = (Keyword)cSelectalwaysAssignment_2_0.eContents().get(0);
-		private final Assignment cSelectByIdAssignment_2_1 = (Assignment)cUnorderedGroup_2.eContents().get(1);
-		private final Keyword cSelectByIdSelectByIdKeyword_2_1_0 = (Keyword)cSelectByIdAssignment_2_1.eContents().get(0);
-		private final Group cGroup_2_2 = (Group)cUnorderedGroup_2.eContents().get(2);
-		private final Keyword cRowHeaderKeyword_2_2_0 = (Keyword)cGroup_2_2.eContents().get(0);
-		private final Assignment cHeaderModeAssignment_2_2_1 = (Assignment)cGroup_2_2.eContents().get(1);
-		private final RuleCall cHeaderModeRowHeaderModeEnumRuleCall_2_2_1_0 = (RuleCall)cHeaderModeAssignment_2_2_1.eContents().get(0);
-		private final Group cGroup_2_3 = (Group)cUnorderedGroup_2.eContents().get(3);
-		private final Assignment cPollingAssignment_2_3_0 = (Assignment)cGroup_2_3.eContents().get(0);
-		private final Keyword cPollingPollingKeyword_2_3_0_0 = (Keyword)cPollingAssignment_2_3_0.eContents().get(0);
-		private final Assignment cPollingTimeAssignment_2_3_1 = (Assignment)cGroup_2_3.eContents().get(1);
-		private final RuleCall cPollingTimeNumberParserRuleCall_2_3_1_0 = (RuleCall)cPollingTimeAssignment_2_3_1.eContents().get(0);
-		private final Assignment cFilteringAssignment_2_4 = (Assignment)cUnorderedGroup_2.eContents().get(4);
-		private final Keyword cFilteringFilteringKeyword_2_4_0 = (Keyword)cFilteringAssignment_2_4.eContents().get(0);
-		private final Assignment cEmbeddedAssignment_2_5 = (Assignment)cUnorderedGroup_2.eContents().get(5);
-		private final Keyword cEmbeddedEmbeddedKeyword_2_5_0 = (Keyword)cEmbeddedAssignment_2_5.eContents().get(0);
-		private final Group cGroup_2_6 = (Group)cUnorderedGroup_2.eContents().get(6);
-		private final Keyword cToolbarKeyword_2_6_0 = (Keyword)cGroup_2_6.eContents().get(0);
-		private final Assignment cToolbarAssignment_2_6_1 = (Assignment)cGroup_2_6.eContents().get(1);
-		private final CrossReference cToolbarActionToolbarCrossReference_2_6_1_0 = (CrossReference)cToolbarAssignment_2_6_1.eContents().get(0);
-		private final RuleCall cToolbarActionToolbarIDTerminalRuleCall_2_6_1_0_1 = (RuleCall)cToolbarActionToolbarCrossReference_2_6_1_0.eContents().get(1);
-		private final Group cGroup_3 = (Group)cGroup.eContents().get(3);
-		private final Keyword cUsingKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);
-		private final Assignment cSourceAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);
-		private final RuleCall cSourceTableDatamartParserRuleCall_3_1_0 = (RuleCall)cSourceAssignment_3_1.eContents().get(0);
-		
-		//TableBean:
-		//	{TableBean} 'bean' (selectalways?='alwaysSelected'? & selectById?='selectById'? & ('rowHeader'
-		//	headerMode=RowHeaderMode)? & (polling?='polling' pollingTime=Number)? & filtering?='filtering'? &
-		//	embedded?='embedded'? & ('toolbar' toolbar=[action::ActionToolbar])?) ('using' source=TableDatamart)?;
-		@Override public ParserRule getRule() { return rule; }
-		
-		//{TableBean} 'bean' (selectalways?='alwaysSelected'? & selectById?='selectById'? & ('rowHeader'
-		//headerMode=RowHeaderMode)? & (polling?='polling' pollingTime=Number)? & filtering?='filtering'? & embedded?='embedded'?
-		//& ('toolbar' toolbar=[action::ActionToolbar])?) ('using' source=TableDatamart)?
-		public Group getGroup() { return cGroup; }
-		
-		//{TableBean}
-		public Action getTableBeanAction_0() { return cTableBeanAction_0; }
-		
-		//'bean'
-		public Keyword getBeanKeyword_1() { return cBeanKeyword_1; }
-		
-		//selectalways?='alwaysSelected'? & selectById?='selectById'? & ('rowHeader' headerMode=RowHeaderMode)? &
-		//(polling?='polling' pollingTime=Number)? & filtering?='filtering'? & embedded?='embedded'? & ('toolbar'
-		//toolbar=[action::ActionToolbar])?
+		//filtering?='filtering'? & embedded?='embedded'? & ('toolbar' toolbar=[action::ActionToolbar])?
 		public UnorderedGroup getUnorderedGroup_2() { return cUnorderedGroup_2; }
 		
 		//selectalways?='alwaysSelected'?
@@ -545,47 +393,32 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		//RowHeaderMode
 		public RuleCall getHeaderModeRowHeaderModeEnumRuleCall_2_2_1_0() { return cHeaderModeRowHeaderModeEnumRuleCall_2_2_1_0; }
 		
-		//(polling?='polling' pollingTime=Number)?
-		public Group getGroup_2_3() { return cGroup_2_3; }
-		
-		//polling?='polling'
-		public Assignment getPollingAssignment_2_3_0() { return cPollingAssignment_2_3_0; }
-		
-		//'polling'
-		public Keyword getPollingPollingKeyword_2_3_0_0() { return cPollingPollingKeyword_2_3_0_0; }
-		
-		//pollingTime=Number
-		public Assignment getPollingTimeAssignment_2_3_1() { return cPollingTimeAssignment_2_3_1; }
-		
-		//Number
-		public RuleCall getPollingTimeNumberParserRuleCall_2_3_1_0() { return cPollingTimeNumberParserRuleCall_2_3_1_0; }
-		
 		//filtering?='filtering'?
-		public Assignment getFilteringAssignment_2_4() { return cFilteringAssignment_2_4; }
+		public Assignment getFilteringAssignment_2_3() { return cFilteringAssignment_2_3; }
 		
 		//'filtering'
-		public Keyword getFilteringFilteringKeyword_2_4_0() { return cFilteringFilteringKeyword_2_4_0; }
+		public Keyword getFilteringFilteringKeyword_2_3_0() { return cFilteringFilteringKeyword_2_3_0; }
 		
 		//embedded?='embedded'?
-		public Assignment getEmbeddedAssignment_2_5() { return cEmbeddedAssignment_2_5; }
+		public Assignment getEmbeddedAssignment_2_4() { return cEmbeddedAssignment_2_4; }
 		
 		//'embedded'
-		public Keyword getEmbeddedEmbeddedKeyword_2_5_0() { return cEmbeddedEmbeddedKeyword_2_5_0; }
+		public Keyword getEmbeddedEmbeddedKeyword_2_4_0() { return cEmbeddedEmbeddedKeyword_2_4_0; }
 		
 		//('toolbar' toolbar=[action::ActionToolbar])?
-		public Group getGroup_2_6() { return cGroup_2_6; }
+		public Group getGroup_2_5() { return cGroup_2_5; }
 		
 		//'toolbar'
-		public Keyword getToolbarKeyword_2_6_0() { return cToolbarKeyword_2_6_0; }
+		public Keyword getToolbarKeyword_2_5_0() { return cToolbarKeyword_2_5_0; }
 		
 		//toolbar=[action::ActionToolbar]
-		public Assignment getToolbarAssignment_2_6_1() { return cToolbarAssignment_2_6_1; }
+		public Assignment getToolbarAssignment_2_5_1() { return cToolbarAssignment_2_5_1; }
 		
 		//[action::ActionToolbar]
-		public CrossReference getToolbarActionToolbarCrossReference_2_6_1_0() { return cToolbarActionToolbarCrossReference_2_6_1_0; }
+		public CrossReference getToolbarActionToolbarCrossReference_2_5_1_0() { return cToolbarActionToolbarCrossReference_2_5_1_0; }
 		
 		//ID
-		public RuleCall getToolbarActionToolbarIDTerminalRuleCall_2_6_1_0_1() { return cToolbarActionToolbarIDTerminalRuleCall_2_6_1_0_1; }
+		public RuleCall getToolbarActionToolbarIDTerminalRuleCall_2_5_1_0_1() { return cToolbarActionToolbarIDTerminalRuleCall_2_5_1_0_1; }
 		
 		//('using' source=TableDatamart)?
 		public Group getGroup_3() { return cGroup_3; }
@@ -1831,130 +1664,33 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.osbp.xtext.table.TableDSL.TableGrid");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cTableGridAction_0 = (Action)cGroup.eContents().get(0);
-		private final Keyword cGridKeyword_1 = (Keyword)cGroup.eContents().get(1);
-		private final UnorderedGroup cUnorderedGroup_2 = (UnorderedGroup)cGroup.eContents().get(2);
-		private final Assignment cSelectalwaysAssignment_2_0 = (Assignment)cUnorderedGroup_2.eContents().get(0);
-		private final Keyword cSelectalwaysSelectalwaysKeyword_2_0_0 = (Keyword)cSelectalwaysAssignment_2_0.eContents().get(0);
-		private final Group cGroup_2_1 = (Group)cUnorderedGroup_2.eContents().get(1);
-		private final Keyword cRowheaderKeyword_2_1_0 = (Keyword)cGroup_2_1.eContents().get(0);
-		private final Assignment cHeaderModeAssignment_2_1_1 = (Assignment)cGroup_2_1.eContents().get(1);
-		private final RuleCall cHeaderModeRowHeaderModeEnumRuleCall_2_1_1_0 = (RuleCall)cHeaderModeAssignment_2_1_1.eContents().get(0);
-		private final UnorderedGroup cUnorderedGroup_3 = (UnorderedGroup)cGroup.eContents().get(3);
-		private final Group cGroup_3_0 = (Group)cUnorderedGroup_3.eContents().get(0);
-		private final Assignment cPollingAssignment_3_0_0 = (Assignment)cGroup_3_0.eContents().get(0);
-		private final Keyword cPollingPollingKeyword_3_0_0_0 = (Keyword)cPollingAssignment_3_0_0.eContents().get(0);
-		private final Assignment cPollingTimeAssignment_3_0_1 = (Assignment)cGroup_3_0.eContents().get(1);
-		private final RuleCall cPollingTimeNumberParserRuleCall_3_0_1_0 = (RuleCall)cPollingTimeAssignment_3_0_1.eContents().get(0);
-		private final Assignment cFilteringAssignment_3_1 = (Assignment)cUnorderedGroup_3.eContents().get(1);
-		private final Keyword cFilteringFilteringKeyword_3_1_0 = (Keyword)cFilteringAssignment_3_1.eContents().get(0);
-		private final Assignment cEmbeddedAssignment_3_2 = (Assignment)cUnorderedGroup_3.eContents().get(2);
-		private final Keyword cEmbeddedEmbeddedKeyword_3_2_0 = (Keyword)cEmbeddedAssignment_3_2.eContents().get(0);
-		private final Group cGroup_3_3 = (Group)cUnorderedGroup_3.eContents().get(3);
-		private final Keyword cToolbarKeyword_3_3_0 = (Keyword)cGroup_3_3.eContents().get(0);
-		private final Assignment cToolbarAssignment_3_3_1 = (Assignment)cGroup_3_3.eContents().get(1);
-		private final CrossReference cToolbarActionToolbarCrossReference_3_3_1_0 = (CrossReference)cToolbarAssignment_3_3_1.eContents().get(0);
-		private final RuleCall cToolbarActionToolbarIDTerminalRuleCall_3_3_1_0_1 = (RuleCall)cToolbarActionToolbarCrossReference_3_3_1_0.eContents().get(1);
-		private final Group cGroup_4 = (Group)cGroup.eContents().get(4);
-		private final Keyword cUsingKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);
-		private final Assignment cSourceAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);
-		private final RuleCall cSourceTableDtoDatasourceParserRuleCall_4_1_0 = (RuleCall)cSourceAssignment_4_1.eContents().get(0);
+		private final Keyword cEditableKeyword_1 = (Keyword)cGroup.eContents().get(1);
+		private final Keyword cUsingKeyword_2 = (Keyword)cGroup.eContents().get(2);
+		private final Assignment cSourceAssignment_3 = (Assignment)cGroup.eContents().get(3);
+		private final RuleCall cSourceTableDtoDatasourceParserRuleCall_3_0 = (RuleCall)cSourceAssignment_3.eContents().get(0);
 		
 		//// ----------------------------- grid --------------------------------------
 		//TableGrid:
-		//	{TableGrid} 'grid' (selectalways?='selectalways'? & ('rowheader' headerMode=RowHeaderMode)?) ((polling?='polling'
-		//	pollingTime=Number)? & filtering?='filtering'? & embedded?='embedded'? & ('toolbar' toolbar=[action::ActionToolbar])?)
-		//	('using' source=TableDtoDatasource)?;
+		//	{TableGrid} 'editable' 'using' source=TableDtoDatasource;
 		@Override public ParserRule getRule() { return rule; }
 		
-		//{TableGrid} 'grid' (selectalways?='selectalways'? & ('rowheader' headerMode=RowHeaderMode)?) ((polling?='polling'
-		//pollingTime=Number)? & filtering?='filtering'? & embedded?='embedded'? & ('toolbar' toolbar=[action::ActionToolbar])?)
-		//('using' source=TableDtoDatasource)?
+		//{TableGrid} 'editable' 'using' source=TableDtoDatasource
 		public Group getGroup() { return cGroup; }
 		
 		//{TableGrid}
 		public Action getTableGridAction_0() { return cTableGridAction_0; }
 		
-		//'grid'
-		public Keyword getGridKeyword_1() { return cGridKeyword_1; }
-		
-		//selectalways?='selectalways'? & ('rowheader' headerMode=RowHeaderMode)?
-		public UnorderedGroup getUnorderedGroup_2() { return cUnorderedGroup_2; }
-		
-		//selectalways?='selectalways'?
-		public Assignment getSelectalwaysAssignment_2_0() { return cSelectalwaysAssignment_2_0; }
-		
-		//'selectalways'
-		public Keyword getSelectalwaysSelectalwaysKeyword_2_0_0() { return cSelectalwaysSelectalwaysKeyword_2_0_0; }
-		
-		//('rowheader' headerMode=RowHeaderMode)?
-		public Group getGroup_2_1() { return cGroup_2_1; }
-		
-		//'rowheader'
-		public Keyword getRowheaderKeyword_2_1_0() { return cRowheaderKeyword_2_1_0; }
-		
-		//headerMode=RowHeaderMode
-		public Assignment getHeaderModeAssignment_2_1_1() { return cHeaderModeAssignment_2_1_1; }
-		
-		//RowHeaderMode
-		public RuleCall getHeaderModeRowHeaderModeEnumRuleCall_2_1_1_0() { return cHeaderModeRowHeaderModeEnumRuleCall_2_1_1_0; }
-		
-		//(polling?='polling' pollingTime=Number)? & filtering?='filtering'? & embedded?='embedded'? & ('toolbar'
-		//toolbar=[action::ActionToolbar])?
-		public UnorderedGroup getUnorderedGroup_3() { return cUnorderedGroup_3; }
-		
-		//(polling?='polling' pollingTime=Number)?
-		public Group getGroup_3_0() { return cGroup_3_0; }
-		
-		//polling?='polling'
-		public Assignment getPollingAssignment_3_0_0() { return cPollingAssignment_3_0_0; }
-		
-		//'polling'
-		public Keyword getPollingPollingKeyword_3_0_0_0() { return cPollingPollingKeyword_3_0_0_0; }
-		
-		//pollingTime=Number
-		public Assignment getPollingTimeAssignment_3_0_1() { return cPollingTimeAssignment_3_0_1; }
-		
-		//Number
-		public RuleCall getPollingTimeNumberParserRuleCall_3_0_1_0() { return cPollingTimeNumberParserRuleCall_3_0_1_0; }
-		
-		//filtering?='filtering'?
-		public Assignment getFilteringAssignment_3_1() { return cFilteringAssignment_3_1; }
-		
-		//'filtering'
-		public Keyword getFilteringFilteringKeyword_3_1_0() { return cFilteringFilteringKeyword_3_1_0; }
-		
-		//embedded?='embedded'?
-		public Assignment getEmbeddedAssignment_3_2() { return cEmbeddedAssignment_3_2; }
-		
-		//'embedded'
-		public Keyword getEmbeddedEmbeddedKeyword_3_2_0() { return cEmbeddedEmbeddedKeyword_3_2_0; }
-		
-		//('toolbar' toolbar=[action::ActionToolbar])?
-		public Group getGroup_3_3() { return cGroup_3_3; }
-		
-		//'toolbar'
-		public Keyword getToolbarKeyword_3_3_0() { return cToolbarKeyword_3_3_0; }
-		
-		//toolbar=[action::ActionToolbar]
-		public Assignment getToolbarAssignment_3_3_1() { return cToolbarAssignment_3_3_1; }
-		
-		//[action::ActionToolbar]
-		public CrossReference getToolbarActionToolbarCrossReference_3_3_1_0() { return cToolbarActionToolbarCrossReference_3_3_1_0; }
-		
-		//ID
-		public RuleCall getToolbarActionToolbarIDTerminalRuleCall_3_3_1_0_1() { return cToolbarActionToolbarIDTerminalRuleCall_3_3_1_0_1; }
-		
-		//('using' source=TableDtoDatasource)?
-		public Group getGroup_4() { return cGroup_4; }
+		//'editable'
+		public Keyword getEditableKeyword_1() { return cEditableKeyword_1; }
 		
 		//'using'
-		public Keyword getUsingKeyword_4_0() { return cUsingKeyword_4_0; }
+		public Keyword getUsingKeyword_2() { return cUsingKeyword_2; }
 		
 		//source=TableDtoDatasource
-		public Assignment getSourceAssignment_4_1() { return cSourceAssignment_4_1; }
+		public Assignment getSourceAssignment_3() { return cSourceAssignment_3; }
 		
 		//TableDtoDatasource
-		public RuleCall getSourceTableDtoDatasourceParserRuleCall_4_1_0() { return cSourceTableDtoDatasourceParserRuleCall_4_1_0; }
+		public RuleCall getSourceTableDtoDatasourceParserRuleCall_3_0() { return cSourceTableDtoDatasourceParserRuleCall_3_0; }
 	}
 	public class PropertyElements extends AbstractParserRuleElementFinder {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.osbp.xtext.table.TableDSL.Property");
@@ -2132,16 +1868,17 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cPropertyDateStyleParserRuleCall_5 = (RuleCall)cAlternatives.eContents().get(5);
 		private final RuleCall cPropertyNumberStyleParserRuleCall_6 = (RuleCall)cAlternatives.eContents().get(6);
 		private final RuleCall cPropertyImageStyleParserRuleCall_7 = (RuleCall)cAlternatives.eContents().get(7);
-		private final RuleCall cGridPropIndicatorStyleParserRuleCall_8 = (RuleCall)cAlternatives.eContents().get(8);
+		private final RuleCall cPropertyBlobImageStyleParserRuleCall_8 = (RuleCall)cAlternatives.eContents().get(8);
+		private final RuleCall cGridPropIndicatorStyleParserRuleCall_9 = (RuleCall)cAlternatives.eContents().get(9);
 		
 		//PropertyStyle style::CxGridPropStyle:
 		//	PropertyButtonStyle | PropertyHtmlStyle | PropertyProgressbarStyle | PropertyTextStyle | PropertyBooleanStyle |
-		//	PropertyDateStyle | PropertyNumberStyle | PropertyImageStyle | GridPropIndicatorStyle /*|
+		//	PropertyDateStyle | PropertyNumberStyle | PropertyImageStyle | PropertyBlobImageStyle | GridPropIndicatorStyle /*|
 		//	PropertyPriceStyle | PropertyQuantityStyle */;
 		@Override public ParserRule getRule() { return rule; }
 		
 		//PropertyButtonStyle | PropertyHtmlStyle | PropertyProgressbarStyle | PropertyTextStyle | PropertyBooleanStyle |
-		//PropertyDateStyle | PropertyNumberStyle | PropertyImageStyle | GridPropIndicatorStyle
+		//PropertyDateStyle | PropertyNumberStyle | PropertyImageStyle | PropertyBlobImageStyle | GridPropIndicatorStyle
 		public Alternatives getAlternatives() { return cAlternatives; }
 		
 		//PropertyButtonStyle
@@ -2168,8 +1905,11 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		//PropertyImageStyle
 		public RuleCall getPropertyImageStyleParserRuleCall_7() { return cPropertyImageStyleParserRuleCall_7; }
 		
+		//PropertyBlobImageStyle
+		public RuleCall getPropertyBlobImageStyleParserRuleCall_8() { return cPropertyBlobImageStyleParserRuleCall_8; }
+		
 		//GridPropIndicatorStyle
-		public RuleCall getGridPropIndicatorStyleParserRuleCall_8() { return cGridPropIndicatorStyleParserRuleCall_8; }
+		public RuleCall getGridPropIndicatorStyleParserRuleCall_9() { return cGridPropIndicatorStyleParserRuleCall_9; }
 	}
 	public class PropertyButtonStyleElements extends AbstractParserRuleElementFinder {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.osbp.xtext.table.TableDSL.PropertyButtonStyle");
@@ -2577,6 +2317,26 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		//'textStyle'
 		public Keyword getTextStyleKeyword_1() { return cTextStyleKeyword_1; }
 	}
+	public class PropertyBlobImageStyleElements extends AbstractParserRuleElementFinder {
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.osbp.xtext.table.TableDSL.PropertyBlobImageStyle");
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Action cCxGridPropBlobImageStyleAction_0 = (Action)cGroup.eContents().get(0);
+		private final Keyword cBlobImageStyleKeyword_1 = (Keyword)cGroup.eContents().get(1);
+		
+		//PropertyBlobImageStyle style::CxGridPropBlobImageStyle:
+		//	{style::CxGridPropBlobImageStyle}
+		//	'blobImageStyle';
+		@Override public ParserRule getRule() { return rule; }
+		
+		//{style::CxGridPropBlobImageStyle} 'blobImageStyle'
+		public Group getGroup() { return cGroup; }
+		
+		//{style::CxGridPropBlobImageStyle}
+		public Action getCxGridPropBlobImageStyleAction_0() { return cCxGridPropBlobImageStyleAction_0; }
+		
+		//'blobImageStyle'
+		public Keyword getBlobImageStyleKeyword_1() { return cBlobImageStyleKeyword_1; }
+	}
 	public class PropertyImageStyleElements extends AbstractParserRuleElementFinder {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.osbp.xtext.table.TableDSL.PropertyImageStyle");
 		private final Group cGroup = (Group)rule.eContents().get(1);
@@ -3066,7 +2826,6 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 	private final TableOptionElements pTableOption;
 	private final TableSelectionElements pTableSelection;
 	private final TableTableElements pTableTable;
-	private final TableBeanElements pTableBean;
 	private final TablePreorderElements pTablePreorder;
 	private final TableValueElements pTableValue;
 	private final TableFormatterElements pTableFormatter;
@@ -3117,6 +2876,7 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 	private final PropertyQuantityStyleElements pPropertyQuantityStyle;
 	private final PropertyPriceStyleElements pPropertyPriceStyle;
 	private final PropertyTextStyleElements pPropertyTextStyle;
+	private final PropertyBlobImageStyleElements pPropertyBlobImageStyle;
 	private final PropertyImageStyleElements pPropertyImageStyle;
 	private final StyleConfigElements pStyleConfig;
 	private final NumericToResourceStyleConfigElements pNumericToResourceStyleConfig;
@@ -3161,7 +2921,6 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		this.pTableOption = new TableOptionElements();
 		this.pTableSelection = new TableSelectionElements();
 		this.pTableTable = new TableTableElements();
-		this.pTableBean = new TableBeanElements();
 		this.pTablePreorder = new TablePreorderElements();
 		this.pTableValue = new TableValueElements();
 		this.pTableFormatter = new TableFormatterElements();
@@ -3212,6 +2971,7 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		this.pPropertyQuantityStyle = new PropertyQuantityStyleElements();
 		this.pPropertyPriceStyle = new PropertyPriceStyleElements();
 		this.pPropertyTextStyle = new PropertyTextStyleElements();
+		this.pPropertyBlobImageStyle = new PropertyBlobImageStyleElements();
 		this.pPropertyImageStyle = new PropertyImageStyleElements();
 		this.pStyleConfig = new StyleConfigElements();
 		this.pNumericToResourceStyleConfig = new NumericToResourceStyleConfigElements();
@@ -3302,7 +3062,7 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 	}
 	
 	//TableOption:
-	//	TableSelection | TableTable | TableGrid | TableBean;
+	//	TableSelection | TableTable | TableGrid;
 	public TableOptionElements getTableOptionAccess() {
 		return pTableOption;
 	}
@@ -3313,8 +3073,8 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 	
 	//TableSelection:
 	//	{TableSelection} 'selection' (multiSelection?='multiple' | 'single') (selectalways?='alwaysSelected'? & ('rowHeader'
-	//	headerMode=RowHeaderMode)? & (polling?='polling' pollingTime=Number)? & filtering?='filtering'? &
-	//	embedded?='embedded'? & ('toolbar' toolbar=[action::ActionToolbar])?) ('using' source=TableDatamart)?;
+	//	headerMode=RowHeaderMode)? & filtering?='filtering'? & embedded?='embedded'? & ('toolbar'
+	//	toolbar=[action::ActionToolbar])?) ('using' source=TableDatamart)?;
 	public TableSelectionElements getTableSelectionAccess() {
 		return pTableSelection;
 	}
@@ -3324,9 +3084,9 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 	}
 	
 	//TableTable:
-	//	{TableTable} 'table' (selectalways?='alwaysSelected'? & selectById?='selectById'? & ('rowHeader'
-	//	headerMode=RowHeaderMode)? & (polling?='polling' pollingTime=Number)? & filtering?='filtering'? &
-	//	embedded?='embedded'? & ('toolbar' toolbar=[action::ActionToolbar])?) ('using' source=TableDatamart)?;
+	//	{TableTable} 'readOnly' (selectalways?='alwaysSelected'? & selectById?='selectById'? & ('rowHeader'
+	//	headerMode=RowHeaderMode)? & filtering?='filtering'? & embedded?='embedded'? & ('toolbar'
+	//	toolbar=[action::ActionToolbar])?) ('using' source=TableDatamart)?;
 	public TableTableElements getTableTableAccess() {
 		return pTableTable;
 	}
@@ -3335,18 +3095,6 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		return getTableTableAccess().getRule();
 	}
 	
-	//TableBean:
-	//	{TableBean} 'bean' (selectalways?='alwaysSelected'? & selectById?='selectById'? & ('rowHeader'
-	//	headerMode=RowHeaderMode)? & (polling?='polling' pollingTime=Number)? & filtering?='filtering'? &
-	//	embedded?='embedded'? & ('toolbar' toolbar=[action::ActionToolbar])?) ('using' source=TableDatamart)?;
-	public TableBeanElements getTableBeanAccess() {
-		return pTableBean;
-	}
-	
-	public ParserRule getTableBeanRule() {
-		return getTableBeanAccess().getRule();
-	}
-	
 	//TablePreorder:
 	//	{TablePreorder} 'preorder' column=TableValueElement ascending?='ascending'?;
 	public TablePreorderElements getTablePreorderAccess() {
@@ -3695,9 +3443,7 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 	
 	//// ----------------------------- grid --------------------------------------
 	//TableGrid:
-	//	{TableGrid} 'grid' (selectalways?='selectalways'? & ('rowheader' headerMode=RowHeaderMode)?) ((polling?='polling'
-	//	pollingTime=Number)? & filtering?='filtering'? & embedded?='embedded'? & ('toolbar' toolbar=[action::ActionToolbar])?)
-	//	('using' source=TableDtoDatasource)?;
+	//	{TableGrid} 'editable' 'using' source=TableDtoDatasource;
 	public TableGridElements getTableGridAccess() {
 		return pTableGrid;
 	}
@@ -3749,7 +3495,7 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 	
 	//PropertyStyle style::CxGridPropStyle:
 	//	PropertyButtonStyle | PropertyHtmlStyle | PropertyProgressbarStyle | PropertyTextStyle | PropertyBooleanStyle |
-	//	PropertyDateStyle | PropertyNumberStyle | PropertyImageStyle | GridPropIndicatorStyle /*|
+	//	PropertyDateStyle | PropertyNumberStyle | PropertyImageStyle | PropertyBlobImageStyle | GridPropIndicatorStyle /*|
 	//	PropertyPriceStyle | PropertyQuantityStyle */;
 	public PropertyStyleElements getPropertyStyleAccess() {
 		return pPropertyStyle;
@@ -3873,6 +3619,17 @@ public class TableDSLGrammarAccess extends AbstractGrammarElementFinder {
 		return getPropertyTextStyleAccess().getRule();
 	}
 	
+	//PropertyBlobImageStyle style::CxGridPropBlobImageStyle:
+	//	{style::CxGridPropBlobImageStyle}
+	//	'blobImageStyle';
+	public PropertyBlobImageStyleElements getPropertyBlobImageStyleAccess() {
+		return pPropertyBlobImageStyle;
+	}
+	
+	public ParserRule getPropertyBlobImageStyleRule() {
+		return getPropertyBlobImageStyleAccess().getRule();
+	}
+	
 	//PropertyImageStyle style::CxGridPropImageStyle:
 	//	{style::CxGridPropImageStyle}
 	//	'imageStyle' ('eventTopic' eventTopic=STRING)? '{'
diff --git a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/validation/AbstractTableDSLValidator.java b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/validation/AbstractTableDSLValidator.java
index 17bc7d8..e5728be 100644
--- a/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/validation/AbstractTableDSLValidator.java
+++ b/org.eclipse.osbp.xtext.table/src-gen/org/eclipse/osbp/xtext/table/validation/AbstractTableDSLValidator.java
@@ -1,5 +1,16 @@
-/*
- * generated by Xtext 2.11.0
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
  */
 package org.eclipse.osbp.xtext.table.validation;
 
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/Activator.java b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/Activator.java
index c5d1c9e..3172e8d 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/Activator.java
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/Activator.java
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/GenerateTableDSL.mwe2 b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/GenerateTableDSL.mwe2
index 6282ce1..f6d4b9b 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/GenerateTableDSL.mwe2
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/GenerateTableDSL.mwe2
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
@@ -18,6 +20,25 @@ import org.eclipse.xtext.xtext.generator.*
 import org.eclipse.xtext.xtext.generator.model.project.*
 
 var rootPath = ".."
+var fileHeaderText="/**
+ *                                                                            
+ *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
+ *                                                                            
+ *  All rights reserved. This program and the accompanying materials           
+ *  are made available under the terms of the Eclipse Public License 2.0        
+ *  which accompanies this distribution, and is available at                  
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ *  Contributors:                                                      
+ * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ * 
+ * 
+ *  generated by Xtext \${version}
+ *
+ */
+"
 
 Workflow {
 
@@ -44,7 +65,7 @@ Workflow {
 			code = {
 				encoding = "UTF-8"
 				lineDelimiter = "\n"
-				fileHeader = "/*\n * generated by Xtext \${version}\n */"
+				fileHeader = fileHeaderText
 			}
 		}
 
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSL.xtext b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSL.xtext
index 0c6570d..cc862ca 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSL.xtext
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSL.xtext
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
@@ -39,22 +41,17 @@ Table:
 	'as' tabletype=TableOption;
 
 TableOption:
-	TableSelection | TableTable | TableGrid |TableBean;
+	TableSelection | TableTable | TableGrid;
 
 TableSelection:
 	{TableSelection} 'selection' 
 	(multiSelection?='multiple' | 'single') 
-	((selectalways?='alwaysSelected')? & ('rowHeader' headerMode=RowHeaderMode)? & (polling?='polling' pollingTime=Number)? & (filtering?='filtering')? & (embedded?='embedded')? & ('toolbar' toolbar=[action::ActionToolbar])?)
+	((selectalways?='alwaysSelected')? & ('rowHeader' headerMode=RowHeaderMode)? & (filtering?='filtering')? & (embedded?='embedded')? & ('toolbar' toolbar=[action::ActionToolbar])?)
 	('using' source=TableDatamart)?;
 
 TableTable:
-	{TableTable} 'table' 
-	((selectalways?='alwaysSelected')? & (selectById?='selectById')? & ('rowHeader' headerMode=RowHeaderMode)? & (polling?='polling' pollingTime=Number)? & (filtering?='filtering')? & (embedded?='embedded')? & ('toolbar' toolbar=[action::ActionToolbar])?)
-	('using' source=TableDatamart)?;
-
-TableBean: 
-	{TableBean} 'bean' 
-	((selectalways?='alwaysSelected')? & (selectById?='selectById')? & ('rowHeader' headerMode=RowHeaderMode)? & (polling?='polling' pollingTime=Number)? & (filtering?='filtering')? & (embedded?='embedded')? & ('toolbar' toolbar=[action::ActionToolbar])?)
+	{TableTable} 'readOnly' 
+	((selectalways?='alwaysSelected')? & (selectById?='selectById')? & ('rowHeader' headerMode=RowHeaderMode)? & (filtering?='filtering')? & (embedded?='embedded')? & ('toolbar' toolbar=[action::ActionToolbar])?)
 	('using' source=TableDatamart)?;
 
 TablePreorder:
@@ -167,12 +164,7 @@ TableTooltip:
 
 	// ----------------------------- grid --------------------------------------
 TableGrid:
-	{TableGrid} 'grid' (((selectalways?='selectalways')?) & ('rowheader' headerMode=RowHeaderMode)?)
-	((polling?='polling' pollingTime=Number)? &
-	(filtering?='filtering')? &
-	(embedded?='embedded')? &
-	('toolbar' toolbar=[action::ActionToolbar])?)
-	('using' source=TableDtoDatasource)?;
+	{TableGrid} 'editable' 'using' source=TableDtoDatasource;
 
 Property returns CxGridProperty:
 	(editable?='editable')? 'prop' path=NestedField 'style' style=PropertyStyle;
@@ -190,7 +182,7 @@ NestedPath returns CxGridNestedPath:
 
 PropertyStyle returns style::CxGridPropStyle:
 	PropertyButtonStyle | PropertyHtmlStyle | PropertyProgressbarStyle | PropertyTextStyle |
-	PropertyBooleanStyle | PropertyDateStyle | PropertyNumberStyle | PropertyImageStyle | GridPropIndicatorStyle /*|
+	PropertyBooleanStyle | PropertyDateStyle | PropertyNumberStyle | PropertyImageStyle | PropertyBlobImageStyle | GridPropIndicatorStyle /*|
 	PropertyPriceStyle | PropertyQuantityStyle */;
 
 PropertyButtonStyle returns style::CxGridPropButtonStyle:
@@ -237,6 +229,10 @@ PropertyTextStyle returns style::CxGridPropTextStyle:
 	{style::CxGridPropTextStyle}
 	'textStyle';
 
+PropertyBlobImageStyle returns style::CxGridPropBlobImageStyle:
+	{style::CxGridPropBlobImageStyle}
+	'blobImageStyle';
+
 PropertyImageStyle returns style::CxGridPropImageStyle:
 	{style::CxGridPropImageStyle}
 	'imageStyle' ('eventTopic' eventTopic=STRING)? '{'
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLBundleSpaceRuntimeModule.java b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLBundleSpaceRuntimeModule.java
index b187320..a02ec1d 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLBundleSpaceRuntimeModule.java
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLBundleSpaceRuntimeModule.java
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLBundleSpaceStandaloneSetup.java b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLBundleSpaceStandaloneSetup.java
index 9644197..b128cdd 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLBundleSpaceStandaloneSetup.java
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLBundleSpaceStandaloneSetup.java
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLRuntimeModule.java b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLRuntimeModule.java
index 109f3d1..55bf5c3 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLRuntimeModule.java
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLRuntimeModule.java
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLStandaloneSetup.java b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLStandaloneSetup.java
index ff63d6a..a083b73 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLStandaloneSetup.java
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/TableDSLStandaloneSetup.java
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/XcoreResourceFactory.java b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/XcoreResourceFactory.java
index a41338f..033a6e6 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/XcoreResourceFactory.java
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/XcoreResourceFactory.java
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/formatting/TableDSLFormatter.xtend b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/formatting/TableDSLFormatter.xtend
index 6e6730b..267cc5a 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/formatting/TableDSLFormatter.xtend
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/formatting/TableDSLFormatter.xtend
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/generator/OutputConfigurationProvider.java b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/generator/OutputConfigurationProvider.java
index 924020e..8df6d20 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/generator/OutputConfigurationProvider.java
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/generator/OutputConfigurationProvider.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0 
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/generator/TableGridSourceGenerator.xtend b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/generator/TableGridSourceGenerator.xtend
index 7c1c028..ca6538b 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/generator/TableGridSourceGenerator.xtend
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/generator/TableGridSourceGenerator.xtend
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/imports/ShouldImportProvider.java b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/imports/ShouldImportProvider.java
index 5d4ef7f..badd2b3 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/imports/ShouldImportProvider.java
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/imports/ShouldImportProvider.java
@@ -1,3 +1,17 @@
+/**
+ *                                                                            
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *                                                                            
+ * All rights reserved. This program and the accompanying materials           
+ * are made available under the terms of the Eclipse Public License 2.0        
+ * which accompanies this distribution, and is available at                  
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
+ *                                                                            
+ * Contributors:   
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
+ */
 package org.eclipse.osbp.xtext.table.imports;
 
 import org.eclipse.emf.ecore.EClass;
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/jvmmodel/TableDSLJvmModelInferrer.xtend b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/jvmmodel/TableDSLJvmModelInferrer.xtend
index 8eaacd8..67b24b0 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/jvmmodel/TableDSLJvmModelInferrer.xtend
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/jvmmodel/TableDSLJvmModelInferrer.xtend
@@ -3,9 +3,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  *                                                                            
  * All rights reserved. This program and the accompanying materials           
- * are made available under the terms of the Eclipse Public License v1.0       
+ * are made available under the terms of the Eclipse Public License 2.0        
  * which accompanies this distribution, and is available at                  
- * http://www.eclipse.org/legal/epl-v10.html                                 
+ * https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ * SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  * Contributors:   
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation 
@@ -17,7 +19,8 @@
  
 package org.eclipse.osbp.xtext.table.jvmmodel
 
-import com.github.wolfie.refresher.Refresher
+import com.vaadin.server.ClientConnector.AttachEvent
+import com.vaadin.server.ClientConnector.AttachListener
 import com.vaadin.ui.Button
 import com.vaadin.ui.Component
 import com.vaadin.ui.VerticalLayout
@@ -36,7 +39,6 @@ import javax.inject.Named
 import org.eclipse.e4.core.contexts.IContextFunction
 import org.eclipse.e4.core.contexts.IEclipseContext
 import org.eclipse.e4.core.di.annotations.Optional
-import org.eclipse.e4.core.services.events.IEventBroker
 import org.eclipse.e4.ui.di.Focus
 import org.eclipse.e4.ui.model.application.MApplication
 import org.eclipse.e4.ui.workbench.IPresentationEngine
@@ -51,14 +53,12 @@ import org.eclipse.osbp.dsl.semantic.common.types.LDataType
 import org.eclipse.osbp.dsl.semantic.common.types.LKeyAndValue
 import org.eclipse.osbp.dsl.semantic.entity.LEntity
 import org.eclipse.osbp.dsl.semantic.entity.LEntityAttribute
-import org.eclipse.osbp.ecview.^extension.strategy.AbstractLayoutingStrategy
 import org.eclipse.osbp.infogrid.api.IGridSourceFacade
 import org.eclipse.osbp.osgi.hybrid.api.AbstractHybridVaaclipseView
 import org.eclipse.osbp.runtime.common.event.EventDispatcherEvent
 import org.eclipse.osbp.runtime.common.event.IEventDispatcher
+import org.eclipse.osbp.runtime.common.layouting.IPropertyConstants
 import org.eclipse.osbp.runtime.common.types.ITypeProviderService
-import org.eclipse.osbp.runtime.web.vaadin.common.data.BeanServiceLazyLoadingContainer
-import org.eclipse.osbp.runtime.web.vaadin.common.data.IBeanSearchServiceFactory
 import org.eclipse.osbp.ui.api.contextfunction.IViewEmbeddedProvider
 import org.eclipse.osbp.ui.api.customfields.IBlobService
 import org.eclipse.osbp.ui.api.datamart.DatamartFilter
@@ -91,7 +91,6 @@ import org.eclipse.osbp.xtext.table.TableAggregation
 import org.eclipse.osbp.xtext.table.TableAllColumns
 import org.eclipse.osbp.xtext.table.TableAttribute
 import org.eclipse.osbp.xtext.table.TableAxis
-import org.eclipse.osbp.xtext.table.TableBean
 import org.eclipse.osbp.xtext.table.TableCellColor
 import org.eclipse.osbp.xtext.table.TableColumn
 import org.eclipse.osbp.xtext.table.TableDSLFactory
@@ -118,7 +117,6 @@ import org.eclipse.osbp.xtext.table.TableTable
 import org.eclipse.osbp.xtext.table.TableTextColor
 import org.eclipse.osbp.xtext.table.TableTooltip
 import org.eclipse.osbp.xtext.table.TableTrend
-import org.eclipse.osbp.xtext.table.common.BeanFilterTable
 import org.eclipse.osbp.xtext.table.common.CellSetFilterTable
 import org.eclipse.osbp.xtext.table.common.CellSetIndexedContainer
 import org.eclipse.osbp.xtext.table.common.CheckboxSelectionCellSetFilterTable
@@ -135,7 +133,6 @@ import org.eclipse.xtext.naming.IQualifiedNameProvider
 import org.eclipse.xtext.xbase.jvmmodel.AbstractModelInferrer
 import org.eclipse.xtext.xbase.jvmmodel.IJvmDeclaredTypeAcceptor
 import org.eclipse.xtext.xbase.jvmmodel.JvmTypesBuilder
-import org.osgi.service.event.EventHandler
 import org.slf4j.Logger
 
 /**
@@ -223,7 +220,7 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 	var customformatCounter = 0
 
 	val CONVERT_METHOD_PREFIX = "getStringTo"
-
+	
 	def String getFileExtension() {
 	}
 
@@ -242,9 +239,6 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 			else if (table.isGrid) {
 				clsName = pkg.name.toString.concat(".").concat(table.name).concat("Grid")
 			}
-			else if (table.isBean) {
-				clsName = pkg.name.toString.concat(".").concat(table.name).concat("Bean")
-			}
 			else if (table.isSelection) {
 				clsName = pkg.name.toString.concat(".").concat(table.name).concat("Select")
 			}
@@ -254,13 +248,14 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 			val cls = table.toClass(clsName)
 			if (table.isEmbedded) {
 				cls.getSuperTypes().add(_typeReferenceBuilder.typeRef(IViewEmbeddedProvider))
+				cls.getSuperTypes().add(_typeReferenceBuilder.typeRef(AttachListener))
 			} else {
 				cls.getSuperTypes().add(_typeReferenceBuilder.typeRef(AbstractHybridVaaclipseView))
 			}
 			cls.superTypes.add(_typeReferenceBuilder.typeRef(IUser.UserLocaleListener))
 			cls.superTypes.add(_typeReferenceBuilder.typeRef(IEventDispatcher.Receiver))
 			cls.superTypes.add(_typeReferenceBuilder.typeRef(IE4Table))
-			if(!table.grid && !table.isBean && !table.isEmbedded) {
+			if(!table.grid && !table.isEmbedded) {
 				cls.superTypes.add(_typeReferenceBuilder.typeRef(IDatamartFilterGenerator.FilterChangeListener))
 			}
 			if (table.task) {
@@ -352,7 +347,6 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 	def TableDatamart getDataMartTable(TableOption option) {
 		switch option {
 			TableTable: return option.source
-			TableBean: return option.source
 		}
 		return null
 	}
@@ -392,6 +386,8 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		type.members += field
 		field = table.toField("initDone", _typeReferenceBuilder.typeRef(boolean)) [initializer = [append('''false''')]]
 		type.members += field
+		field = table.toField("parent", _typeReferenceBuilder.typeRef(VerticalLayout))
+		type.members += field
 		field = table.toField("eclipseContext", _typeReferenceBuilder.typeRef(IEclipseContext))[annotations += _annotationTypesBuilder.annotationRef(Inject)]
 		type.members += field
 		field = table.toField("user", _typeReferenceBuilder.typeRef(IUser))[annotations += _annotationTypesBuilder.annotationRef(Inject)]
@@ -406,8 +402,11 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		type.members += field
 		field = table.toField("blobService", _typeReferenceBuilder.typeRef(IBlobService)) [annotations += _annotationTypesBuilder.annotationRef(Inject)]
 		type.members += field
+		field = table.toField("selectedId", _typeReferenceBuilder.typeRef(Object)) [initializer = [append('''null''')]]
+		field.visibility = JvmVisibility::PRIVATE
+		type.members += field
 		// the package name of the referenced datamart
-		if (getSourceDataMartRefName(table) !== null && !table.isBean) {
+		if (getSourceDataMartRefName(table) !== null) {
 			var packageName = (table.dataMartTable.datamartRef.eContainer as DatamartPackage).fullyQualifiedName.
 				toString
 			field = table.toField("datamartInstance",
@@ -426,14 +425,6 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 			field = table.toField("grid", _typeReferenceBuilder.typeRef("org.eclipse.osbp.infogrid.vaaclipse.SingleInfoGridComponent"))
 			type.members += field
 		}
-		if(table.isBean) {
-			field = table.toField("factory", _typeReferenceBuilder.typeRef(IBeanSearchServiceFactory))[annotations += _annotationTypesBuilder.annotationRef(Inject)]
-			type.members += field
-		}
-		field = table.toField("tableSelectDelay", _typeReferenceBuilder.typeRef(Refresher))
-		type.members += field
-		field = table.toField("tableRefresher", _typeReferenceBuilder.typeRef(Refresher))
-		type.members += field
 		field = table.toField("dataComponent", _typeReferenceBuilder.typeRef(Component))
 		type.members += field
 		field = table.toField("mustRefresh", _typeReferenceBuilder.typeRef(boolean)) [initializer = [append('''false''')]]
@@ -442,28 +433,15 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 			_typeReferenceBuilder.typeRef(HashMap, _typeReferenceBuilder.typeRef(String), _typeReferenceBuilder.typeRef(PropertyLookup)))
 		type.members += field
 		field = table.toField("tabSheets",
-			_typeReferenceBuilder.typeRef(HashMap, _typeReferenceBuilder.typeRef(Component), _typeReferenceBuilder.typeRef(ArrayList, _typeReferenceBuilder.typeRef(String))))
+			_typeReferenceBuilder.typeRef(HashMap, _typeReferenceBuilder.typeRef(Component), _typeReferenceBuilder.typeRef(ArrayList, _typeReferenceBuilder.typeRef(ArrayList, _typeReferenceBuilder.typeRef(Integer)))))
 		type.members += field
 		
-		if(!table.isBean) {
-			field = table.toField("dataSourceContainer", _typeReferenceBuilder.typeRef(CellSetIndexedContainer))
-		} else {
-			field = table.toField("dataSourceContainer", _typeReferenceBuilder.typeRef(BeanServiceLazyLoadingContainer, _typeReferenceBuilder.wildcard))
-		}
+		field = table.toField("dataSourceContainer", _typeReferenceBuilder.typeRef(CellSetIndexedContainer))
 		type.members += field
 		
 		field = table.toField("operativeDtoContainer", _typeReferenceBuilder.typeRef(OperativeDtoContainer))
 		type.members += field
-		if(!table.isBean) {
-			field = table.toField("tables",
-				_typeReferenceBuilder.typeRef(ArrayList, _typeReferenceBuilder.typeRef(CellSetFilterTable)))
-		} else {
-			field = table.toField("table",
-				_typeReferenceBuilder.typeRef(BeanFilterTable))
-		}
-		type.members += field
-		field = table.toField("eventBroker", _typeReferenceBuilder.typeRef(IEventBroker))[
-			annotations += _annotationTypesBuilder.annotationRef(Inject)]
+		field = table.toField("tables",	_typeReferenceBuilder.typeRef(ArrayList, _typeReferenceBuilder.typeRef(CellSetFilterTable)))
 		type.members += field
 		field = table.toField("renderingEngine", _typeReferenceBuilder.typeRef(IPresentationEngine))[
 			annotations += _annotationTypesBuilder.annotationRef(Inject)]
@@ -471,8 +449,6 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		field = table.toField("themeResourceService", _typeReferenceBuilder.typeRef(IThemeResourceService))[
 			annotations += _annotationTypesBuilder.annotationRef(Inject)]
 		type.members += field
-		field = table.toField("delegatedTask", _typeReferenceBuilder.typeRef(EventHandler))
-		type.members += field
 		field = table.toField("tableFilterDecorator", _typeReferenceBuilder.typeRef(TableFilterDecorator))
 		type.members += field
 		if (table.task) {
@@ -517,6 +493,10 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 			_typeReferenceBuilder.typeRef(ArrayList, _typeReferenceBuilder.typeRef(Integer)))
 		operation.visibility = JvmVisibility::PUBLIC
 		type.members += operation
+		operation = table.toGetter("selectedId",
+			_typeReferenceBuilder.typeRef(Object))
+		operation.visibility = JvmVisibility::PUBLIC
+		type.members += operation
 	}
 
 	/**
@@ -525,37 +505,29 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 	 */
 	def void toOperations(JvmDeclaredType type, TablePackage pkg, Table table) {
 
-		if(!table.isBean) {
-			// create view
-			type.members += table.toMethod("getCellSet", _typeReferenceBuilder.typeRef(DerivedCellSet),
-				[
-					body = [append(
-					'''
-					operativeDtoContainer = null;
-					«IF (table.dataMartTable !== null)»
-					DerivedCellSet cellSet = datamartInstance.getResults(«IF table.task»«ELSE»«IF ((table.isSelection) || table.isEmbedded)»null, null«ELSE»getTaskOperativeDtoClass(), getTaskInitialOperativeDtos()«ENDIF»«ENDIF»);
-					«ELSE»
-					DerivedCellSet cellSet = null;
-					«ENDIF»
-					if	(cellSet != null) {
-						operativeDtoContainer = cellSet.getOperativeDtoContainer();
-					}
-					return cellSet;
-					''')]
-				])
-		}
+		// create view
+		type.members += table.toMethod("getCellSet", _typeReferenceBuilder.typeRef(DerivedCellSet),
+			[
+				body = [append(
+				'''
+				operativeDtoContainer = null;
+				«IF (table.dataMartTable !== null)»
+				DerivedCellSet cellSet = datamartInstance.getResults(«IF table.task»«ELSE»«IF ((table.isSelection) || table.isEmbedded)»null, null«ELSE»getTaskOperativeDtoClass(), getTaskInitialOperativeDtos()«ENDIF»«ENDIF»);
+				«ELSE»
+				DerivedCellSet cellSet = null;
+				«ENDIF»
+				if	(cellSet != null) {
+					operativeDtoContainer = cellSet.getOperativeDtoContainer();
+				}
+				return cellSet;
+				''')]
+			])
 		
 		// focus
 		type.members += table.toMethod("setFocus", _typeReferenceBuilder.typeRef(Void::TYPE),
 			[
 				annotations += _annotationTypesBuilder.annotationRef(Focus)
-				if(table.isBean) {
-					body = [append(
-					'''
-					if(table != null) {
-						table.focus();
-					}''')]
-				} else if (table.isGrid) {
+				if (table.isGrid) {
 					body = [append(
 					'''
 					if(grid != null) {
@@ -564,7 +536,7 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 				} else {
 					body = [append(
 					'''
-					if(!tables.isEmpty()) {
+					if(tables != null && !tables.isEmpty()) {
 						tables.get(0).focus();
 					}''')]
 				}
@@ -581,12 +553,10 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 				taskClient.subscribeTaskEventNotification(this);
 				taskClient.subscribeProcessCompletedEventNotification(this);
 				«ENDIF»
-				«IF !table.grid && !table.isBean && !table.isEmbedded»
+				«IF !table.grid && !table.isEmbedded»
 				filterGenerator.addFilterChangeListener(this);
 				«ENDIF»
-				if(mustRefresh){
-					«table.callDataRefreshMethod»
-				}''')]
+				''')]
 				
 			])
 
@@ -602,9 +572,10 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 				taskClient.unsubscribeTaskEventNotification(this);
 				taskClient.unsubscribeProcessCompletedEventNotification(this);
 				«ENDIF»
-				«IF !table.grid && !table.isBean && !table.isEmbedded»
+				«IF !table.grid && !table.isEmbedded»
 				filterGenerator.removeFilterChangeListener(this);
-				«ENDIF»''')]
+				«ENDIF»
+				''')]
 			])
 		// create view
 		type.members += table.toMethod("createView", _typeReferenceBuilder.typeRef(Void::TYPE),
@@ -622,6 +593,16 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 				body = [append('''«table.createComponents»''')]
 			])
 
+		// getSelectById
+		type.members += table.toMethod("getSelectById", _typeReferenceBuilder.typeRef(boolean), [
+			documentation = table.tabletype.documentation
+			visibility = JvmVisibility.PRIVATE
+			body = [
+				append('''
+				return «IF (table.tabletype instanceof TableTable)»«(table.tabletype as TableTable).selectById.booleanValue»«ELSE»false«ENDIF»;''')
+			]
+		])
+
 		switch (table.tabletype) {
 			TableTable: {
 				// create tab
@@ -643,17 +624,9 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 					[
 						body = [append('''«table.dataRefresh»''')]
 					])
-			}
-			TableBean: {
-				// create table
-				type.members += table.toMethod("createTable", _typeReferenceBuilder.typeRef(Component),
-					[
-						body = [append('''«table.createTable»''')]
-					])
-					
-				type.members += table.toMethod("dataRefresh", _typeReferenceBuilder.typeRef(Void::TYPE),
+				type.members += table.toMethod("renderAllowed", _typeReferenceBuilder.typeRef(boolean),
 					[
-						body = [append('''«table.dataRefresh»''')]
+						body = [append('''«table.renderAllowed»''')]
 					])
 			}
 			TableGrid: {
@@ -685,7 +658,7 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 				parameters += table.toParameter("event", _typeReferenceBuilder.typeRef(EventDispatcherEvent))
 				body = [append('''«table.receiveEvent»''')]
 			])
-		if(!table.isGrid && !table.isBean && !table.isEmbedded) {
+		if(!table.isGrid && !table.isEmbedded) {
 			// filter notification
 			type.members += table.toMethod("filterChanged", _typeReferenceBuilder.typeRef(Void::TYPE),
 				[
@@ -729,6 +702,20 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 					body = [append('''«table.rowChecked»''')]
 				])				
 		}
+		if(table.isEmbedded) {
+			type.members += table.toMethod("attach", _typeReferenceBuilder.typeRef(Void::TYPE),
+				[
+					visibility = JvmVisibility.PUBLIC
+					annotations += _annotationTypesBuilder.annotationRef(Override)
+					parameters += table.toParameter("event", _typeReferenceBuilder.typeRef(AttachEvent))
+					body = [append(
+					'''
+					if(mustRefresh){
+						dataRefresh();
+						mustRefresh = false;
+					}''')]
+				])				
+		}
 	}
 	
 	def baseType(LEntity entityRef) {
@@ -740,12 +727,29 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		return entityRef
 	}
 	
+	def private Map<String, String> getUniqueReferenceFQIdName(LEntity entity) {
+		var Map<String, String> uniqueReferenceNames = new HashMap
+		for (entityReference : entity.allReferences) {
+			var uniqueReferenceName = uniqueReferenceNames.get(entityReference.type.fullyQualifiedName)
+			if (uniqueReferenceName === null) {
+				uniqueReferenceName = '''«entityReference.type.fullyQualifiedName».«entityReference.type.idAttributeName»'''
+				uniqueReferenceNames.put(entityReference.type.fullyQualifiedName.toString, uniqueReferenceName)
+			}
+		}
+		return uniqueReferenceNames
+	}
+	
 	protected def CharSequence createGridComponent(TablePackage pkg, Table table, LEntity entity, String gridDtoFqn)
 		'''
 			IEclipseContext childContext = eclipseContext.createChild();
 			childContext.set(Locale.class, user.getLocale());
 			childContext.set("gridSourceId", "«pkg.name.toString.concat(".").concat(table.name).concat("Grid")»");
-			childContext.set("selectionEvnt", new EventDispatcherEvent(EventDispatcherCommand.SELECT, "«entity.baseType.fullyQualifiedName».«entity.idAttributeName»", "«table.fullyQualifiedName»"));
+			LinkedHashMap<String, EventDispatcherEvent> selectionEvntList = new LinkedHashMap<>();
+			selectionEvntList.put("«entity.baseType.fullyQualifiedName».«entity.idAttributeName»", new EventDispatcherEvent(EventDispatcherCommand.SELECT, "«entity.baseType.fullyQualifiedName».«entity.idAttributeName»", "«table.fullyQualifiedName»"));
+			«FOR entityReferenceFQIdName : entity.uniqueReferenceFQIdName.values»
+			selectionEvntList.put("«entityReferenceFQIdName»", new EventDispatcherEvent(EventDispatcherCommand.SELECT, "«entityReferenceFQIdName»", "«table.fullyQualifiedName»"));
+			«ENDFOR»
+			childContext.set("selectionEvnt", selectionEvntList);
 			if ("«gridDtoFqn»".equals(getTaskOperativeDtoFqn())) {
 				childContext.set("inputdata", getTaskInitialOperativeDtos());
 			}
@@ -773,10 +777,11 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 			switch(event.getCommand()) {
 				case SELECT:
 					if(!event.getSender().equals("«table.fullyQualifiedName»")) {
-						if(filterGenerator.selectItem(event, «(table.tabletype as TableTable).selectById.booleanValue»)) {
+						if(filterGenerator.selectItem(event, getSelectById())) {
 							«IF table.isEmbedded || table.task»
 							createComponents();
 							«ELSE»
+							selectedId = event.getData().get(EventDispatcherDataTag.ID);
 							renderData();
 							«ENDIF»
 						}
@@ -877,15 +882,17 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 			«IF table.task»
 				currentTaskId = -1L;
 			«ENDIF»
-			«IF !table.isBean»tables = new ArrayList<CellSetFilterTable>();«ENDIF»
+			tables = new ArrayList<CellSetFilterTable>();
 			tableFilterDecorator = new TableFilterDecorator(dslMetadataService, user.getLocale());
 			// the timeout to begin the filter process after the last key pressed
 			tableFilterDecorator.setTextChangeTimeout(500);
 			parent.setPrimaryStyleName("osbp");
 			parent.setId("parent");
 			parent.setSizeFull();
+			«IF table.isEmbedded»parent.addAttachListener(this);«ENDIF»
 			layoutManager = new ViewLayoutManager();
 			layoutManager.init(parent);
+			this.parent = parent;
 		'''
 		if(table.isGrid) {
 			val entity = EntityUtils.getEntityFromDto(table.dtoGridTable.dtoSource)
@@ -894,18 +901,12 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 			persistenceService.registerPersistenceUnit("«entity?.persistenceUnit»", 
 									«entity?.fullyQualifiedName».class);
 			log.debug("PersistenceService registered");'''
-		} else if(table.isBean) {
-			if((table.tabletype as TableBean).source.datamartRef instanceof DatamartEntity) {
-				body = '''
-				«body»
-				persistenceService.registerPersistenceUnit("«((table.tabletype as TableBean).source.datamartRef as DatamartEntity).entityRef.persistenceUnit»")'''
-			}
 		} else {
 			body = '''
 			«body»
 			datamartInstance = new «getSourceDataMartRefName(table)»Datamart();
 			datamartInstance.setUser(user);
-			filterGenerator = new DatamartFilterGenerator(datamartInstance, dslMetadataService);
+			filterGenerator = new DatamartFilterGenerator(datamartInstance, «IF table.isEmbedded»eclipseContext«ELSE»getContext()«ENDIF», «table.dataMartTable.datamartRef.showCaption», «Integer.max(10, table.dataMartTable.datamartRef.numMultiRows)»);
 			filterGenerator.createUIFilters(layoutManager);
 			'''
 		}
@@ -919,8 +920,6 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		body = '''
 			«body»
 			coordinateSystem = new ArrayList<Integer>();
-			tableSelectDelay = new Refresher();
-			tableRefresher = new Refresher();
 			attributeLookupMap = new HashMap<>();
 			tabSheets = new HashMap<>();'''
 
@@ -931,19 +930,6 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 			toolbarClass = new «table.tabletype.toolbar.name.toString.toFirstUpper»Toolbar(toolbarUUID);
 			toolbarClass.createToolbar(eclipseContext, renderingEngine, themeResourceService);'''
 		}
-		if (table.tabletype.polling) {
-			body = '''
-				«body»
-				tableRefresher.setRefreshInterval(«table.tabletype.pollingTime»*1000);
-				tableRefresher.addListener(new com.github.wolfie.refresher.Refresher.RefreshListener() {
-					@Override
-					public void refresh(final Refresher source) {
-						«table.callDataRefreshMethod»
-					}
-				});
-				layoutManager.addExtension(tableRefresher);
-			'''
-		}
 		body = '''
 			«body»
 			initDone = true;
@@ -964,10 +950,6 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		return table.tabletype instanceof TableTable
 	}
 
-	def boolean isBean(Table table) {
-		return table.tabletype instanceof TableBean
-	}
-	
 	def boolean isEmbedded(Table table) {
 		return table.tabletype.embedded
 	}
@@ -976,76 +958,66 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		return table.tabletype instanceof TableSelection
 	}
 
-	def dataRefresh(Table table) {
-		var body = ""
-		if(table.isBean) {
-			body = 
-			'''
-			«body»
-			if(table != null) {
-				table.refreshRowCache();
-			}
-			'''
-		} else {
-			body = 
-			'''
-			«body»
-			try {
-				// if no current ui found
-				if (UI.getCurrent() == null) {
-					for(CellSetFilterTable table:tables) {
-						UI.setCurrent(table.getUI());
-						break;
+	def renderAllowed(Table table) 
+	'''
+	if (getSelectById() && getSelectedId()==null) {
+		for (DatamartFilter filter : datamartInstance.getFilters()) {
+			List<IDualData> selectedData = filter.getSelectedData();
+			if (!selectedData.isEmpty()) {
+				for (IDualData iDualData : selectedData) {
+					if (!"*".equals(iDualData.getFormattedValue()) || !"*".equals(iDualData.getSelectionValue())){
+						return true;
 					}
 				}
-				if(dataSourceContainer== null || !dataSourceContainer.updateContainer(getCellSet())) {
-					log.debug("cannot update container - full refresh");
-					«IF table.isEmbedded»
-					createComponents();
-					«ELSE»
-					renderData();
-					«ENDIF»
-				}
-				for(CellSetFilterTable table:tables) {
-					table.sanitizeSelection();
-				}
-			} catch (Exception e) {
-				StringWriter sw = new StringWriter();
-				e.printStackTrace(new PrintWriter(sw));
-				String exceptionDetails = sw.toString();
-				log.error("table data refresh:{}", exceptionDetails);
-			}'''
-		}
-		return body
+				return false;
+			}
+		} 
+		return false;
 	}
+	return true;'''
 	
-	/**
-	 * <p>create a handler for user changed.</p> 
-	 *
-	 */
-	def String delegatedTask(Table table) {
+	def dataRefresh(Table table) {
 		var body = ""
-		body = '''
-			«body»
-			new EventHandler() {
-				@Override
-				public void handleEvent(Event event) {
-					EventBrokerMsg msg = (EventBrokerMsg)event.getProperty(EventUtils.DATA);
-					datamartInstance.operations(msg.getLong(), user, msg.getName(), BPMOperation.Delegate);
-				}
-			};
+		body = 
 		'''
+		«body»
+		try {
+			// if no current ui found
+			if (UI.getCurrent() == null) {
+				for(CellSetFilterTable table:tables) {
+					UI.setCurrent(table.getUI());
+					break;
+				}
+			}
+			if(dataSourceContainer== null || !dataSourceContainer.updateContainer(getCellSet())) {
+				log.debug("cannot update container - full refresh");
+				«IF table.isEmbedded»
+				createComponents();
+				«ELSE»
+				renderData();
+				«ENDIF»
+			}
+			for(CellSetFilterTable table:tables) {
+				table.sanitizeSelection();
+			}
+		} catch (Exception e) {
+			StringWriter sw = new StringWriter();
+			e.printStackTrace(new PrintWriter(sw));
+			String exceptionDetails = sw.toString();
+			log.error("table data refresh:{}", exceptionDetails);
+		}'''
 		return body
 	}
-
+	
 	/**
 	 * <p>build the data components.</p> 
 	 *
 	 */
 	def String createComponents(Table table) {
 		var body = ""
-		if (table.dataMartTable !== null && !table.isBean) {
+		if (table.dataMartTable !== null) {
 			body = '''
+				if (renderAllowed()){
 				// get the results
 				final DerivedCellSet cellSet = getCellSet();
 				if (cellSet == null) {
@@ -1062,6 +1034,7 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 					«ENDIF»
 				}
 				getCoordinateSystem().clear();
+				tables.clear();
 				// generate a new result component
 				if (cellSet != null) {
 					// create a multidimensional coordinate system against the cellSet
@@ -1092,6 +1065,7 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 				else {
 					log.error("referenced datamart «table.dataMartTable.datamartRef.name» generates no results");
 				}
+				}
 			'''
 		} else if(table.isGrid) {
 			body = '''
@@ -1107,23 +1081,6 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 				dataComponent.setId("dataComponent");
 				layoutManager.getDataArea().addComponent(dataComponent);
 				layoutManager.getDataArea().setExpandRatio(dataComponent, 1);
-				«table.selectAlways»
-			'''
-		} else if(table.isBean) {
-			body = '''
-				«body»
-				// generate a new result component
-				// remove any previous component
-				if	(dataComponent != null) {
-					layoutManager.getDataArea().removeComponent(dataComponent);
-					dataComponent = null;
-				}
-				dataComponent = createTable();
-				dataComponent.setSizeFull();
-				dataComponent.setId("dataComponent");
-				layoutManager.getDataArea().addComponent(dataComponent);
-				layoutManager.getDataArea().setExpandRatio(dataComponent, 1);
-				«table.selectAlways»
 			'''
 		}
 		return body
@@ -1134,22 +1091,16 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		if (table.isTable && (table.tabletype as TableTable).selectalways) {
 			body = '''
 			«body»
-			tableSelectDelay.setRefreshInterval(1000);
-			if (tableSelectDelay.getListeners(null).size()==0) {
-				tableSelectDelay.addListener(new com.github.wolfie.refresher.Refresher.RefreshListener() {
-					@Override
-					public void refresh(final Refresher source) {
-						// refresh only once
-						source.setRefreshInterval(0);
-						for(CellSetFilterTable table:tables) {
-							if (table.getItemIds().size()>0) {
-								table.select(table.getItemIds().iterator().next());
-							}
+			UI.getCurrent().access(new Runnable() {
+				@Override
+				public void run() {
+					for(CellSetFilterTable table:tables) {
+						if (table.getItemIds().size()>0) {
+							table.select(table.getItemIds().iterator().next());
 						}
 					}
-				});
-				layoutManager.addExtension(tableSelectDelay);
-			}'''
+				}
+			});'''
 		}
 		return body
 	}
@@ -1162,7 +1113,6 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		var body = ""
 		body = '''
 		«body»
-		tables.clear();
 		// either create a recursive tabsheet or a table
 		Component component = null;
 		if	(axisNo == 2) {
@@ -1172,21 +1122,44 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 			Integer axis = axisNo-1;
 			TabSheet tabsheet = new TabSheet();
 			tabsheet.setSizeFull();
-			tabSheets.put(tabsheet, new ArrayList<String>());
+			tabsheet.addSelectedTabChangeListener(new SelectedTabChangeListener() {
+				@Override
+				public void selectedTabChange(SelectedTabChangeEvent event) {
+					if(tabSheets.containsKey(event.getTabSheet())) {
+						getCoordinateSystem().clear();
+						getCoordinateSystem().addAll(getCoordinates(event.getTabSheet()));
+					}
+				}
+				private Collection<? extends Integer> getCoordinates(TabSheet tabsheet) {
+					if(!(tabsheet.getTab(tabsheet.getSelectedTab()) instanceof TabSheet)) {
+						int index = tabsheet.getTabPosition(tabsheet.getTab(tabsheet.getSelectedTab()));
+						return tabSheets.get(tabsheet).get(index);
+					}
+					return getCoordinates((TabSheet)tabsheet.getTab(tabsheet.getSelectedTab()));
+				}
+			});
+			tabSheets.put(tabsheet, new ArrayList<>());
 			DerivedAxis tabAxis = cellSet.getAxes().get(axis);
 			// create a tab page for all tab axis members
 			int tabNo = 0;
 			for	(DerivedPosition column : tabAxis.getPositions()) {
 				// create the title for the axis
+				String title = null;
 				for (DerivedMember member : column.getMembers()) {
-					tabSheets.get(tabsheet).add(member.getCaption());
+					if	(title == null) {
+						title = dslMetadataService.translate(user.getLocale().toLanguageTag(), member.getCaption());
+					}
+					else {
+						title += " / "+dslMetadataService.translate(user.getLocale().toLanguageTag(), member.getCaption());
+					}
 				}
 				// position the data to this coordinate
 				getCoordinateSystem().set(axis, tabNo);
+				tabSheets.get(tabsheet).add(new ArrayList<Integer>(getCoordinateSystem()));
 				component = createTabSheet(cellSet, axis);
 				// set the caption
 				if (component != null) {
-					component.setCaption("");
+					component.setCaption(title);
 					tabsheet.addComponent(component);
 		    		if (component instanceof CellSetFilterTable) {
 			    		tabsheet.addComponent(((CellSetFilterTable)component));
@@ -1229,6 +1202,7 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		var dateLookupIconMap = <String, Map<Double, Map<String, String>>>newHashMap
 		var dateLookupTooltipMap = <String, Map<Double, Map<String, String>>>newHashMap
 		var blobLookupMap = <String, String>newHashMap()
+		var enumLookupMap = <String, String>newHashMap()
 
 		var rowStyle = ""
 
@@ -1264,11 +1238,6 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 			'''
 			multiSelect = (table.tabletype as TableSelection).multiSelection
 		}
-		if	(table.isBean) {
-			constructTable = '''
-				final BeanFilterTable table = new BeanFilterTable();
-			'''
-		}
 		body = '''
 			«body»«constructTable»
 			VerticalLayout tableLayout = new VerticalLayout();
@@ -1281,7 +1250,8 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 			Button b = new Button(null, new Button.ClickListener() {
 			    public void buttonClick(ClickEvent event) {
 			    	taskClient.operations(dataSourceContainer.getTaskId((int)table.getValue()), user, null, BPMOperation.Start);
-					eventBroker.send(EventBrokerMsg.MENU_CLOSE, null);
+					EventDispatcherEvent evnt = new EventDispatcherEvent(EventDispatcherCommand.CLOSE, "UserMenu", "«table.fullyQualifiedName»");
+					eventDispatcher.sendEvent(evnt);
 			    }
 			});
 			b.setIcon(themeResourceService.getThemeResource("task_action_start", ThemeResourceType.ICON));
@@ -1300,19 +1270,18 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 			«IF table.isTable»
 			table.setRowHeaderMode(RowHeaderMode.«IF (table.tabletype as TableTable).headerMode !== null»«(table.tabletype as TableTable).headerMode.name()»«ELSE»HIDDEN«ENDIF»);
 			«ENDIF»
-			«IF table.isBean»
-			table.setRowHeaderMode(RowHeaderMode.«IF (table.tabletype as TableBean).headerMode !== null»«(table.tabletype as TableBean).headerMode.name()»«ELSE»HIDDEN«ENDIF»);
-			«ENDIF»
 			table.setFilterDecorator(tableFilterDecorator);
 			table.setFilterBarVisible(«table.tabletype.filtering.booleanValue»);
 			table.setSelectable(true);
 			table.setSizeFull();
 			tableLayout.addComponent(table);
-			«IF !table.isBean»tables.add(table);«ENDIF»
+			tables.add(table);
 		'''
 
 		// Initialization of the BlobLookupMap
 		table.initBlobLookup(blobLookupMap)
+		// Initialization of the EnumSet
+		table.initEnumLookup(enumLookupMap)
 		table.initIdMap(idMap)
 		if (category_axis.hasDetails) {
 			category_axis.initPropertyLookups(formatMap, 
@@ -1348,19 +1317,15 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 			intervalStyleMap, intervalIconMap, intervalTooltipMap, numberLookupStyleMap, numberLookupIconMap, numberLookupTooltipMap, 
 			intIntervalStyleMap, intIntervalIconMap, intIntervalTooltipMap, intLookupStyleMap, intLookupIconMap, intLookupTooltipMap, 
 			stringLookupStyleMap, stringLookupIconMap, stringLookupTooltipMap, 
-			dateLookupStyleMap, dateLookupIconMap, dateLookupTooltipMap, blobLookupMap)»'''
-		if(!table.isBean) {
-			body = '''
-				«body»dataSourceContainer = new CellSetIndexedContainer(dslMetadataService, user.getLocale(), themeResourceService, blobService, attributeLookupMap, cellSet, coordinateSystem, «table.isDatamartCrossJoined»);
-				table.setContainerDataSource(dataSourceContainer);
-				dataSourceContainer.addExtras(table);
-			'''
-		} else {
-			body = '''
-				«body»dataSourceContainer = new BeanServiceLazyLoadingContainer(factory.createService(«((table.tabletype as TableBean).dataMartTable.datamartRef.fullyQualifiedName)»DatamartContainer.class), «((table.tabletype as TableBean).dataMartTable.datamartRef.fullyQualifiedName)»DatamartContainer.class, null);
-				table.setContainerDataSource(dataSourceContainer);
-			'''
-		}
+			dateLookupStyleMap, dateLookupIconMap, dateLookupTooltipMap, blobLookupMap, enumLookupMap)»'''
+		body = '''
+			«body»// DO NOT MOVE THESE LINES!!!!! The data source container creation has to be before the user properties readings
+			dataSourceContainer = new CellSetIndexedContainer(eclipseContext, attributeLookupMap, cellSet, coordinateSystem, «table.isDatamartCrossJoined»);
+			table.setContainerDataSource(dataSourceContainer);
+			dataSourceContainer.addExtras(table);
+		'''
+		body = '''«body»«tableSettingsByUserProperties»«table.sendEvent»«columnCollapsedListener»«columnReorderListener»«columnResizeListener»
+		'''
 		if (category_axis.hasRowHeight) {
 			body = '''
 				«body»dataSourceContainer.setRowStyle("«rowStyle»");
@@ -1376,7 +1341,6 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 						}
 					}
 				}
-
 			}
 		}
 
@@ -1392,8 +1356,6 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		//			'''
 		//		}
 		// send a selection event if modeled
-		body = '''«body»«table.sendEvent»
-		'''
 		if (table.isSelection) {
 			body = '''
 			«body»
@@ -1547,7 +1509,8 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		HashMap<String, Map<Double, Map<String, String>>> dateLookupStyleMap,
 		HashMap<String, Map<Double, Map<String, String>>> dateLookupIconMap,
 		HashMap<String, Map<Double, Map<String, String>>> dateLookupTooltipMap,
-		HashMap<String, String> blobLookupMap
+		HashMap<String, String> blobLookupMap,
+		HashMap<String, String> enumLookupMap
 	) {
 		var attributes = <String>newHashSet
 		attributes.addAll(formatMap.keySet)
@@ -1570,6 +1533,7 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		attributes.addAll(dateLookupIconMap.keySet)
 		attributes.addAll(dateLookupTooltipMap.keySet)
 		attributes.addAll(blobLookupMap.keySet)
+		attributes.addAll(enumLookupMap.keySet)
 		attributes.addAll(idMap.keySet)
 		var body = ""
 
@@ -1879,6 +1843,14 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 							.setBlob(true, «blobLookupMap.get(attribute)»)
 					'''
 				}
+				// apply all lookup enum information
+				if (enumLookupMap.containsKey(attribute)) {
+					body = '''
+						«body»
+							.setEnum(true, «enumLookupMap.get(attribute)».class)
+					'''
+				}
+				
 			}
 			if(hadAttribute) {
 				body = '''«body»);
@@ -1912,12 +1884,28 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		}
 	}
 	
+	/**
+	 * <p>infer the model's setting for cell configuration including enums.</p> 
+	 *
+	 */
+	def initEnumLookup(Table table, Map<String, String> enumMap) {
+		var datamartSource = table.dataMartTable.datamartRef.source
+		if (datamartSource instanceof DatamartEntity) {
+			// Initial all attributes of the entity
+			for (attribute : (datamartSource as DatamartEntity).entityRef.allAttributes) {
+				if (attribute.typeIsEnum) {
+					enumMap.put('''«attribute?.name?.replace("^", "")»''', '''«attribute?.type?.fullyQualifiedName»''')
+				}
+			}
+		}
+	}
+	
 	def LKeyAndValue getResolution(LEntityAttribute attribute) {
-		if(attribute.properties.exists[key.toLowerCase.equals(AbstractLayoutingStrategy.PROPERTY_BLOB)]) {		// try entity attributes
-			return attribute.properties.findFirst[key.toLowerCase.equals(AbstractLayoutingStrategy.PROPERTY_BLOB)]
+		if(attribute.properties.exists[key.toLowerCase.equals(IPropertyConstants.PROPERTY_BLOB)]) {		// try entity attributes
+			return attribute.properties.findFirst[key.toLowerCase.equals(IPropertyConstants.PROPERTY_BLOB)]
 		} else if (attribute.type instanceof LDataType){	// try data type attributes
-			if((attribute.type as LDataType).properties.exists[key.toLowerCase.equals(AbstractLayoutingStrategy.PROPERTY_BLOB)]) {
-				return (attribute.type as LDataType).properties.findFirst[key.toLowerCase.equals(AbstractLayoutingStrategy.PROPERTY_BLOB)]
+			if((attribute.type as LDataType).properties.exists[key.toLowerCase.equals(IPropertyConstants.PROPERTY_BLOB)]) {
+				return (attribute.type as LDataType).properties.findFirst[key.toLowerCase.equals(IPropertyConstants.PROPERTY_BLOB)]
 			}
 		}
 	}
@@ -2741,6 +2729,16 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 									EventDispatcherEvent evnt = new EventDispatcherEvent(EventDispatcherCommand.SELECT, "«entity.baseType.fullyQualifiedName».«entity.idAttributeName»", "«table.fullyQualifiedName»");
 									evnt.addItem(EventDispatcherDataTag.ID, dataSourceContainer.getValueByProperty(selection, "«alias.toLowerCase»"));
 									eventDispatcher.sendEvent(evnt);
+									for (DatamartPrimary<?> primary : datamartInstance.getPrimaryList()){
+										if (!"«entity.baseType.fullyQualifiedName»".equals(primary.getEntityName())){
+											Object primaryValue = dataSourceContainer.getValueByProperty(selection, primary.getAlias().toLowerCase());
+											if (primaryValue != null) {
+												evnt = new EventDispatcherEvent(EventDispatcherCommand.SELECT, primary.getEntityName() + "." + primary.getAttributeName(), "«table.fullyQualifiedName»");
+												evnt.addItem(EventDispatcherDataTag.ID, primaryValue);
+												eventDispatcher.sendEvent(evnt);
+											}
+										}
+									}
 									«ENDIF»
 							'''
 						}
@@ -2779,6 +2777,88 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		'''
 		return body
 	}
+	
+	def columnResizeListener() 
+'''table.addColumnResizeListener(new ColumnResizeListener(){
+	public void columnResize(ColumnResizeEvent event) {
+		// Get the new width of the resized column
+		int width = event.getCurrentWidth();
+		
+		// Get the property ID of the resized column
+		Object columnId = event.getPropertyId();
+		user.addToProperties(this.getClass().getEnclosingClass().getCanonicalName() + "." + columnId.toString() + "." + "width", String.valueOf(width));
+	}
+});
+// Must be immediate to send the resize events immediately
+table.setImmediate(true);
+'''
+
+	def columnReorderListener() 
+'''table.addColumnReorderListener(new ColumnReorderListener(){
+	public void columnReorder(ColumnReorderEvent event) {
+		Object source = event.getSource();
+		String propertyKey = this.getClass().getEnclosingClass().getCanonicalName() + "." + "columns";
+		if (source instanceof CustomTable){
+			Object[] visibleColumns = ((CustomTable)source).getVisibleColumns();
+			if (visibleColumns!=null){
+				user.addToProperties(propertyKey, visibleColumns);
+			}
+		}
+	}
+});
+'''
+
+	def columnCollapsedListener() 
+'''table.addColumnCollapseListener(new ColumnCollapseListener(){
+	public void columnCollapseStateChange(ColumnCollapseEvent event) {
+		// Get the ID of the column collapse event
+		Object columnId = event.getPropertyId();
+		Object source = event.getSource();
+		String propertyKey = this.getClass().getEnclosingClass().getCanonicalName() + "." + columnId.toString() + "." + "collapsed";
+		if (source instanceof CustomTable){
+			if (((CustomTable)source).isColumnCollapsed(columnId)) {
+				user.addToProperties(propertyKey, "true");
+			} else {
+				user.removeFromProperties(propertyKey);
+			}
+		}
+	}
+});
+'''
+	
+	def tableSettingsByUserProperties() 
+		'''
+		// Setting table columns width from the persisted user properties
+		for (Object visibleId : table.getVisibleColumns()) {
+			String widthStr = user.getColumnUtil().getColumnWidth(this.getClass().getCanonicalName() + "." + visibleId.toString() + "." + "width");
+			if (widthStr!= null) {
+				try {
+					table.setColumnWidth(visibleId, Integer.parseInt(widthStr));
+				} catch (IllegalArgumentException e) {
+					// this occurs if a saved column is no longer existing due to model changes
+				}
+			}
+		}
+		// Setting table collapsed columns from the persisted user properties
+		for (Object propertyId : table.getContainerDataSource().getContainerPropertyIds()) {
+			String collapsedColumn = user.getColumnUtil().getColumnCollapsed(this.getClass().getCanonicalName() + "." + propertyId + "." + "collapsed");
+			try {
+				if (collapsedColumn != null){
+					table.setColumnCollapsed(propertyId, true);
+				}
+			} catch (IllegalArgumentException e) {
+				// this occurs if a saved column is no longer existing due to model changes
+			}
+			Object[] visibleColumns = user.getColumnUtil().getVisibleColumns(this.getClass().getCanonicalName() + "." + "columns");
+			if (visibleColumns != null){
+				try {
+					table.setVisibleColumns(visibleColumns);
+				} catch (IllegalArgumentException e) {
+					// this occurs if a saved column is no longer existing due to model changes
+				}
+			}
+		}
+		'''
 
 	def getMsgValue(LEntityAttribute attribute, String string) '''«CONVERT_METHOD_PREFIX»«attribute.typeName.
 		toFirstUpper»(«string»)'''
@@ -2845,11 +2925,6 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		'''
 		if(initDone) {
 			tableFilterDecorator.setLocale(locale);
-			«IF table.isBean»
-			if(table != null) {
-				table.setLocale(locale);
-			}
-			«ELSE»
 			for(CellSetFilterTable table:tables) {
 				table.setLocale(locale);
 				«IF table.isTable &&
@@ -2858,15 +2933,11 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 					table.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "«(table.dataMartTable as TableDatamart).datamartRef.descriptionValue»"));
 				«ENDIF»
 			}
-			«ENDIF»
 			for(String key:attributeLookupMap.keySet()) {
 				attributeLookupMap.get(key).setLocale(locale);
 			}
-			for(Component tabSheet : tabSheets.keySet()) {
-				((TabSheet)tabSheet).setCaption(tabSheets.get(tabSheet).stream().map(x->dslMetadataService.translate(locale.toLanguageTag(), x)).collect(Collectors.joining("/")));
-			}
 			if(dataSourceContainer != null) {
-				«IF table.isBean»//«ENDIF»dataSourceContainer.setLocale(locale);
+				dataSourceContainer.setLocale(locale);
 			}
 			layoutManager.setLabelValue(dslMetadataService.translate(locale.toLanguageTag(), "«IF table.description»«table.descriptionValue»«ELSE»«table.name»«ENDIF»"));
 		}
@@ -2878,12 +2949,14 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		var alias = null as String
 		var dtoFqn = null as String
 		var keyType = null as LDataType
+		var keyGetter = null as String
 		if (table.dataMartTable instanceof TableDatamart) {
 			switch ((table.dataMartTable as TableDatamart).datamartRef.source) {
 				DatamartEntity: {
 					datamartEntity = ((table.dataMartTable as TableDatamart).datamartRef.source) as DatamartEntity
 					entity = EcoreUtil2.resolve(datamartEntity.entityRef, table.eResource) as LEntity
 					keyType = entity.primaryKeyAttribute.datatype
+					keyGetter = '''get«entity.primaryKeyAttribute.name.toFirstUpper»()''' 
 					alias = DatamartDefinitionUtil.getEntityIdAliasName(entity).toLowerCase
 					dtoFqn = EntityUtils.getDtoFQNForLEntity(entity)
 				}
@@ -2896,7 +2969,7 @@ class TableDSLJvmModelInferrer extends AbstractModelInferrer {
 		if	(operativeDtos != null) {
 			Set<String> ids = new TreeSet<String>();
 		    for	(IDto operativeDto : operativeDtos) {
-		    	ids.add(String.valueOf(((«dtoFqn»)operativeDto).getId()));
+		    	ids.add(String.valueOf(((«dtoFqn»)operativeDto).«keyGetter»));
 		    }
 		    for	(Object selection : dataSourceContainer.getAllItemIds()) {
 		        String idValue = dataSourceContainer.getStringValueByProperty((Integer)selection,"«alias»");
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/jvmmodel/TableModelGenerator.xtend b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/jvmmodel/TableModelGenerator.xtend
index e64d449..563b5d6 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/jvmmodel/TableModelGenerator.xtend
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/jvmmodel/TableModelGenerator.xtend
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
@@ -33,11 +35,14 @@ import com.vaadin.ui.Notification
 import com.vaadin.ui.Notification.Type
 import com.vaadin.ui.TabSheet
 import com.vaadin.ui.UI
+import java.io.PrintWriter
+import java.io.StringWriter
 import java.util.ArrayList
 import java.util.Collection
 import java.util.Date
 import java.util.HashMap
 import java.util.Iterator
+import java.util.LinkedHashMap
 import java.util.List
 import java.util.Locale
 import java.util.Map
@@ -69,6 +74,7 @@ import org.eclipse.osbp.dsl.dto.lib.impl.DtoServiceAccess
 import org.eclipse.osbp.eventbroker.EventBrokerMsg
 import org.eclipse.osbp.preferences.ProductConfiguration
 import org.eclipse.osbp.runtime.common.event.EventDispatcherEvent
+import org.eclipse.osbp.runtime.common.event.IDualData
 import org.eclipse.osbp.runtime.common.filter.IDTOServiceWithMutablePersistence
 import org.eclipse.osbp.runtime.web.vaadin.common.data.IBeanSearchServiceFactory
 import org.eclipse.osbp.ui.api.contextfunction.IViewEmbeddedProvider
@@ -83,6 +89,7 @@ import org.eclipse.osbp.utils.constants.ExtendedDate
 import org.eclipse.osbp.utils.vaadin.SelectUserWindow
 import org.eclipse.osbp.utils.vaadin.ViewLayoutManager
 import org.eclipse.osbp.vaaclipse.common.ecview.api.IECViewSessionHelper
+import org.eclipse.osbp.xtext.action.SelectWorkloadActionEnum
 import org.eclipse.osbp.xtext.basic.generator.BasicDslGeneratorUtils
 import org.eclipse.osbp.xtext.blip.BlipItem
 import org.eclipse.osbp.xtext.datamart.common.AEntityDatamart
@@ -108,9 +115,8 @@ import org.eclipse.xtext.xbase.compiler.ImportManager
 import org.osgi.service.event.Event
 import org.osgi.service.event.EventHandler
 import org.vaadin.hene.popupbutton.PopupButton
-import org.eclipse.osbp.xtext.action.SelectWorkloadActionEnum
-import java.io.StringWriter
-import java.io.PrintWriter
+import com.vaadin.ui.TabSheet.SelectedTabChangeListener
+import com.vaadin.ui.TabSheet.SelectedTabChangeEvent
 
 class TableModelGenerator extends I18NModelGenerator {
 	@Inject TableGridSourceGenerator delegate
@@ -148,13 +154,20 @@ class TableModelGenerator extends I18NModelGenerator {
 			OperativeDtoContainer,
 			DerivedHierarchy,
 			DerivedLevel,
-			IEventBroker,
 			PopupButton,
 			CellSetFilterTable,
 			BeanFilterTable,
 			CellSetPagedFilterTable,
 			CheckboxSelectionCellSetFilterTable,
 			CustomTable,
+			CustomTable.ColumnResizeEvent,
+			CustomTable.ColumnResizeListener,
+			CustomTable.ColumnReorderEvent,
+			CustomTable.ColumnReorderListener,
+			CustomTable.ColumnCollapseEvent,
+			CustomTable.ColumnCollapseListener,
+			SelectedTabChangeListener,
+			SelectedTabChangeEvent,
 			RowHeaderMode,
 			Container,
 			CellSetIndexedContainer,
@@ -209,7 +222,9 @@ class TableModelGenerator extends I18NModelGenerator {
 			BPMTaskUserEvent,
 			SelectWorkloadActionEnum,
 			StringWriter,
-			PrintWriter
+			PrintWriter,
+			LinkedHashMap,
+			IDualData
 		)
 		super.createAppendable(context, importManager, config)
 	}
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/scoping/TableDSLScopeProvider.xtend b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/scoping/TableDSLScopeProvider.xtend
index 5903d28..0e8664a 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/scoping/TableDSLScopeProvider.xtend
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/scoping/TableDSLScopeProvider.xtend
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/validation/TableDSLValidator.xtend b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/validation/TableDSLValidator.xtend
index a4f83a0..a687677 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/validation/TableDSLValidator.xtend
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/validation/TableDSLValidator.xtend
@@ -3,9 +3,11 @@
  *  Copyright (c) 2015 - 2016 - Loetz GmbH&Co.KG, 69115 Heidelberg, Germany 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Loetz GmbH&Co.KG - Initial implementation
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/valueconverter/TableQualifiedNameProvider.java b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/valueconverter/TableQualifiedNameProvider.java
index f3a1c8e..b99b525 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/valueconverter/TableQualifiedNameProvider.java
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/valueconverter/TableQualifiedNameProvider.java
@@ -3,9 +3,11 @@
  *  Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) 
  *                                                                            
  *  All rights reserved. This program and the accompanying materials           
- *  are made available under the terms of the Eclipse Public License v1.0       
+ *  are made available under the terms of the Eclipse Public License 2.0        
  *  which accompanies this distribution, and is available at                  
- *  http://www.eclipse.org/legal/epl-v10.html                                 
+ *  https://www.eclipse.org/legal/epl-2.0/                                 
+ *                                 
+ *  SPDX-License-Identifier: EPL-2.0                                 
  *                                                                            
  *  Contributors:                                                      
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/valueconverter/TableValueConverterService.java b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/valueconverter/TableValueConverterService.java
index 61ec23b..5b9d6aa 100644
--- a/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/valueconverter/TableValueConverterService.java
+++ b/org.eclipse.osbp.xtext.table/src/org/eclipse/osbp/xtext/table/valueconverter/TableValueConverterService.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0 
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  * 		Christophe Loetz - Initial implementation
diff --git a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/formatting/TableDSLFormatter.java b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/formatting/TableDSLFormatter.java
index b7d8b00..268b60c 100644
--- a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/formatting/TableDSLFormatter.java
+++ b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/formatting/TableDSLFormatter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0 
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/generator/TableGridSourceGenerator.java b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/generator/TableGridSourceGenerator.java
index e8b5121..454e184 100644
--- a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/generator/TableGridSourceGenerator.java
+++ b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/generator/TableGridSourceGenerator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0 
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/DateComparator.java b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/DateComparator.java
index 272f97b..3f4dba9 100644
--- a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/DateComparator.java
+++ b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/DateComparator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0 
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/DoubleComparator.java b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/DoubleComparator.java
index 3404043..d3c7bf7 100644
--- a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/DoubleComparator.java
+++ b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/DoubleComparator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0 
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/FormatAttribute.java b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/FormatAttribute.java
index ee30f9f..89878ce 100644
--- a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/FormatAttribute.java
+++ b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/FormatAttribute.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0 
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/IdAttribute.java b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/IdAttribute.java
index b537c4b..79ee69f 100644
--- a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/IdAttribute.java
+++ b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/IdAttribute.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0 
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/IntegerComparator.java b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/IntegerComparator.java
index 425a8d9..8164496 100644
--- a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/IntegerComparator.java
+++ b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/IntegerComparator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0 
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/TableDSLJvmModelInferrer.java b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/TableDSLJvmModelInferrer.java
index 2b69dd0..108e266 100644
--- a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/TableDSLJvmModelInferrer.java
+++ b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/TableDSLJvmModelInferrer.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0 
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
@@ -14,11 +16,12 @@
  */
 package org.eclipse.osbp.xtext.table.jvmmodel;
 
-import com.github.wolfie.refresher.Refresher;
+import com.vaadin.server.ClientConnector;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.VerticalLayout;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -33,7 +36,6 @@ import javax.inject.Named;
 import org.eclipse.e4.core.contexts.IContextFunction;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.core.services.events.IEventBroker;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.workbench.IPresentationEngine;
@@ -51,14 +53,13 @@ import org.eclipse.osbp.dsl.semantic.common.types.LKeyAndValue;
 import org.eclipse.osbp.dsl.semantic.common.types.LScalarType;
 import org.eclipse.osbp.dsl.semantic.entity.LEntity;
 import org.eclipse.osbp.dsl.semantic.entity.LEntityAttribute;
-import org.eclipse.osbp.ecview.extension.strategy.AbstractLayoutingStrategy;
+import org.eclipse.osbp.dsl.semantic.entity.LEntityReference;
 import org.eclipse.osbp.infogrid.api.IGridSourceFacade;
 import org.eclipse.osbp.osgi.hybrid.api.AbstractHybridVaaclipseView;
 import org.eclipse.osbp.runtime.common.event.EventDispatcherEvent;
 import org.eclipse.osbp.runtime.common.event.IEventDispatcher;
+import org.eclipse.osbp.runtime.common.layouting.IPropertyConstants;
 import org.eclipse.osbp.runtime.common.types.ITypeProviderService;
-import org.eclipse.osbp.runtime.web.vaadin.common.data.BeanServiceLazyLoadingContainer;
-import org.eclipse.osbp.runtime.web.vaadin.common.data.IBeanSearchServiceFactory;
 import org.eclipse.osbp.ui.api.contextfunction.IViewEmbeddedProvider;
 import org.eclipse.osbp.ui.api.customfields.IBlobService;
 import org.eclipse.osbp.ui.api.datamart.DatamartFilter;
@@ -94,7 +95,6 @@ import org.eclipse.osbp.xtext.table.TableAggregation;
 import org.eclipse.osbp.xtext.table.TableAllColumns;
 import org.eclipse.osbp.xtext.table.TableAttribute;
 import org.eclipse.osbp.xtext.table.TableAxis;
-import org.eclipse.osbp.xtext.table.TableBean;
 import org.eclipse.osbp.xtext.table.TableCellColor;
 import org.eclipse.osbp.xtext.table.TableColumn;
 import org.eclipse.osbp.xtext.table.TableDSLFactory;
@@ -130,7 +130,6 @@ import org.eclipse.osbp.xtext.table.TableTooltipPattern;
 import org.eclipse.osbp.xtext.table.TableTrend;
 import org.eclipse.osbp.xtext.table.TableValue;
 import org.eclipse.osbp.xtext.table.TableValueElement;
-import org.eclipse.osbp.xtext.table.common.BeanFilterTable;
 import org.eclipse.osbp.xtext.table.common.CellSetFilterTable;
 import org.eclipse.osbp.xtext.table.common.CellSetIndexedContainer;
 import org.eclipse.osbp.xtext.table.common.CheckboxSelectionCellSetFilterTable;
@@ -166,7 +165,6 @@ import org.eclipse.xtext.xbase.lib.IterableExtensions;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
 import org.eclipse.xtext.xbase.lib.StringExtensions;
 import org.osgi.service.component.annotations.Component;
-import org.osgi.service.event.EventHandler;
 import org.slf4j.Logger;
 
 /**
@@ -225,16 +223,11 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
           if (_isGrid) {
             clsName = pkg.getName().toString().concat(".").concat(table.getName()).concat("Grid");
           } else {
-            boolean _isBean = this.isBean(table);
-            if (_isBean) {
-              clsName = pkg.getName().toString().concat(".").concat(table.getName()).concat("Bean");
+            boolean _isSelection = this.isSelection(table);
+            if (_isSelection) {
+              clsName = pkg.getName().toString().concat(".").concat(table.getName()).concat("Select");
             } else {
-              boolean _isSelection = this.isSelection(table);
-              if (_isSelection) {
-                clsName = pkg.getName().toString().concat(".").concat(table.getName()).concat("Select");
-              } else {
-                clsName = pkg.getName().toString().concat(".").concat(table.getName()).concat(StringExtensions.toFirstUpper(this.fileExtension));
-              }
+              clsName = pkg.getName().toString().concat(".").concat(table.getName()).concat(StringExtensions.toFirstUpper(this.fileExtension));
             }
           }
         }
@@ -242,13 +235,14 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
         boolean _isEmbedded_1 = this.isEmbedded(table);
         if (_isEmbedded_1) {
           cls.getSuperTypes().add(this._typeReferenceBuilder.typeRef(IViewEmbeddedProvider.class));
+          cls.getSuperTypes().add(this._typeReferenceBuilder.typeRef(ClientConnector.AttachListener.class));
         } else {
           cls.getSuperTypes().add(this._typeReferenceBuilder.typeRef(AbstractHybridVaaclipseView.class));
         }
         cls.getSuperTypes().add(this._typeReferenceBuilder.typeRef(IUser.UserLocaleListener.class));
         cls.getSuperTypes().add(this._typeReferenceBuilder.typeRef(IEventDispatcher.Receiver.class));
         cls.getSuperTypes().add(this._typeReferenceBuilder.typeRef(IE4Table.class));
-        if ((((!this.isGrid(table)) && (!this.isBean(table))) && (!this.isEmbedded(table)))) {
+        if (((!this.isGrid(table)) && (!this.isEmbedded(table)))) {
           cls.getSuperTypes().add(this._typeReferenceBuilder.typeRef(IDatamartFilterGenerator.FilterChangeListener.class));
         }
         boolean _isTask = this.isTask(table);
@@ -380,12 +374,6 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
       _matched=true;
       return ((TableTable)option).getSource();
     }
-    if (!_matched) {
-      if (option instanceof TableBean) {
-        _matched=true;
-        return ((TableBean)option).getSource();
-      }
-    }
     return null;
   }
   
@@ -441,119 +429,119 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     field = this._jvmTypesBuilder.toField(table, "initDone", this._typeReferenceBuilder.typeRef(boolean.class), _function_1);
     EList<JvmMember> _members_1 = type.getMembers();
     this._jvmTypesBuilder.<JvmField>operator_add(_members_1, field);
+    field = this._jvmTypesBuilder.toField(table, "parent", this._typeReferenceBuilder.typeRef(VerticalLayout.class));
+    EList<JvmMember> _members_2 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_2, field);
     final Procedure1<JvmField> _function_2 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
     };
     field = this._jvmTypesBuilder.toField(table, "eclipseContext", this._typeReferenceBuilder.typeRef(IEclipseContext.class), _function_2);
-    EList<JvmMember> _members_2 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_2, field);
+    EList<JvmMember> _members_3 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_3, field);
     final Procedure1<JvmField> _function_3 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
     };
     field = this._jvmTypesBuilder.toField(table, "user", this._typeReferenceBuilder.typeRef(IUser.class), _function_3);
-    EList<JvmMember> _members_3 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_3, field);
+    EList<JvmMember> _members_4 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_4, field);
     final Procedure1<JvmField> _function_4 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
     };
     field = this._jvmTypesBuilder.toField(table, "eventDispatcher", this._typeReferenceBuilder.typeRef(IEventDispatcher.class), _function_4);
-    EList<JvmMember> _members_4 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_4, field);
-    field = this._jvmTypesBuilder.toField(table, "coordinateSystem", this._typeReferenceBuilder.typeRef(ArrayList.class, this._typeReferenceBuilder.typeRef(Integer.class)));
     EList<JvmMember> _members_5 = type.getMembers();
     this._jvmTypesBuilder.<JvmField>operator_add(_members_5, field);
-    field = this._jvmTypesBuilder.toField(table, "layoutManager", this._typeReferenceBuilder.typeRef(IViewLayoutManager.class));
+    field = this._jvmTypesBuilder.toField(table, "coordinateSystem", this._typeReferenceBuilder.typeRef(ArrayList.class, this._typeReferenceBuilder.typeRef(Integer.class)));
     EList<JvmMember> _members_6 = type.getMembers();
     this._jvmTypesBuilder.<JvmField>operator_add(_members_6, field);
+    field = this._jvmTypesBuilder.toField(table, "layoutManager", this._typeReferenceBuilder.typeRef(IViewLayoutManager.class));
+    EList<JvmMember> _members_7 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_7, field);
     final Procedure1<JvmField> _function_5 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
     };
     field = this._jvmTypesBuilder.toField(table, "dslMetadataService", this._typeReferenceBuilder.typeRef(IDSLMetadataService.class), _function_5);
-    EList<JvmMember> _members_7 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_7, field);
+    EList<JvmMember> _members_8 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_8, field);
     final Procedure1<JvmField> _function_6 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
     };
     field = this._jvmTypesBuilder.toField(table, "blobService", this._typeReferenceBuilder.typeRef(IBlobService.class), _function_6);
-    EList<JvmMember> _members_8 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_8, field);
-    if (((this.getSourceDataMartRefName(table) != null) && (!this.isBean(table)))) {
+    EList<JvmMember> _members_9 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_9, field);
+    final Procedure1<JvmField> _function_7 = (JvmField it) -> {
+      final Procedure1<ITreeAppendable> _function_8 = (ITreeAppendable it_1) -> {
+        StringConcatenation _builder = new StringConcatenation();
+        _builder.append("null");
+        it_1.append(_builder);
+      };
+      this._jvmTypesBuilder.setInitializer(it, _function_8);
+    };
+    field = this._jvmTypesBuilder.toField(table, "selectedId", this._typeReferenceBuilder.typeRef(Object.class), _function_7);
+    field.setVisibility(JvmVisibility.PRIVATE);
+    EList<JvmMember> _members_10 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_10, field);
+    String _sourceDataMartRefName = this.getSourceDataMartRefName(table);
+    boolean _tripleNotEquals = (_sourceDataMartRefName != null);
+    if (_tripleNotEquals) {
       EObject _eContainer = this.getDataMartTable(table).getDatamartRef().eContainer();
       String packageName = this._iQualifiedNameProvider.getFullyQualifiedName(((DatamartPackage) _eContainer)).toString();
       StringConcatenation _builder = new StringConcatenation();
       _builder.append(packageName);
       _builder.append(".");
-      String _sourceDataMartRefName = this.getSourceDataMartRefName(table);
-      _builder.append(_sourceDataMartRefName);
+      String _sourceDataMartRefName_1 = this.getSourceDataMartRefName(table);
+      _builder.append(_sourceDataMartRefName_1);
       _builder.append("Datamart");
       field = this._jvmTypesBuilder.toField(table, "datamartInstance", 
         this._typeReferenceBuilder.typeRef(_builder.toString()));
-      EList<JvmMember> _members_9 = type.getMembers();
-      this._jvmTypesBuilder.<JvmField>operator_add(_members_9, field);
+      EList<JvmMember> _members_11 = type.getMembers();
+      this._jvmTypesBuilder.<JvmField>operator_add(_members_11, field);
       field = this._jvmTypesBuilder.toField(table, "filterGenerator", this._typeReferenceBuilder.typeRef(IDatamartFilterGenerator.class));
-      EList<JvmMember> _members_10 = type.getMembers();
-      this._jvmTypesBuilder.<JvmField>operator_add(_members_10, field);
+      EList<JvmMember> _members_12 = type.getMembers();
+      this._jvmTypesBuilder.<JvmField>operator_add(_members_12, field);
     }
     boolean _isGrid = this.isGrid(table);
     if (_isGrid) {
-      final Procedure1<JvmField> _function_7 = (JvmField it) -> {
-        EList<JvmAnnotationReference> _annotations = it.getAnnotations();
-        JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
-        this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
-      };
-      field = this._jvmTypesBuilder.toField(table, "gridSourceService", this._typeReferenceBuilder.typeRef(IGridSourceFacade.class), _function_7);
-      EList<JvmMember> _members_11 = type.getMembers();
-      this._jvmTypesBuilder.<JvmField>operator_add(_members_11, field);
       final Procedure1<JvmField> _function_8 = (JvmField it) -> {
         EList<JvmAnnotationReference> _annotations = it.getAnnotations();
         JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
         this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
       };
-      field = this._jvmTypesBuilder.toField(table, "ecviewPropsProvider", this._typeReferenceBuilder.typeRef(IECViewSessionHelper.class), _function_8);
-      EList<JvmMember> _members_12 = type.getMembers();
-      this._jvmTypesBuilder.<JvmField>operator_add(_members_12, field);
+      field = this._jvmTypesBuilder.toField(table, "gridSourceService", this._typeReferenceBuilder.typeRef(IGridSourceFacade.class), _function_8);
+      EList<JvmMember> _members_13 = type.getMembers();
+      this._jvmTypesBuilder.<JvmField>operator_add(_members_13, field);
       final Procedure1<JvmField> _function_9 = (JvmField it) -> {
         EList<JvmAnnotationReference> _annotations = it.getAnnotations();
         JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
         this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
       };
-      field = this._jvmTypesBuilder.toField(table, "bundleSpaceTypeProvider", this._typeReferenceBuilder.typeRef(ITypeProviderService.class), _function_9);
-      EList<JvmMember> _members_13 = type.getMembers();
-      this._jvmTypesBuilder.<JvmField>operator_add(_members_13, field);
-      field = this._jvmTypesBuilder.toField(table, "grid", this._typeReferenceBuilder.typeRef("org.eclipse.osbp.infogrid.vaaclipse.SingleInfoGridComponent"));
+      field = this._jvmTypesBuilder.toField(table, "ecviewPropsProvider", this._typeReferenceBuilder.typeRef(IECViewSessionHelper.class), _function_9);
       EList<JvmMember> _members_14 = type.getMembers();
       this._jvmTypesBuilder.<JvmField>operator_add(_members_14, field);
-    }
-    boolean _isBean = this.isBean(table);
-    if (_isBean) {
       final Procedure1<JvmField> _function_10 = (JvmField it) -> {
         EList<JvmAnnotationReference> _annotations = it.getAnnotations();
         JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
         this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
       };
-      field = this._jvmTypesBuilder.toField(table, "factory", this._typeReferenceBuilder.typeRef(IBeanSearchServiceFactory.class), _function_10);
+      field = this._jvmTypesBuilder.toField(table, "bundleSpaceTypeProvider", this._typeReferenceBuilder.typeRef(ITypeProviderService.class), _function_10);
       EList<JvmMember> _members_15 = type.getMembers();
       this._jvmTypesBuilder.<JvmField>operator_add(_members_15, field);
+      field = this._jvmTypesBuilder.toField(table, "grid", this._typeReferenceBuilder.typeRef("org.eclipse.osbp.infogrid.vaaclipse.SingleInfoGridComponent"));
+      EList<JvmMember> _members_16 = type.getMembers();
+      this._jvmTypesBuilder.<JvmField>operator_add(_members_16, field);
     }
-    field = this._jvmTypesBuilder.toField(table, "tableSelectDelay", this._typeReferenceBuilder.typeRef(Refresher.class));
-    EList<JvmMember> _members_16 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_16, field);
-    field = this._jvmTypesBuilder.toField(table, "tableRefresher", this._typeReferenceBuilder.typeRef(Refresher.class));
+    field = this._jvmTypesBuilder.toField(table, "dataComponent", this._typeReferenceBuilder.typeRef(com.vaadin.ui.Component.class));
     EList<JvmMember> _members_17 = type.getMembers();
     this._jvmTypesBuilder.<JvmField>operator_add(_members_17, field);
-    field = this._jvmTypesBuilder.toField(table, "dataComponent", this._typeReferenceBuilder.typeRef(com.vaadin.ui.Component.class));
-    EList<JvmMember> _members_18 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_18, field);
     final Procedure1<JvmField> _function_11 = (JvmField it) -> {
       final Procedure1<ITreeAppendable> _function_12 = (ITreeAppendable it_1) -> {
         StringConcatenation _builder_1 = new StringConcatenation();
@@ -563,72 +551,47 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
       this._jvmTypesBuilder.setInitializer(it, _function_12);
     };
     field = this._jvmTypesBuilder.toField(table, "mustRefresh", this._typeReferenceBuilder.typeRef(boolean.class), _function_11);
-    EList<JvmMember> _members_19 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_19, field);
+    EList<JvmMember> _members_18 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_18, field);
     field = this._jvmTypesBuilder.toField(table, "attributeLookupMap", 
       this._typeReferenceBuilder.typeRef(HashMap.class, this._typeReferenceBuilder.typeRef(String.class), this._typeReferenceBuilder.typeRef(PropertyLookup.class)));
+    EList<JvmMember> _members_19 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_19, field);
+    field = this._jvmTypesBuilder.toField(table, "tabSheets", 
+      this._typeReferenceBuilder.typeRef(HashMap.class, this._typeReferenceBuilder.typeRef(com.vaadin.ui.Component.class), this._typeReferenceBuilder.typeRef(ArrayList.class, this._typeReferenceBuilder.typeRef(ArrayList.class, this._typeReferenceBuilder.typeRef(Integer.class)))));
     EList<JvmMember> _members_20 = type.getMembers();
     this._jvmTypesBuilder.<JvmField>operator_add(_members_20, field);
-    field = this._jvmTypesBuilder.toField(table, "tabSheets", 
-      this._typeReferenceBuilder.typeRef(HashMap.class, this._typeReferenceBuilder.typeRef(com.vaadin.ui.Component.class), this._typeReferenceBuilder.typeRef(ArrayList.class, this._typeReferenceBuilder.typeRef(String.class))));
+    field = this._jvmTypesBuilder.toField(table, "dataSourceContainer", this._typeReferenceBuilder.typeRef(CellSetIndexedContainer.class));
     EList<JvmMember> _members_21 = type.getMembers();
     this._jvmTypesBuilder.<JvmField>operator_add(_members_21, field);
-    boolean _isBean_1 = this.isBean(table);
-    boolean _not = (!_isBean_1);
-    if (_not) {
-      field = this._jvmTypesBuilder.toField(table, "dataSourceContainer", this._typeReferenceBuilder.typeRef(CellSetIndexedContainer.class));
-    } else {
-      field = this._jvmTypesBuilder.toField(table, "dataSourceContainer", this._typeReferenceBuilder.typeRef(BeanServiceLazyLoadingContainer.class, this._typeReferenceBuilder.wildcard()));
-    }
+    field = this._jvmTypesBuilder.toField(table, "operativeDtoContainer", this._typeReferenceBuilder.typeRef(OperativeDtoContainer.class));
     EList<JvmMember> _members_22 = type.getMembers();
     this._jvmTypesBuilder.<JvmField>operator_add(_members_22, field);
-    field = this._jvmTypesBuilder.toField(table, "operativeDtoContainer", this._typeReferenceBuilder.typeRef(OperativeDtoContainer.class));
+    field = this._jvmTypesBuilder.toField(table, "tables", this._typeReferenceBuilder.typeRef(ArrayList.class, this._typeReferenceBuilder.typeRef(CellSetFilterTable.class)));
     EList<JvmMember> _members_23 = type.getMembers();
     this._jvmTypesBuilder.<JvmField>operator_add(_members_23, field);
-    boolean _isBean_2 = this.isBean(table);
-    boolean _not_1 = (!_isBean_2);
-    if (_not_1) {
-      field = this._jvmTypesBuilder.toField(table, "tables", 
-        this._typeReferenceBuilder.typeRef(ArrayList.class, this._typeReferenceBuilder.typeRef(CellSetFilterTable.class)));
-    } else {
-      field = this._jvmTypesBuilder.toField(table, "table", 
-        this._typeReferenceBuilder.typeRef(BeanFilterTable.class));
-    }
-    EList<JvmMember> _members_24 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_24, field);
     final Procedure1<JvmField> _function_12 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
     };
-    field = this._jvmTypesBuilder.toField(table, "eventBroker", this._typeReferenceBuilder.typeRef(IEventBroker.class), _function_12);
-    EList<JvmMember> _members_25 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_25, field);
+    field = this._jvmTypesBuilder.toField(table, "renderingEngine", this._typeReferenceBuilder.typeRef(IPresentationEngine.class), _function_12);
+    EList<JvmMember> _members_24 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_24, field);
     final Procedure1<JvmField> _function_13 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
     };
-    field = this._jvmTypesBuilder.toField(table, "renderingEngine", this._typeReferenceBuilder.typeRef(IPresentationEngine.class), _function_13);
+    field = this._jvmTypesBuilder.toField(table, "themeResourceService", this._typeReferenceBuilder.typeRef(IThemeResourceService.class), _function_13);
+    EList<JvmMember> _members_25 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_25, field);
+    field = this._jvmTypesBuilder.toField(table, "tableFilterDecorator", this._typeReferenceBuilder.typeRef(TableFilterDecorator.class));
     EList<JvmMember> _members_26 = type.getMembers();
     this._jvmTypesBuilder.<JvmField>operator_add(_members_26, field);
-    final Procedure1<JvmField> _function_14 = (JvmField it) -> {
-      EList<JvmAnnotationReference> _annotations = it.getAnnotations();
-      JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
-      this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
-    };
-    field = this._jvmTypesBuilder.toField(table, "themeResourceService", this._typeReferenceBuilder.typeRef(IThemeResourceService.class), _function_14);
-    EList<JvmMember> _members_27 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_27, field);
-    field = this._jvmTypesBuilder.toField(table, "delegatedTask", this._typeReferenceBuilder.typeRef(EventHandler.class));
-    EList<JvmMember> _members_28 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_28, field);
-    field = this._jvmTypesBuilder.toField(table, "tableFilterDecorator", this._typeReferenceBuilder.typeRef(TableFilterDecorator.class));
-    EList<JvmMember> _members_29 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_29, field);
     boolean _isTask = this.isTask(table);
     if (_isTask) {
-      final Procedure1<JvmField> _function_15 = (JvmField it) -> {
+      final Procedure1<JvmField> _function_14 = (JvmField it) -> {
         EList<JvmAnnotationReference> _annotations = it.getAnnotations();
         JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
         this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
@@ -636,20 +599,20 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
         JvmAnnotationReference _annotationRef_1 = this._annotationTypesBuilder.annotationRef(Optional.class);
         this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations_1, _annotationRef_1);
       };
-      field = this._jvmTypesBuilder.toField(table, "taskClient", this._typeReferenceBuilder.typeRef(IBPMTaskClient.class), _function_15);
-      EList<JvmMember> _members_30 = type.getMembers();
-      this._jvmTypesBuilder.<JvmField>operator_add(_members_30, field);
+      field = this._jvmTypesBuilder.toField(table, "taskClient", this._typeReferenceBuilder.typeRef(IBPMTaskClient.class), _function_14);
+      EList<JvmMember> _members_27 = type.getMembers();
+      this._jvmTypesBuilder.<JvmField>operator_add(_members_27, field);
       field = this._jvmTypesBuilder.toField(table, "currentTaskId", this._typeReferenceBuilder.typeRef(Long.class));
-      EList<JvmMember> _members_31 = type.getMembers();
-      this._jvmTypesBuilder.<JvmField>operator_add(_members_31, field);
+      EList<JvmMember> _members_28 = type.getMembers();
+      this._jvmTypesBuilder.<JvmField>operator_add(_members_28, field);
       field = this._jvmTypesBuilder.toField(table, "taskButtons", 
         this._typeReferenceBuilder.typeRef(ArrayList.class, this._typeReferenceBuilder.typeRef(Button.class)));
-      EList<JvmMember> _members_32 = type.getMembers();
-      this._jvmTypesBuilder.<JvmField>operator_add(_members_32, field);
+      EList<JvmMember> _members_29 = type.getMembers();
+      this._jvmTypesBuilder.<JvmField>operator_add(_members_29, field);
     }
     boolean _isSelection = this.isSelection(table);
     if (_isSelection) {
-      final Procedure1<JvmField> _function_16 = (JvmField it) -> {
+      final Procedure1<JvmField> _function_15 = (JvmField it) -> {
         EList<JvmAnnotationReference> _annotations = it.getAnnotations();
         JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
         this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
@@ -657,25 +620,25 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
         JvmAnnotationReference _annotationRef_1 = this._annotationTypesBuilder.annotationRef(Optional.class);
         this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations_1, _annotationRef_1);
       };
-      field = this._jvmTypesBuilder.toField(table, "taskClient", this._typeReferenceBuilder.typeRef(IBPMTaskClient.class), _function_16);
-      EList<JvmMember> _members_33 = type.getMembers();
-      this._jvmTypesBuilder.<JvmField>operator_add(_members_33, field);
+      field = this._jvmTypesBuilder.toField(table, "taskClient", this._typeReferenceBuilder.typeRef(IBPMTaskClient.class), _function_15);
+      EList<JvmMember> _members_30 = type.getMembers();
+      this._jvmTypesBuilder.<JvmField>operator_add(_members_30, field);
       field = this._jvmTypesBuilder.toField(table, "selectTable", this._typeReferenceBuilder.typeRef(CheckboxSelectionCellSetFilterTable.class));
-      EList<JvmMember> _members_34 = type.getMembers();
-      this._jvmTypesBuilder.<JvmField>operator_add(_members_34, field);
+      EList<JvmMember> _members_31 = type.getMembers();
+      this._jvmTypesBuilder.<JvmField>operator_add(_members_31, field);
       field = this._jvmTypesBuilder.toField(table, "workLoadItem", this._typeReferenceBuilder.typeRef(IBlipBPMWorkloadModifiableItem.class));
-      EList<JvmMember> _members_35 = type.getMembers();
-      this._jvmTypesBuilder.<JvmField>operator_add(_members_35, field);
+      EList<JvmMember> _members_32 = type.getMembers();
+      this._jvmTypesBuilder.<JvmField>operator_add(_members_32, field);
       field = this._jvmTypesBuilder.toField(table, "taskSummary", this._typeReferenceBuilder.typeRef(BPMTaskSummary.class));
-      EList<JvmMember> _members_36 = type.getMembers();
-      this._jvmTypesBuilder.<JvmField>operator_add(_members_36, field);
+      EList<JvmMember> _members_33 = type.getMembers();
+      this._jvmTypesBuilder.<JvmField>operator_add(_members_33, field);
     }
     if ((((!this.isEmbedded(table)) && (table.getTabletype().getToolbar() != null)) && (table.getTabletype().getToolbar().eContainer() != null))) {
       EObject _eContainer_1 = table.getTabletype().getToolbar().eContainer();
       String packageName_1 = this._iQualifiedNameProvider.getFullyQualifiedName(((ActionPackage) _eContainer_1)).toString();
       field = this._jvmTypesBuilder.toField(table, "toolbarUUID", this._typeReferenceBuilder.typeRef(String.class));
-      EList<JvmMember> _members_37 = type.getMembers();
-      this._jvmTypesBuilder.<JvmField>operator_add(_members_37, field);
+      EList<JvmMember> _members_34 = type.getMembers();
+      this._jvmTypesBuilder.<JvmField>operator_add(_members_34, field);
       StringConcatenation _builder_1 = new StringConcatenation();
       _builder_1.append(packageName_1);
       _builder_1.append(".");
@@ -683,8 +646,8 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
       _builder_1.append(_firstUpper);
       _builder_1.append("Toolbar");
       field = this._jvmTypesBuilder.toField(table, "toolbarClass", this._typeReferenceBuilder.typeRef(_builder_1.toString()));
-      EList<JvmMember> _members_38 = type.getMembers();
-      this._jvmTypesBuilder.<JvmField>operator_add(_members_38, field);
+      EList<JvmMember> _members_35 = type.getMembers();
+      this._jvmTypesBuilder.<JvmField>operator_add(_members_35, field);
     }
   }
   
@@ -698,107 +661,93 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     operation.setVisibility(JvmVisibility.PUBLIC);
     EList<JvmMember> _members = type.getMembers();
     this._jvmTypesBuilder.<JvmOperation>operator_add(_members, operation);
+    operation = this._jvmTypesBuilder.toGetter(table, "selectedId", 
+      this._typeReferenceBuilder.typeRef(Object.class));
+    operation.setVisibility(JvmVisibility.PUBLIC);
+    EList<JvmMember> _members_1 = type.getMembers();
+    this._jvmTypesBuilder.<JvmOperation>operator_add(_members_1, operation);
   }
   
   /**
    * <p>build the methods.</p>
    */
   public void toOperations(final JvmDeclaredType type, final TablePackage pkg, final Table table) {
-    boolean _isBean = this.isBean(table);
-    boolean _not = (!_isBean);
-    if (_not) {
-      EList<JvmMember> _members = type.getMembers();
-      final Procedure1<JvmOperation> _function = (JvmOperation it) -> {
-        final Procedure1<ITreeAppendable> _function_1 = (ITreeAppendable it_1) -> {
-          StringConcatenation _builder = new StringConcatenation();
-          _builder.append("operativeDtoContainer = null;");
-          _builder.newLine();
-          {
-            TableDatamart _dataMartTable = this.getDataMartTable(table);
-            boolean _tripleNotEquals = (_dataMartTable != null);
-            if (_tripleNotEquals) {
-              _builder.append("DerivedCellSet cellSet = datamartInstance.getResults(");
-              {
-                boolean _isTask = this.isTask(table);
-                if (_isTask) {
-                } else {
-                  {
-                    if ((this.isSelection(table) || this.isEmbedded(table))) {
-                      _builder.append("null, null");
-                    } else {
-                      _builder.append("getTaskOperativeDtoClass(), getTaskInitialOperativeDtos()");
-                    }
+    EList<JvmMember> _members = type.getMembers();
+    final Procedure1<JvmOperation> _function = (JvmOperation it) -> {
+      final Procedure1<ITreeAppendable> _function_1 = (ITreeAppendable it_1) -> {
+        StringConcatenation _builder = new StringConcatenation();
+        _builder.append("operativeDtoContainer = null;");
+        _builder.newLine();
+        {
+          TableDatamart _dataMartTable = this.getDataMartTable(table);
+          boolean _tripleNotEquals = (_dataMartTable != null);
+          if (_tripleNotEquals) {
+            _builder.append("DerivedCellSet cellSet = datamartInstance.getResults(");
+            {
+              boolean _isTask = this.isTask(table);
+              if (_isTask) {
+              } else {
+                {
+                  if ((this.isSelection(table) || this.isEmbedded(table))) {
+                    _builder.append("null, null");
+                  } else {
+                    _builder.append("getTaskOperativeDtoClass(), getTaskInitialOperativeDtos()");
                   }
                 }
               }
-              _builder.append(");");
-              _builder.newLineIfNotEmpty();
-            } else {
-              _builder.append("DerivedCellSet cellSet = null;");
-              _builder.newLine();
             }
+            _builder.append(");");
+            _builder.newLineIfNotEmpty();
+          } else {
+            _builder.append("DerivedCellSet cellSet = null;");
+            _builder.newLine();
           }
-          _builder.append("if\t(cellSet != null) {");
-          _builder.newLine();
-          _builder.append("\t");
-          _builder.append("operativeDtoContainer = cellSet.getOperativeDtoContainer();");
-          _builder.newLine();
-          _builder.append("}");
-          _builder.newLine();
-          _builder.append("return cellSet;");
-          _builder.newLine();
-          it_1.append(_builder);
-        };
-        this._jvmTypesBuilder.setBody(it, _function_1);
+        }
+        _builder.append("if\t(cellSet != null) {");
+        _builder.newLine();
+        _builder.append("\t");
+        _builder.append("operativeDtoContainer = cellSet.getOperativeDtoContainer();");
+        _builder.newLine();
+        _builder.append("}");
+        _builder.newLine();
+        _builder.append("return cellSet;");
+        _builder.newLine();
+        it_1.append(_builder);
       };
-      JvmOperation _method = this._jvmTypesBuilder.toMethod(table, "getCellSet", this._typeReferenceBuilder.typeRef(DerivedCellSet.class), _function);
-      this._jvmTypesBuilder.<JvmOperation>operator_add(_members, _method);
-    }
+      this._jvmTypesBuilder.setBody(it, _function_1);
+    };
+    JvmOperation _method = this._jvmTypesBuilder.toMethod(table, "getCellSet", this._typeReferenceBuilder.typeRef(DerivedCellSet.class), _function);
+    this._jvmTypesBuilder.<JvmOperation>operator_add(_members, _method);
     EList<JvmMember> _members_1 = type.getMembers();
     final Procedure1<JvmOperation> _function_1 = (JvmOperation it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Focus.class);
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
-      boolean _isBean_1 = this.isBean(table);
-      if (_isBean_1) {
+      boolean _isGrid = this.isGrid(table);
+      if (_isGrid) {
         final Procedure1<ITreeAppendable> _function_2 = (ITreeAppendable it_1) -> {
           StringConcatenation _builder = new StringConcatenation();
-          _builder.append("if(table != null) {");
+          _builder.append("if(grid != null) {");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("table.focus();");
+          _builder.append("grid.focus();");
           _builder.newLine();
           _builder.append("}");
           it_1.append(_builder);
         };
         this._jvmTypesBuilder.setBody(it, _function_2);
       } else {
-        boolean _isGrid = this.isGrid(table);
-        if (_isGrid) {
-          final Procedure1<ITreeAppendable> _function_3 = (ITreeAppendable it_1) -> {
-            StringConcatenation _builder = new StringConcatenation();
-            _builder.append("if(grid != null) {");
-            _builder.newLine();
-            _builder.append("\t");
-            _builder.append("grid.focus();");
-            _builder.newLine();
-            _builder.append("}");
-            it_1.append(_builder);
-          };
-          this._jvmTypesBuilder.setBody(it, _function_3);
-        } else {
-          final Procedure1<ITreeAppendable> _function_4 = (ITreeAppendable it_1) -> {
-            StringConcatenation _builder = new StringConcatenation();
-            _builder.append("if(!tables.isEmpty()) {");
-            _builder.newLine();
-            _builder.append("\t");
-            _builder.append("tables.get(0).focus();");
-            _builder.newLine();
-            _builder.append("}");
-            it_1.append(_builder);
-          };
-          this._jvmTypesBuilder.setBody(it, _function_4);
-        }
+        final Procedure1<ITreeAppendable> _function_3 = (ITreeAppendable it_1) -> {
+          StringConcatenation _builder = new StringConcatenation();
+          _builder.append("if(tables != null && !tables.isEmpty()) {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("tables.get(0).focus();");
+          _builder.newLine();
+          _builder.append("}");
+          it_1.append(_builder);
+        };
+        this._jvmTypesBuilder.setBody(it, _function_3);
       }
     };
     JvmOperation _method_1 = this._jvmTypesBuilder.toMethod(table, "setFocus", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_1);
@@ -824,18 +773,11 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
           }
         }
         {
-          if ((((!this.isGrid(table)) && (!this.isBean(table))) && (!this.isEmbedded(table)))) {
+          if (((!this.isGrid(table)) && (!this.isEmbedded(table)))) {
             _builder.append("filterGenerator.addFilterChangeListener(this);");
             _builder.newLine();
           }
         }
-        _builder.append("if(mustRefresh){");
-        _builder.newLine();
-        _builder.append("\t");
-        String _callDataRefreshMethod = this.getCallDataRefreshMethod(table);
-        _builder.append(_callDataRefreshMethod, "\t");
-        _builder.newLineIfNotEmpty();
-        _builder.append("}");
         it_1.append(_builder);
       };
       this._jvmTypesBuilder.setBody(it, _function_3);
@@ -863,7 +805,7 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
           }
         }
         {
-          if ((((!this.isGrid(table)) && (!this.isBean(table))) && (!this.isEmbedded(table)))) {
+          if (((!this.isGrid(table)) && (!this.isEmbedded(table)))) {
             _builder.append("filterGenerator.removeFilterChangeListener(this);");
             _builder.newLine();
           }
@@ -907,90 +849,97 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     };
     JvmOperation _method_5 = this._jvmTypesBuilder.toMethod(table, "createComponents", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_5);
     this._jvmTypesBuilder.<JvmOperation>operator_add(_members_5, _method_5);
+    EList<JvmMember> _members_6 = type.getMembers();
+    final Procedure1<JvmOperation> _function_6 = (JvmOperation it) -> {
+      this._jvmTypesBuilder.setDocumentation(it, this._jvmTypesBuilder.getDocumentation(table.getTabletype()));
+      it.setVisibility(JvmVisibility.PRIVATE);
+      final Procedure1<ITreeAppendable> _function_7 = (ITreeAppendable it_1) -> {
+        StringConcatenation _builder = new StringConcatenation();
+        _builder.append("return ");
+        {
+          TableOption _tabletype = table.getTabletype();
+          if ((_tabletype instanceof TableTable)) {
+            TableOption _tabletype_1 = table.getTabletype();
+            boolean _booleanValue = Boolean.valueOf(((TableTable) _tabletype_1).isSelectById()).booleanValue();
+            _builder.append(_booleanValue);
+          } else {
+            _builder.append("false");
+          }
+        }
+        _builder.append(";");
+        it_1.append(_builder);
+      };
+      this._jvmTypesBuilder.setBody(it, _function_7);
+    };
+    JvmOperation _method_6 = this._jvmTypesBuilder.toMethod(table, "getSelectById", this._typeReferenceBuilder.typeRef(boolean.class), _function_6);
+    this._jvmTypesBuilder.<JvmOperation>operator_add(_members_6, _method_6);
     TableOption _tabletype = table.getTabletype();
     boolean _matched = false;
     if (_tabletype instanceof TableTable) {
       _matched=true;
-      EList<JvmMember> _members_6 = type.getMembers();
-      final Procedure1<JvmOperation> _function_6 = (JvmOperation it) -> {
+      EList<JvmMember> _members_7 = type.getMembers();
+      final Procedure1<JvmOperation> _function_7 = (JvmOperation it) -> {
         EList<JvmFormalParameter> _parameters = it.getParameters();
         JvmFormalParameter _parameter = this._jvmTypesBuilder.toParameter(table, "cellSet", this._typeReferenceBuilder.typeRef(DerivedCellSet.class));
         this._jvmTypesBuilder.<JvmFormalParameter>operator_add(_parameters, _parameter);
         EList<JvmFormalParameter> _parameters_1 = it.getParameters();
         JvmFormalParameter _parameter_1 = this._jvmTypesBuilder.toParameter(table, "axisNo", this._typeReferenceBuilder.typeRef(Integer.class));
         this._jvmTypesBuilder.<JvmFormalParameter>operator_add(_parameters_1, _parameter_1);
-        final Procedure1<ITreeAppendable> _function_7 = (ITreeAppendable it_1) -> {
+        final Procedure1<ITreeAppendable> _function_8 = (ITreeAppendable it_1) -> {
           StringConcatenation _builder = new StringConcatenation();
           String _createTabSheet = this.createTabSheet(table);
           _builder.append(_createTabSheet);
           it_1.append(_builder);
         };
-        this._jvmTypesBuilder.setBody(it, _function_7);
+        this._jvmTypesBuilder.setBody(it, _function_8);
       };
-      JvmOperation _method_6 = this._jvmTypesBuilder.toMethod(table, "createTabSheet", this._typeReferenceBuilder.typeRef(com.vaadin.ui.Component.class), _function_6);
-      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_6, _method_6);
-      EList<JvmMember> _members_7 = type.getMembers();
-      final Procedure1<JvmOperation> _function_7 = (JvmOperation it) -> {
+      JvmOperation _method_7 = this._jvmTypesBuilder.toMethod(table, "createTabSheet", this._typeReferenceBuilder.typeRef(com.vaadin.ui.Component.class), _function_7);
+      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_7, _method_7);
+      EList<JvmMember> _members_8 = type.getMembers();
+      final Procedure1<JvmOperation> _function_8 = (JvmOperation it) -> {
         EList<JvmFormalParameter> _parameters = it.getParameters();
         JvmFormalParameter _parameter = this._jvmTypesBuilder.toParameter(table, "cellSet", this._typeReferenceBuilder.typeRef(DerivedCellSet.class));
         this._jvmTypesBuilder.<JvmFormalParameter>operator_add(_parameters, _parameter);
-        final Procedure1<ITreeAppendable> _function_8 = (ITreeAppendable it_1) -> {
+        final Procedure1<ITreeAppendable> _function_9 = (ITreeAppendable it_1) -> {
           StringConcatenation _builder = new StringConcatenation();
           String _createTable = this.createTable(table);
           _builder.append(_createTable);
           it_1.append(_builder);
         };
-        this._jvmTypesBuilder.setBody(it, _function_8);
+        this._jvmTypesBuilder.setBody(it, _function_9);
       };
-      JvmOperation _method_7 = this._jvmTypesBuilder.toMethod(table, "createTable", this._typeReferenceBuilder.typeRef(com.vaadin.ui.Component.class), _function_7);
-      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_7, _method_7);
-      EList<JvmMember> _members_8 = type.getMembers();
-      final Procedure1<JvmOperation> _function_8 = (JvmOperation it) -> {
-        final Procedure1<ITreeAppendable> _function_9 = (ITreeAppendable it_1) -> {
+      JvmOperation _method_8 = this._jvmTypesBuilder.toMethod(table, "createTable", this._typeReferenceBuilder.typeRef(com.vaadin.ui.Component.class), _function_8);
+      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_8, _method_8);
+      EList<JvmMember> _members_9 = type.getMembers();
+      final Procedure1<JvmOperation> _function_9 = (JvmOperation it) -> {
+        final Procedure1<ITreeAppendable> _function_10 = (ITreeAppendable it_1) -> {
           StringConcatenation _builder = new StringConcatenation();
           String _dataRefresh = this.dataRefresh(table);
           _builder.append(_dataRefresh);
           it_1.append(_builder);
         };
-        this._jvmTypesBuilder.setBody(it, _function_9);
+        this._jvmTypesBuilder.setBody(it, _function_10);
       };
-      JvmOperation _method_8 = this._jvmTypesBuilder.toMethod(table, "dataRefresh", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_8);
-      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_8, _method_8);
-    }
-    if (!_matched) {
-      if (_tabletype instanceof TableBean) {
-        _matched=true;
-        EList<JvmMember> _members_6 = type.getMembers();
-        final Procedure1<JvmOperation> _function_6 = (JvmOperation it) -> {
-          final Procedure1<ITreeAppendable> _function_7 = (ITreeAppendable it_1) -> {
-            StringConcatenation _builder = new StringConcatenation();
-            String _createTable = this.createTable(table);
-            _builder.append(_createTable);
-            it_1.append(_builder);
-          };
-          this._jvmTypesBuilder.setBody(it, _function_7);
-        };
-        JvmOperation _method_6 = this._jvmTypesBuilder.toMethod(table, "createTable", this._typeReferenceBuilder.typeRef(com.vaadin.ui.Component.class), _function_6);
-        this._jvmTypesBuilder.<JvmOperation>operator_add(_members_6, _method_6);
-        EList<JvmMember> _members_7 = type.getMembers();
-        final Procedure1<JvmOperation> _function_7 = (JvmOperation it) -> {
-          final Procedure1<ITreeAppendable> _function_8 = (ITreeAppendable it_1) -> {
-            StringConcatenation _builder = new StringConcatenation();
-            String _dataRefresh = this.dataRefresh(table);
-            _builder.append(_dataRefresh);
-            it_1.append(_builder);
-          };
-          this._jvmTypesBuilder.setBody(it, _function_8);
+      JvmOperation _method_9 = this._jvmTypesBuilder.toMethod(table, "dataRefresh", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_9);
+      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_9, _method_9);
+      EList<JvmMember> _members_10 = type.getMembers();
+      final Procedure1<JvmOperation> _function_10 = (JvmOperation it) -> {
+        final Procedure1<ITreeAppendable> _function_11 = (ITreeAppendable it_1) -> {
+          StringConcatenation _builder = new StringConcatenation();
+          CharSequence _renderAllowed = this.renderAllowed(table);
+          _builder.append(_renderAllowed);
+          it_1.append(_builder);
         };
-        JvmOperation _method_7 = this._jvmTypesBuilder.toMethod(table, "dataRefresh", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_7);
-        this._jvmTypesBuilder.<JvmOperation>operator_add(_members_7, _method_7);
-      }
+        this._jvmTypesBuilder.setBody(it, _function_11);
+      };
+      JvmOperation _method_10 = this._jvmTypesBuilder.toMethod(table, "renderAllowed", this._typeReferenceBuilder.typeRef(boolean.class), _function_10);
+      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_10, _method_10);
     }
     if (!_matched) {
       if (_tabletype instanceof TableGrid) {
         _matched=true;
-        EList<JvmMember> _members_6 = type.getMembers();
-        final Procedure1<JvmOperation> _function_6 = (JvmOperation it) -> {
+        EList<JvmMember> _members_7 = type.getMembers();
+        final Procedure1<JvmOperation> _function_7 = (JvmOperation it) -> {
           QualifiedName _fullyQualifiedName = this._iQualifiedNameProvider.getFullyQualifiedName(this.getDtoGridTable(table).getDtoSource());
           String _string = null;
           if (_fullyQualifiedName!=null) {
@@ -999,7 +948,7 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
           final String gridDtoFqn = _string;
           EObject _resolve = EcoreUtil2.resolve(this.getDtoGridTable(table).getDtoSource().getWrappedType(), table.eResource());
           final LEntity entity = ((LEntity) _resolve);
-          final Procedure1<ITreeAppendable> _function_7 = (ITreeAppendable it_1) -> {
+          final Procedure1<ITreeAppendable> _function_8 = (ITreeAppendable it_1) -> {
             StringConcatenation _builder = new StringConcatenation();
             CharSequence _createGridComponent = this.createGridComponent(pkg, table, entity, gridDtoFqn);
             _builder.append(_createGridComponent);
@@ -1007,14 +956,14 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
             _builder.append("return grid;");
             it_1.append(_builder);
           };
-          this._jvmTypesBuilder.setBody(it, _function_7);
+          this._jvmTypesBuilder.setBody(it, _function_8);
         };
-        JvmOperation _method_6 = this._jvmTypesBuilder.toMethod(table, "createDtoGrid", this._typeReferenceBuilder.typeRef(com.vaadin.ui.Component.class), _function_6);
-        this._jvmTypesBuilder.<JvmOperation>operator_add(_members_6, _method_6);
+        JvmOperation _method_7 = this._jvmTypesBuilder.toMethod(table, "createDtoGrid", this._typeReferenceBuilder.typeRef(com.vaadin.ui.Component.class), _function_7);
+        this._jvmTypesBuilder.<JvmOperation>operator_add(_members_7, _method_7);
       }
     }
-    EList<JvmMember> _members_6 = type.getMembers();
-    final Procedure1<JvmOperation> _function_6 = (JvmOperation it) -> {
+    EList<JvmMember> _members_7 = type.getMembers();
+    final Procedure1<JvmOperation> _function_7 = (JvmOperation it) -> {
       it.setVisibility(JvmVisibility.PUBLIC);
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Override.class);
@@ -1022,18 +971,18 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
       EList<JvmFormalParameter> _parameters = it.getParameters();
       JvmFormalParameter _parameter = this._jvmTypesBuilder.toParameter(table, "locale", this._typeReferenceBuilder.typeRef(Locale.class));
       this._jvmTypesBuilder.<JvmFormalParameter>operator_add(_parameters, _parameter);
-      final Procedure1<ITreeAppendable> _function_7 = (ITreeAppendable it_1) -> {
+      final Procedure1<ITreeAppendable> _function_8 = (ITreeAppendable it_1) -> {
         StringConcatenation _builder = new StringConcatenation();
         CharSequence _localeChanged = this.localeChanged(table);
         _builder.append(_localeChanged);
         it_1.append(_builder);
       };
-      this._jvmTypesBuilder.setBody(it, _function_7);
+      this._jvmTypesBuilder.setBody(it, _function_8);
     };
-    JvmOperation _method_6 = this._jvmTypesBuilder.toMethod(table, "localeChanged", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_6);
-    this._jvmTypesBuilder.<JvmOperation>operator_add(_members_6, _method_6);
-    EList<JvmMember> _members_7 = type.getMembers();
-    final Procedure1<JvmOperation> _function_7 = (JvmOperation it) -> {
+    JvmOperation _method_7 = this._jvmTypesBuilder.toMethod(table, "localeChanged", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_7);
+    this._jvmTypesBuilder.<JvmOperation>operator_add(_members_7, _method_7);
+    EList<JvmMember> _members_8 = type.getMembers();
+    final Procedure1<JvmOperation> _function_8 = (JvmOperation it) -> {
       it.setVisibility(JvmVisibility.PUBLIC);
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Override.class);
@@ -1041,19 +990,19 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
       EList<JvmFormalParameter> _parameters = it.getParameters();
       JvmFormalParameter _parameter = this._jvmTypesBuilder.toParameter(table, "event", this._typeReferenceBuilder.typeRef(EventDispatcherEvent.class));
       this._jvmTypesBuilder.<JvmFormalParameter>operator_add(_parameters, _parameter);
-      final Procedure1<ITreeAppendable> _function_8 = (ITreeAppendable it_1) -> {
+      final Procedure1<ITreeAppendable> _function_9 = (ITreeAppendable it_1) -> {
         StringConcatenation _builder = new StringConcatenation();
         String _receiveEvent = this.receiveEvent(table);
         _builder.append(_receiveEvent);
         it_1.append(_builder);
       };
-      this._jvmTypesBuilder.setBody(it, _function_8);
+      this._jvmTypesBuilder.setBody(it, _function_9);
     };
-    JvmOperation _method_7 = this._jvmTypesBuilder.toMethod(table, "receiveEvent", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_7);
-    this._jvmTypesBuilder.<JvmOperation>operator_add(_members_7, _method_7);
-    if ((((!this.isGrid(table)) && (!this.isBean(table))) && (!this.isEmbedded(table)))) {
-      EList<JvmMember> _members_8 = type.getMembers();
-      final Procedure1<JvmOperation> _function_8 = (JvmOperation it) -> {
+    JvmOperation _method_8 = this._jvmTypesBuilder.toMethod(table, "receiveEvent", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_8);
+    this._jvmTypesBuilder.<JvmOperation>operator_add(_members_8, _method_8);
+    if (((!this.isGrid(table)) && (!this.isEmbedded(table)))) {
+      EList<JvmMember> _members_9 = type.getMembers();
+      final Procedure1<JvmOperation> _function_9 = (JvmOperation it) -> {
         EList<JvmFormalParameter> _parameters = it.getParameters();
         JvmFormalParameter _parameter = this._jvmTypesBuilder.toParameter(table, "changedFilter", this._typeReferenceBuilder.typeRef(DatamartFilter.class));
         this._jvmTypesBuilder.<JvmFormalParameter>operator_add(_parameters, _parameter);
@@ -1061,21 +1010,21 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
         EList<JvmAnnotationReference> _annotations = it.getAnnotations();
         JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Override.class);
         this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
-        final Procedure1<ITreeAppendable> _function_9 = (ITreeAppendable it_1) -> {
+        final Procedure1<ITreeAppendable> _function_10 = (ITreeAppendable it_1) -> {
           StringConcatenation _builder = new StringConcatenation();
           String _filterChanged = this.filterChanged(table);
           _builder.append(_filterChanged);
           it_1.append(_builder);
         };
-        this._jvmTypesBuilder.setBody(it, _function_9);
+        this._jvmTypesBuilder.setBody(it, _function_10);
       };
-      JvmOperation _method_8 = this._jvmTypesBuilder.toMethod(table, "filterChanged", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_8);
-      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_8, _method_8);
+      JvmOperation _method_9 = this._jvmTypesBuilder.toMethod(table, "filterChanged", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_9);
+      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_9, _method_9);
     }
     boolean _isTask = this.isTask(table);
     if (_isTask) {
-      EList<JvmMember> _members_9 = type.getMembers();
-      final Procedure1<JvmOperation> _function_9 = (JvmOperation it) -> {
+      EList<JvmMember> _members_10 = type.getMembers();
+      final Procedure1<JvmOperation> _function_10 = (JvmOperation it) -> {
         EList<JvmFormalParameter> _parameters = it.getParameters();
         JvmFormalParameter _parameter = this._jvmTypesBuilder.toParameter(table, "type", this._typeReferenceBuilder.typeRef(BPMTaskEventType.class));
         this._jvmTypesBuilder.<JvmFormalParameter>operator_add(_parameters, _parameter);
@@ -1086,50 +1035,50 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
         EList<JvmAnnotationReference> _annotations = it.getAnnotations();
         JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Override.class);
         this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
-        final Procedure1<ITreeAppendable> _function_10 = (ITreeAppendable it_1) -> {
+        final Procedure1<ITreeAppendable> _function_11 = (ITreeAppendable it_1) -> {
           StringConcatenation _builder = new StringConcatenation();
           CharSequence _notifyTaskEvent = this.notifyTaskEvent(table);
           _builder.append(_notifyTaskEvent);
           it_1.append(_builder);
         };
-        this._jvmTypesBuilder.setBody(it, _function_10);
+        this._jvmTypesBuilder.setBody(it, _function_11);
       };
-      JvmOperation _method_9 = this._jvmTypesBuilder.toMethod(table, "notifyTaskEvent", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_9);
-      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_9, _method_9);
-      EList<JvmMember> _members_10 = type.getMembers();
-      final Procedure1<JvmOperation> _function_10 = (JvmOperation it) -> {
+      JvmOperation _method_10 = this._jvmTypesBuilder.toMethod(table, "notifyTaskEvent", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_10);
+      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_10, _method_10);
+      EList<JvmMember> _members_11 = type.getMembers();
+      final Procedure1<JvmOperation> _function_11 = (JvmOperation it) -> {
         it.setVisibility(JvmVisibility.PUBLIC);
         EList<JvmAnnotationReference> _annotations = it.getAnnotations();
         JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Override.class);
         this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
-        final Procedure1<ITreeAppendable> _function_11 = (ITreeAppendable it_1) -> {
+        final Procedure1<ITreeAppendable> _function_12 = (ITreeAppendable it_1) -> {
           StringConcatenation _builder = new StringConcatenation();
           CharSequence _notifyTaskEvent = this.notifyTaskEvent(table);
           _builder.append(_notifyTaskEvent);
           it_1.append(_builder);
         };
-        this._jvmTypesBuilder.setBody(it, _function_11);
+        this._jvmTypesBuilder.setBody(it, _function_12);
       };
-      JvmOperation _method_10 = this._jvmTypesBuilder.toMethod(table, "notifyProcessCompletedEvent", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_10);
-      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_10, _method_10);
+      JvmOperation _method_11 = this._jvmTypesBuilder.toMethod(table, "notifyProcessCompletedEvent", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_11);
+      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_11, _method_11);
     }
     boolean _isSelection = this.isSelection(table);
     if (_isSelection) {
-      EList<JvmMember> _members_11 = type.getMembers();
-      final Procedure1<JvmOperation> _function_11 = (JvmOperation it) -> {
+      EList<JvmMember> _members_12 = type.getMembers();
+      final Procedure1<JvmOperation> _function_12 = (JvmOperation it) -> {
         it.setVisibility(JvmVisibility.PUBLIC);
-        final Procedure1<ITreeAppendable> _function_12 = (ITreeAppendable it_1) -> {
+        final Procedure1<ITreeAppendable> _function_13 = (ITreeAppendable it_1) -> {
           StringConcatenation _builder = new StringConcatenation();
           CharSequence _selectItemsFromWorkloadDto = this.selectItemsFromWorkloadDto(table);
           _builder.append(_selectItemsFromWorkloadDto);
           it_1.append(_builder);
         };
-        this._jvmTypesBuilder.setBody(it, _function_12);
+        this._jvmTypesBuilder.setBody(it, _function_13);
       };
-      JvmOperation _method_11 = this._jvmTypesBuilder.toMethod(table, "selectItemsFromWorkloadDto", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_11);
-      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_11, _method_11);
-      EList<JvmMember> _members_12 = type.getMembers();
-      final Procedure1<JvmOperation> _function_12 = (JvmOperation it) -> {
+      JvmOperation _method_12 = this._jvmTypesBuilder.toMethod(table, "selectItemsFromWorkloadDto", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_12);
+      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_12, _method_12);
+      EList<JvmMember> _members_13 = type.getMembers();
+      final Procedure1<JvmOperation> _function_13 = (JvmOperation it) -> {
         it.setVisibility(JvmVisibility.PUBLIC);
         EList<JvmAnnotationReference> _annotations = it.getAnnotations();
         JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Override.class);
@@ -1140,16 +1089,45 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
         EList<JvmFormalParameter> _parameters_1 = it.getParameters();
         JvmFormalParameter _parameter_1 = this._jvmTypesBuilder.toParameter(table, "selected", this._typeReferenceBuilder.typeRef(boolean.class));
         this._jvmTypesBuilder.<JvmFormalParameter>operator_add(_parameters_1, _parameter_1);
-        final Procedure1<ITreeAppendable> _function_13 = (ITreeAppendable it_1) -> {
+        final Procedure1<ITreeAppendable> _function_14 = (ITreeAppendable it_1) -> {
           StringConcatenation _builder = new StringConcatenation();
           CharSequence _rowChecked = this.rowChecked(table);
           _builder.append(_rowChecked);
           it_1.append(_builder);
         };
-        this._jvmTypesBuilder.setBody(it, _function_13);
+        this._jvmTypesBuilder.setBody(it, _function_14);
       };
-      JvmOperation _method_12 = this._jvmTypesBuilder.toMethod(table, "rowChecked", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_12);
-      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_12, _method_12);
+      JvmOperation _method_13 = this._jvmTypesBuilder.toMethod(table, "rowChecked", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_13);
+      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_13, _method_13);
+    }
+    boolean _isEmbedded = this.isEmbedded(table);
+    if (_isEmbedded) {
+      EList<JvmMember> _members_14 = type.getMembers();
+      final Procedure1<JvmOperation> _function_14 = (JvmOperation it) -> {
+        it.setVisibility(JvmVisibility.PUBLIC);
+        EList<JvmAnnotationReference> _annotations = it.getAnnotations();
+        JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Override.class);
+        this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
+        EList<JvmFormalParameter> _parameters = it.getParameters();
+        JvmFormalParameter _parameter = this._jvmTypesBuilder.toParameter(table, "event", this._typeReferenceBuilder.typeRef(ClientConnector.AttachEvent.class));
+        this._jvmTypesBuilder.<JvmFormalParameter>operator_add(_parameters, _parameter);
+        final Procedure1<ITreeAppendable> _function_15 = (ITreeAppendable it_1) -> {
+          StringConcatenation _builder = new StringConcatenation();
+          _builder.append("if(mustRefresh){");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("dataRefresh();");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("mustRefresh = false;");
+          _builder.newLine();
+          _builder.append("}");
+          it_1.append(_builder);
+        };
+        this._jvmTypesBuilder.setBody(it, _function_15);
+      };
+      JvmOperation _method_14 = this._jvmTypesBuilder.toMethod(table, "attach", this._typeReferenceBuilder.typeRef(Void.TYPE), _function_14);
+      this._jvmTypesBuilder.<JvmOperation>operator_add(_members_14, _method_14);
     }
   }
   
@@ -1162,6 +1140,27 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     return entityRef;
   }
   
+  private Map<String, String> getUniqueReferenceFQIdName(final LEntity entity) {
+    Map<String, String> uniqueReferenceNames = new HashMap<String, String>();
+    List<LEntityReference> _allReferences = entity.getAllReferences();
+    for (final LEntityReference entityReference : _allReferences) {
+      {
+        String uniqueReferenceName = uniqueReferenceNames.get(this._iQualifiedNameProvider.getFullyQualifiedName(entityReference.getType()));
+        if ((uniqueReferenceName == null)) {
+          StringConcatenation _builder = new StringConcatenation();
+          QualifiedName _fullyQualifiedName = this._iQualifiedNameProvider.getFullyQualifiedName(entityReference.getType());
+          _builder.append(_fullyQualifiedName);
+          _builder.append(".");
+          String _idAttributeName = entityReference.getType().getIdAttributeName();
+          _builder.append(_idAttributeName);
+          uniqueReferenceName = _builder.toString();
+          uniqueReferenceNames.put(this._iQualifiedNameProvider.getFullyQualifiedName(entityReference.getType()).toString(), uniqueReferenceName);
+        }
+      }
+    }
+    return uniqueReferenceNames;
+  }
+  
   protected CharSequence createGridComponent(final TablePackage pkg, final Table table, final LEntity entity, final String gridDtoFqn) {
     StringConcatenation _builder = new StringConcatenation();
     _builder.append("IEclipseContext childContext = eclipseContext.createChild();");
@@ -1173,17 +1172,41 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     _builder.append(_concat);
     _builder.append("\");");
     _builder.newLineIfNotEmpty();
-    _builder.append("childContext.set(\"selectionEvnt\", new EventDispatcherEvent(EventDispatcherCommand.SELECT, \"");
+    _builder.append("LinkedHashMap<String, EventDispatcherEvent> selectionEvntList = new LinkedHashMap<>();");
+    _builder.newLine();
+    _builder.append("selectionEvntList.put(\"");
     QualifiedName _fullyQualifiedName = this._iQualifiedNameProvider.getFullyQualifiedName(this.baseType(entity));
     _builder.append(_fullyQualifiedName);
     _builder.append(".");
     String _idAttributeName = entity.getIdAttributeName();
     _builder.append(_idAttributeName);
-    _builder.append("\", \"");
-    QualifiedName _fullyQualifiedName_1 = this._iQualifiedNameProvider.getFullyQualifiedName(table);
+    _builder.append("\", new EventDispatcherEvent(EventDispatcherCommand.SELECT, \"");
+    QualifiedName _fullyQualifiedName_1 = this._iQualifiedNameProvider.getFullyQualifiedName(this.baseType(entity));
     _builder.append(_fullyQualifiedName_1);
+    _builder.append(".");
+    String _idAttributeName_1 = entity.getIdAttributeName();
+    _builder.append(_idAttributeName_1);
+    _builder.append("\", \"");
+    QualifiedName _fullyQualifiedName_2 = this._iQualifiedNameProvider.getFullyQualifiedName(table);
+    _builder.append(_fullyQualifiedName_2);
     _builder.append("\"));");
     _builder.newLineIfNotEmpty();
+    {
+      Collection<String> _values = this.getUniqueReferenceFQIdName(entity).values();
+      for(final String entityReferenceFQIdName : _values) {
+        _builder.append("selectionEvntList.put(\"");
+        _builder.append(entityReferenceFQIdName);
+        _builder.append("\", new EventDispatcherEvent(EventDispatcherCommand.SELECT, \"");
+        _builder.append(entityReferenceFQIdName);
+        _builder.append("\", \"");
+        QualifiedName _fullyQualifiedName_3 = this._iQualifiedNameProvider.getFullyQualifiedName(table);
+        _builder.append(_fullyQualifiedName_3);
+        _builder.append("\"));");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    _builder.append("childContext.set(\"selectionEvnt\", selectionEvntList);");
+    _builder.newLine();
     _builder.append("if (\"");
     _builder.append(gridDtoFqn);
     _builder.append("\".equals(getTaskOperativeDtoFqn())) {");
@@ -1243,12 +1266,8 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
       _builder.append("\")) {");
       _builder.newLineIfNotEmpty();
       _builder.append("\t\t\t");
-      _builder.append("if(filterGenerator.selectItem(event, ");
-      TableOption _tabletype = table.getTabletype();
-      boolean _booleanValue = Boolean.valueOf(((TableTable) _tabletype).isSelectById()).booleanValue();
-      _builder.append(_booleanValue, "\t\t\t");
-      _builder.append(")) {");
-      _builder.newLineIfNotEmpty();
+      _builder.append("if(filterGenerator.selectItem(event, getSelectById())) {");
+      _builder.newLine();
       {
         if ((this.isEmbedded(table) || this.isTask(table))) {
           _builder.append("\t\t\t\t");
@@ -1256,6 +1275,9 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
           _builder.newLine();
         } else {
           _builder.append("\t\t\t\t");
+          _builder.append("selectedId = event.getData().get(EventDispatcherDataTag.ID);");
+          _builder.newLine();
+          _builder.append("\t\t\t\t");
           _builder.append("renderData();");
           _builder.newLine();
         }
@@ -1492,14 +1514,8 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
         _builder.newLine();
       }
     }
-    {
-      boolean _isBean = this.isBean(table);
-      boolean _not = (!_isBean);
-      if (_not) {
-        _builder.append("tables = new ArrayList<CellSetFilterTable>();");
-      }
-    }
-    _builder.newLineIfNotEmpty();
+    _builder.append("tables = new ArrayList<CellSetFilterTable>();");
+    _builder.newLine();
     _builder.append("tableFilterDecorator = new TableFilterDecorator(dslMetadataService, user.getLocale());");
     _builder.newLine();
     _builder.append("// the timeout to begin the filter process after the last key pressed");
@@ -1512,10 +1528,19 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     _builder.newLine();
     _builder.append("parent.setSizeFull();");
     _builder.newLine();
+    {
+      boolean _isEmbedded_1 = this.isEmbedded(table);
+      if (_isEmbedded_1) {
+        _builder.append("parent.addAttachListener(this);");
+      }
+    }
+    _builder.newLineIfNotEmpty();
     _builder.append("layoutManager = new ViewLayoutManager();");
     _builder.newLine();
     _builder.append("layoutManager.init(parent);");
     _builder.newLine();
+    _builder.append("this.parent = parent;");
+    _builder.newLine();
     String body = _builder.toString();
     boolean _isGrid = this.isGrid(table);
     if (_isGrid) {
@@ -1542,115 +1567,77 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
       _builder_1.append("log.debug(\"PersistenceService registered\");");
       body = _builder_1.toString();
     } else {
-      boolean _isBean_1 = this.isBean(table);
-      if (_isBean_1) {
-        TableOption _tabletype = table.getTabletype();
-        DatamartDefinition _datamartRef = ((TableBean) _tabletype).getSource().getDatamartRef();
-        if ((_datamartRef instanceof DatamartEntity)) {
-          StringConcatenation _builder_2 = new StringConcatenation();
-          _builder_2.append(body);
-          _builder_2.newLineIfNotEmpty();
-          _builder_2.append("persistenceService.registerPersistenceUnit(\"");
-          TableOption _tabletype_1 = table.getTabletype();
-          DatamartDefinition _datamartRef_1 = ((TableBean) _tabletype_1).getSource().getDatamartRef();
-          String _persistenceUnit_1 = ((DatamartEntity) _datamartRef_1).getEntityRef().getPersistenceUnit();
-          _builder_2.append(_persistenceUnit_1);
-          _builder_2.append("\")");
-          body = _builder_2.toString();
+      StringConcatenation _builder_2 = new StringConcatenation();
+      _builder_2.append(body);
+      _builder_2.newLineIfNotEmpty();
+      _builder_2.append("datamartInstance = new ");
+      String _sourceDataMartRefName = this.getSourceDataMartRefName(table);
+      _builder_2.append(_sourceDataMartRefName);
+      _builder_2.append("Datamart();");
+      _builder_2.newLineIfNotEmpty();
+      _builder_2.append("datamartInstance.setUser(user);");
+      _builder_2.newLine();
+      _builder_2.append("filterGenerator = new DatamartFilterGenerator(datamartInstance, ");
+      {
+        boolean _isEmbedded_2 = this.isEmbedded(table);
+        if (_isEmbedded_2) {
+          _builder_2.append("eclipseContext");
+        } else {
+          _builder_2.append("getContext()");
         }
-      } else {
-        StringConcatenation _builder_3 = new StringConcatenation();
-        _builder_3.append(body);
-        _builder_3.newLineIfNotEmpty();
-        _builder_3.append("datamartInstance = new ");
-        String _sourceDataMartRefName = this.getSourceDataMartRefName(table);
-        _builder_3.append(_sourceDataMartRefName);
-        _builder_3.append("Datamart();");
-        _builder_3.newLineIfNotEmpty();
-        _builder_3.append("datamartInstance.setUser(user);");
-        _builder_3.newLine();
-        _builder_3.append("filterGenerator = new DatamartFilterGenerator(datamartInstance, dslMetadataService);");
-        _builder_3.newLine();
-        _builder_3.append("filterGenerator.createUIFilters(layoutManager);");
-        _builder_3.newLine();
-        body = _builder_3.toString();
       }
+      _builder_2.append(", ");
+      boolean _isShowCaption = this.getDataMartTable(table).getDatamartRef().isShowCaption();
+      _builder_2.append(_isShowCaption);
+      _builder_2.append(", ");
+      int _max = Integer.max(10, this.getDataMartTable(table).getDatamartRef().getNumMultiRows());
+      _builder_2.append(_max);
+      _builder_2.append(");");
+      _builder_2.newLineIfNotEmpty();
+      _builder_2.append("filterGenerator.createUIFilters(layoutManager);");
+      _builder_2.newLine();
+      body = _builder_2.toString();
     }
     boolean _isSelection = this.isSelection(table);
     if (_isSelection) {
-      StringConcatenation _builder_4 = new StringConcatenation();
-      _builder_4.append(body);
-      _builder_4.newLineIfNotEmpty();
-      _builder_4.append("workLoadItem = (IBlipBPMWorkloadModifiableItem)getTransientDataVariable(IBlipBPMConstants.VARIABLE_TASK_START_INFO);");
-      _builder_4.newLine();
-      _builder_4.append("taskSummary = (BPMTaskSummary)getTransientDataVariable(IBlipBPMConstants.VARIABLE_TASK_JBPM_SUMMARY);");
-      _builder_4.newLine();
-      body = _builder_4.toString();
+      StringConcatenation _builder_3 = new StringConcatenation();
+      _builder_3.append(body);
+      _builder_3.newLineIfNotEmpty();
+      _builder_3.append("workLoadItem = (IBlipBPMWorkloadModifiableItem)getTransientDataVariable(IBlipBPMConstants.VARIABLE_TASK_START_INFO);");
+      _builder_3.newLine();
+      _builder_3.append("taskSummary = (BPMTaskSummary)getTransientDataVariable(IBlipBPMConstants.VARIABLE_TASK_JBPM_SUMMARY);");
+      _builder_3.newLine();
+      body = _builder_3.toString();
     }
-    StringConcatenation _builder_5 = new StringConcatenation();
-    _builder_5.append(body);
-    _builder_5.newLineIfNotEmpty();
-    _builder_5.append("coordinateSystem = new ArrayList<Integer>();");
-    _builder_5.newLine();
-    _builder_5.append("tableSelectDelay = new Refresher();");
-    _builder_5.newLine();
-    _builder_5.append("tableRefresher = new Refresher();");
-    _builder_5.newLine();
-    _builder_5.append("attributeLookupMap = new HashMap<>();");
-    _builder_5.newLine();
-    _builder_5.append("tabSheets = new HashMap<>();");
-    body = _builder_5.toString();
+    StringConcatenation _builder_4 = new StringConcatenation();
+    _builder_4.append(body);
+    _builder_4.newLineIfNotEmpty();
+    _builder_4.append("coordinateSystem = new ArrayList<Integer>();");
+    _builder_4.newLine();
+    _builder_4.append("attributeLookupMap = new HashMap<>();");
+    _builder_4.newLine();
+    _builder_4.append("tabSheets = new HashMap<>();");
+    body = _builder_4.toString();
     if (((!this.isEmbedded(table)) && (table.getTabletype().getToolbar() != null))) {
-      StringConcatenation _builder_6 = new StringConcatenation();
-      _builder_6.append(body);
-      _builder_6.newLineIfNotEmpty();
-      _builder_6.append("toolbarUUID = UUID.randomUUID().toString();");
-      _builder_6.newLine();
-      _builder_6.append("toolbarClass = new ");
+      StringConcatenation _builder_5 = new StringConcatenation();
+      _builder_5.append(body);
+      _builder_5.newLineIfNotEmpty();
+      _builder_5.append("toolbarUUID = UUID.randomUUID().toString();");
+      _builder_5.newLine();
+      _builder_5.append("toolbarClass = new ");
       String _firstUpper = StringExtensions.toFirstUpper(table.getTabletype().getToolbar().getName().toString());
-      _builder_6.append(_firstUpper);
-      _builder_6.append("Toolbar(toolbarUUID);");
-      _builder_6.newLineIfNotEmpty();
-      _builder_6.append("toolbarClass.createToolbar(eclipseContext, renderingEngine, themeResourceService);");
-      body = _builder_6.toString();
-    }
-    boolean _isPolling = table.getTabletype().isPolling();
-    if (_isPolling) {
-      StringConcatenation _builder_7 = new StringConcatenation();
-      _builder_7.append(body);
-      _builder_7.newLineIfNotEmpty();
-      _builder_7.append("tableRefresher.setRefreshInterval(");
-      String _pollingTime = table.getTabletype().getPollingTime();
-      _builder_7.append(_pollingTime);
-      _builder_7.append("*1000);");
-      _builder_7.newLineIfNotEmpty();
-      _builder_7.append("tableRefresher.addListener(new com.github.wolfie.refresher.Refresher.RefreshListener() {");
-      _builder_7.newLine();
-      _builder_7.append("\t");
-      _builder_7.append("@Override");
-      _builder_7.newLine();
-      _builder_7.append("\t");
-      _builder_7.append("public void refresh(final Refresher source) {");
-      _builder_7.newLine();
-      _builder_7.append("\t\t");
-      String _callDataRefreshMethod = this.getCallDataRefreshMethod(table);
-      _builder_7.append(_callDataRefreshMethod, "\t\t");
-      _builder_7.newLineIfNotEmpty();
-      _builder_7.append("\t");
-      _builder_7.append("}");
-      _builder_7.newLine();
-      _builder_7.append("});");
-      _builder_7.newLine();
-      _builder_7.append("layoutManager.addExtension(tableRefresher);");
-      _builder_7.newLine();
-      body = _builder_7.toString();
+      _builder_5.append(_firstUpper);
+      _builder_5.append("Toolbar(toolbarUUID);");
+      _builder_5.newLineIfNotEmpty();
+      _builder_5.append("toolbarClass.createToolbar(eclipseContext, renderingEngine, themeResourceService);");
+      body = _builder_5.toString();
     }
-    StringConcatenation _builder_8 = new StringConcatenation();
-    _builder_8.append(body);
-    _builder_8.newLineIfNotEmpty();
-    _builder_8.append("initDone = true;");
-    _builder_8.newLine();
-    body = _builder_8.toString();
+    StringConcatenation _builder_6 = new StringConcatenation();
+    _builder_6.append(body);
+    _builder_6.newLineIfNotEmpty();
+    _builder_6.append("initDone = true;");
+    _builder_6.newLine();
+    body = _builder_6.toString();
     return body;
   }
   
@@ -1669,11 +1656,6 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     return (_tabletype instanceof TableTable);
   }
   
-  public boolean isBean(final Table table) {
-    TableOption _tabletype = table.getTabletype();
-    return (_tabletype instanceof TableBean);
-  }
-  
   public boolean isEmbedded(final Table table) {
     return table.getTabletype().isEmbedded();
   }
@@ -1683,125 +1665,125 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     return (_tabletype instanceof TableSelection);
   }
   
-  public String dataRefresh(final Table table) {
-    String body = "";
-    boolean _isBean = this.isBean(table);
-    if (_isBean) {
-      StringConcatenation _builder = new StringConcatenation();
-      _builder.append(body);
-      _builder.newLineIfNotEmpty();
-      _builder.append("if(table != null) {");
-      _builder.newLine();
-      _builder.append("\t");
-      _builder.append("table.refreshRowCache();");
-      _builder.newLine();
-      _builder.append("}");
-      _builder.newLine();
-      body = _builder.toString();
-    } else {
-      StringConcatenation _builder_1 = new StringConcatenation();
-      _builder_1.append(body);
-      _builder_1.newLineIfNotEmpty();
-      _builder_1.append("try {");
-      _builder_1.newLine();
-      _builder_1.append("\t");
-      _builder_1.append("// if no current ui found");
-      _builder_1.newLine();
-      _builder_1.append("\t");
-      _builder_1.append("if (UI.getCurrent() == null) {");
-      _builder_1.newLine();
-      _builder_1.append("\t\t");
-      _builder_1.append("for(CellSetFilterTable table:tables) {");
-      _builder_1.newLine();
-      _builder_1.append("\t\t\t");
-      _builder_1.append("UI.setCurrent(table.getUI());");
-      _builder_1.newLine();
-      _builder_1.append("\t\t\t");
-      _builder_1.append("break;");
-      _builder_1.newLine();
-      _builder_1.append("\t\t");
-      _builder_1.append("}");
-      _builder_1.newLine();
-      _builder_1.append("\t");
-      _builder_1.append("}");
-      _builder_1.newLine();
-      _builder_1.append("\t");
-      _builder_1.append("if(dataSourceContainer== null || !dataSourceContainer.updateContainer(getCellSet())) {");
-      _builder_1.newLine();
-      _builder_1.append("\t\t");
-      _builder_1.append("log.debug(\"cannot update container - full refresh\");");
-      _builder_1.newLine();
-      {
-        boolean _isEmbedded = this.isEmbedded(table);
-        if (_isEmbedded) {
-          _builder_1.append("\t\t");
-          _builder_1.append("createComponents();");
-          _builder_1.newLine();
-        } else {
-          _builder_1.append("\t\t");
-          _builder_1.append("renderData();");
-          _builder_1.newLine();
-        }
-      }
-      _builder_1.append("\t");
-      _builder_1.append("}");
-      _builder_1.newLine();
-      _builder_1.append("\t");
-      _builder_1.append("for(CellSetFilterTable table:tables) {");
-      _builder_1.newLine();
-      _builder_1.append("\t\t");
-      _builder_1.append("table.sanitizeSelection();");
-      _builder_1.newLine();
-      _builder_1.append("\t");
-      _builder_1.append("}");
-      _builder_1.newLine();
-      _builder_1.append("} catch (Exception e) {");
-      _builder_1.newLine();
-      _builder_1.append("\t");
-      _builder_1.append("StringWriter sw = new StringWriter();");
-      _builder_1.newLine();
-      _builder_1.append("\t");
-      _builder_1.append("e.printStackTrace(new PrintWriter(sw));");
-      _builder_1.newLine();
-      _builder_1.append("\t");
-      _builder_1.append("String exceptionDetails = sw.toString();");
-      _builder_1.newLine();
-      _builder_1.append("\t");
-      _builder_1.append("log.error(\"table data refresh:{}\", exceptionDetails);");
-      _builder_1.newLine();
-      _builder_1.append("}");
-      body = _builder_1.toString();
-    }
-    return body;
+  public CharSequence renderAllowed(final Table table) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("if (getSelectById() && getSelectedId()==null) {");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("for (DatamartFilter filter : datamartInstance.getFilters()) {");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("List<IDualData> selectedData = filter.getSelectedData();");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("if (!selectedData.isEmpty()) {");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("for (IDualData iDualData : selectedData) {");
+    _builder.newLine();
+    _builder.append("\t\t\t\t");
+    _builder.append("if (!\"*\".equals(iDualData.getFormattedValue()) || !\"*\".equals(iDualData.getSelectionValue())){");
+    _builder.newLine();
+    _builder.append("\t\t\t\t\t");
+    _builder.append("return true;");
+    _builder.newLine();
+    _builder.append("\t\t\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("return false;");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("} ");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("return false;");
+    _builder.newLine();
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("return true;");
+    return _builder;
   }
   
-  /**
-   * <p>create a handler for user changed.</p>
-   */
-  public String delegatedTask(final Table table) {
+  public String dataRefresh(final Table table) {
     String body = "";
     StringConcatenation _builder = new StringConcatenation();
     _builder.append(body);
     _builder.newLineIfNotEmpty();
-    _builder.append("new EventHandler() {");
+    _builder.append("try {");
     _builder.newLine();
     _builder.append("\t");
-    _builder.append("@Override");
+    _builder.append("// if no current ui found");
     _builder.newLine();
     _builder.append("\t");
-    _builder.append("public void handleEvent(Event event) {");
+    _builder.append("if (UI.getCurrent() == null) {");
     _builder.newLine();
     _builder.append("\t\t");
-    _builder.append("EventBrokerMsg msg = (EventBrokerMsg)event.getProperty(EventUtils.DATA);");
+    _builder.append("for(CellSetFilterTable table:tables) {");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("UI.setCurrent(table.getUI());");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("break;");
     _builder.newLine();
     _builder.append("\t\t");
-    _builder.append("datamartInstance.operations(msg.getLong(), user, msg.getName(), BPMOperation.Delegate);");
+    _builder.append("}");
     _builder.newLine();
     _builder.append("\t");
     _builder.append("}");
     _builder.newLine();
-    _builder.append("};");
+    _builder.append("\t");
+    _builder.append("if(dataSourceContainer== null || !dataSourceContainer.updateContainer(getCellSet())) {");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("log.debug(\"cannot update container - full refresh\");");
     _builder.newLine();
+    {
+      boolean _isEmbedded = this.isEmbedded(table);
+      if (_isEmbedded) {
+        _builder.append("\t\t");
+        _builder.append("createComponents();");
+        _builder.newLine();
+      } else {
+        _builder.append("\t\t");
+        _builder.append("renderData();");
+        _builder.newLine();
+      }
+    }
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("for(CellSetFilterTable table:tables) {");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("table.sanitizeSelection();");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("} catch (Exception e) {");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("StringWriter sw = new StringWriter();");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("e.printStackTrace(new PrintWriter(sw));");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("String exceptionDetails = sw.toString();");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("log.error(\"table data refresh:{}\", exceptionDetails);");
+    _builder.newLine();
+    _builder.append("}");
     body = _builder.toString();
     return body;
   }
@@ -1811,8 +1793,12 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
    */
   public String createComponents(final Table table) {
     String body = "";
-    if (((this.getDataMartTable(table) != null) && (!this.isBean(table)))) {
+    TableDatamart _dataMartTable = this.getDataMartTable(table);
+    boolean _tripleNotEquals = (_dataMartTable != null);
+    if (_tripleNotEquals) {
       StringConcatenation _builder = new StringConcatenation();
+      _builder.append("if (renderAllowed()){");
+      _builder.newLine();
       _builder.append("// get the results");
       _builder.newLine();
       _builder.append("final DerivedCellSet cellSet = getCellSet();");
@@ -1863,6 +1849,8 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
       _builder.newLine();
       _builder.append("getCoordinateSystem().clear();");
       _builder.newLine();
+      _builder.append("tables.clear();");
+      _builder.newLine();
       _builder.append("// generate a new result component");
       _builder.newLine();
       _builder.append("if (cellSet != null) {");
@@ -1957,6 +1945,8 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
       _builder.newLineIfNotEmpty();
       _builder.append("}");
       _builder.newLine();
+      _builder.append("}");
+      _builder.newLine();
       body = _builder.toString();
     } else {
       boolean _isGrid = this.isGrid(table);
@@ -1988,45 +1978,7 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
         _builder_1.newLine();
         _builder_1.append("layoutManager.getDataArea().setExpandRatio(dataComponent, 1);");
         _builder_1.newLine();
-        String _selectAlways_1 = this.getSelectAlways(table);
-        _builder_1.append(_selectAlways_1);
-        _builder_1.newLineIfNotEmpty();
         body = _builder_1.toString();
-      } else {
-        boolean _isBean = this.isBean(table);
-        if (_isBean) {
-          StringConcatenation _builder_2 = new StringConcatenation();
-          _builder_2.append(body);
-          _builder_2.newLineIfNotEmpty();
-          _builder_2.append("// generate a new result component");
-          _builder_2.newLine();
-          _builder_2.append("// remove any previous component");
-          _builder_2.newLine();
-          _builder_2.append("if\t(dataComponent != null) {");
-          _builder_2.newLine();
-          _builder_2.append("\t");
-          _builder_2.append("layoutManager.getDataArea().removeComponent(dataComponent);");
-          _builder_2.newLine();
-          _builder_2.append("\t");
-          _builder_2.append("dataComponent = null;");
-          _builder_2.newLine();
-          _builder_2.append("}");
-          _builder_2.newLine();
-          _builder_2.append("dataComponent = createTable();");
-          _builder_2.newLine();
-          _builder_2.append("dataComponent.setSizeFull();");
-          _builder_2.newLine();
-          _builder_2.append("dataComponent.setId(\"dataComponent\");");
-          _builder_2.newLine();
-          _builder_2.append("layoutManager.getDataArea().addComponent(dataComponent);");
-          _builder_2.newLine();
-          _builder_2.append("layoutManager.getDataArea().setExpandRatio(dataComponent, 1);");
-          _builder_2.newLine();
-          String _selectAlways_2 = this.getSelectAlways(table);
-          _builder_2.append(_selectAlways_2);
-          _builder_2.newLineIfNotEmpty();
-          body = _builder_2.toString();
-        }
       }
     }
     return body;
@@ -2038,36 +1990,22 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
       StringConcatenation _builder = new StringConcatenation();
       _builder.append(body);
       _builder.newLineIfNotEmpty();
-      _builder.append("tableSelectDelay.setRefreshInterval(1000);");
-      _builder.newLine();
-      _builder.append("if (tableSelectDelay.getListeners(null).size()==0) {");
+      _builder.append("UI.getCurrent().access(new Runnable() {");
       _builder.newLine();
       _builder.append("\t");
-      _builder.append("tableSelectDelay.addListener(new com.github.wolfie.refresher.Refresher.RefreshListener() {");
-      _builder.newLine();
-      _builder.append("\t\t");
       _builder.append("@Override");
       _builder.newLine();
-      _builder.append("\t\t");
-      _builder.append("public void refresh(final Refresher source) {");
-      _builder.newLine();
-      _builder.append("\t\t\t");
-      _builder.append("// refresh only once");
-      _builder.newLine();
-      _builder.append("\t\t\t");
-      _builder.append("source.setRefreshInterval(0);");
+      _builder.append("\t");
+      _builder.append("public void run() {");
       _builder.newLine();
-      _builder.append("\t\t\t");
+      _builder.append("\t\t");
       _builder.append("for(CellSetFilterTable table:tables) {");
       _builder.newLine();
-      _builder.append("\t\t\t\t");
+      _builder.append("\t\t\t");
       _builder.append("if (table.getItemIds().size()>0) {");
       _builder.newLine();
-      _builder.append("\t\t\t\t\t");
-      _builder.append("table.select(table.getItemIds().iterator().next());");
-      _builder.newLine();
       _builder.append("\t\t\t\t");
-      _builder.append("}");
+      _builder.append("table.select(table.getItemIds().iterator().next());");
       _builder.newLine();
       _builder.append("\t\t\t");
       _builder.append("}");
@@ -2076,12 +2014,9 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
       _builder.append("}");
       _builder.newLine();
       _builder.append("\t");
-      _builder.append("});");
-      _builder.newLine();
-      _builder.append("\t");
-      _builder.append("layoutManager.addExtension(tableSelectDelay);");
-      _builder.newLine();
       _builder.append("}");
+      _builder.newLine();
+      _builder.append("});");
       body = _builder.toString();
     }
     return body;
@@ -2095,8 +2030,6 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     StringConcatenation _builder = new StringConcatenation();
     _builder.append(body);
     _builder.newLineIfNotEmpty();
-    _builder.append("tables.clear();");
-    _builder.newLine();
     _builder.append("// either create a recursive tabsheet or a table");
     _builder.newLine();
     _builder.append("Component component = null;");
@@ -2120,7 +2053,55 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     _builder.append("tabsheet.setSizeFull();");
     _builder.newLine();
     _builder.append("\t");
-    _builder.append("tabSheets.put(tabsheet, new ArrayList<String>());");
+    _builder.append("tabsheet.addSelectedTabChangeListener(new SelectedTabChangeListener() {");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("@Override");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("public void selectedTabChange(SelectedTabChangeEvent event) {");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("if(tabSheets.containsKey(event.getTabSheet())) {");
+    _builder.newLine();
+    _builder.append("\t\t\t\t");
+    _builder.append("getCoordinateSystem().clear();");
+    _builder.newLine();
+    _builder.append("\t\t\t\t");
+    _builder.append("getCoordinateSystem().addAll(getCoordinates(event.getTabSheet()));");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("private Collection<? extends Integer> getCoordinates(TabSheet tabsheet) {");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("if(!(tabsheet.getTab(tabsheet.getSelectedTab()) instanceof TabSheet)) {");
+    _builder.newLine();
+    _builder.append("\t\t\t\t");
+    _builder.append("int index = tabsheet.getTabPosition(tabsheet.getTab(tabsheet.getSelectedTab()));");
+    _builder.newLine();
+    _builder.append("\t\t\t\t");
+    _builder.append("return tabSheets.get(tabsheet).get(index);");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("return getCoordinates((TabSheet)tabsheet.getTab(tabsheet.getSelectedTab()));");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("});");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("tabSheets.put(tabsheet, new ArrayList<>());");
     _builder.newLine();
     _builder.append("\t");
     _builder.append("DerivedAxis tabAxis = cellSet.getAxes().get(axis);");
@@ -2138,10 +2119,28 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     _builder.append("// create the title for the axis");
     _builder.newLine();
     _builder.append("\t\t");
+    _builder.append("String title = null;");
+    _builder.newLine();
+    _builder.append("\t\t");
     _builder.append("for (DerivedMember member : column.getMembers()) {");
     _builder.newLine();
     _builder.append("\t\t\t");
-    _builder.append("tabSheets.get(tabsheet).add(member.getCaption());");
+    _builder.append("if\t(title == null) {");
+    _builder.newLine();
+    _builder.append("\t\t\t\t");
+    _builder.append("title = dslMetadataService.translate(user.getLocale().toLanguageTag(), member.getCaption());");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("else {");
+    _builder.newLine();
+    _builder.append("\t\t\t\t");
+    _builder.append("title += \" / \"+dslMetadataService.translate(user.getLocale().toLanguageTag(), member.getCaption());");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("}");
     _builder.newLine();
     _builder.append("\t\t");
     _builder.append("}");
@@ -2153,6 +2152,9 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     _builder.append("getCoordinateSystem().set(axis, tabNo);");
     _builder.newLine();
     _builder.append("\t\t");
+    _builder.append("tabSheets.get(tabsheet).add(new ArrayList<Integer>(getCoordinateSystem()));");
+    _builder.newLine();
+    _builder.append("\t\t");
     _builder.append("component = createTabSheet(cellSet, axis);");
     _builder.newLine();
     _builder.append("\t\t");
@@ -2162,7 +2164,7 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     _builder.append("if (component != null) {");
     _builder.newLine();
     _builder.append("\t\t\t");
-    _builder.append("component.setCaption(\"\");");
+    _builder.append("component.setCaption(title);");
     _builder.newLine();
     _builder.append("\t\t\t");
     _builder.append("tabsheet.addComponent(component);");
@@ -2223,6 +2225,7 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     HashMap<String, Map<Double, Map<String, String>>> dateLookupIconMap = CollectionLiterals.<String, Map<Double, Map<String, String>>>newHashMap();
     HashMap<String, Map<Double, Map<String, String>>> dateLookupTooltipMap = CollectionLiterals.<String, Map<Double, Map<String, String>>>newHashMap();
     HashMap<String, String> blobLookupMap = CollectionLiterals.<String, String>newHashMap();
+    HashMap<String, String> enumLookupMap = CollectionLiterals.<String, String>newHashMap();
     String rowStyle = "";
     EList<TableElement> _elements = this.getDataMartTable(table).getElements();
     for (final TableElement element : _elements) {
@@ -2263,78 +2266,77 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
       TableOption _tabletype = table.getTabletype();
       multiSelect = ((TableSelection) _tabletype).isMultiSelection();
     }
-    boolean _isBean = this.isBean(table);
-    if (_isBean) {
-      StringConcatenation _builder_1 = new StringConcatenation();
-      _builder_1.append("final BeanFilterTable table = new BeanFilterTable();");
-      _builder_1.newLine();
-      constructTable = _builder_1.toString();
-    }
-    StringConcatenation _builder_2 = new StringConcatenation();
-    _builder_2.append(body);
-    _builder_2.append(constructTable);
-    _builder_2.newLineIfNotEmpty();
-    _builder_2.append("VerticalLayout tableLayout = new VerticalLayout();");
-    _builder_2.newLine();
+    StringConcatenation _builder_1 = new StringConcatenation();
+    _builder_1.append(body);
+    _builder_1.append(constructTable);
+    _builder_1.newLineIfNotEmpty();
+    _builder_1.append("VerticalLayout tableLayout = new VerticalLayout();");
+    _builder_1.newLine();
     {
       if ((this.isEmbedded(table) && this.isTask(table))) {
-        _builder_2.append("taskButtons = new ArrayList<Button>();");
-        _builder_2.newLine();
-        _builder_2.append("HorizontalLayout tools = new HorizontalLayout();");
-        _builder_2.newLine();
-        _builder_2.append("tools.addStyleName(\"os-embedded-toolbar\");");
-        _builder_2.newLine();
-        _builder_2.append("tools.setSpacing(false);");
-        _builder_2.newLine();
-        _builder_2.newLine();
-        _builder_2.append("Button b = new Button(null, new Button.ClickListener() {");
-        _builder_2.newLine();
-        _builder_2.append("    ");
-        _builder_2.append("public void buttonClick(ClickEvent event) {");
-        _builder_2.newLine();
-        _builder_2.append("    \t");
-        _builder_2.append("taskClient.operations(dataSourceContainer.getTaskId((int)table.getValue()), user, null, BPMOperation.Start);");
-        _builder_2.newLine();
-        _builder_2.append("\t\t");
-        _builder_2.append("eventBroker.send(EventBrokerMsg.MENU_CLOSE, null);");
-        _builder_2.newLine();
-        _builder_2.append("    ");
-        _builder_2.append("}");
-        _builder_2.newLine();
-        _builder_2.append("});");
-        _builder_2.newLine();
-        _builder_2.append("b.setIcon(themeResourceService.getThemeResource(\"task_action_start\", ThemeResourceType.ICON));");
-        _builder_2.newLine();
-        _builder_2.append("b.setDescription(null);");
-        _builder_2.newLine();
-        _builder_2.append("b.setEnabled(false);");
-        _builder_2.newLine();
-        _builder_2.append("b.addStyleName(\"v-button-small\");");
-        _builder_2.newLine();
-        _builder_2.append("tools.addComponent(b);");
-        _builder_2.newLine();
-        _builder_2.append("taskButtons.add(b);");
-        _builder_2.newLine();
-        _builder_2.append("tableLayout.addComponent(tools);");
-        _builder_2.newLine();
+        _builder_1.append("taskButtons = new ArrayList<Button>();");
+        _builder_1.newLine();
+        _builder_1.append("HorizontalLayout tools = new HorizontalLayout();");
+        _builder_1.newLine();
+        _builder_1.append("tools.addStyleName(\"os-embedded-toolbar\");");
+        _builder_1.newLine();
+        _builder_1.append("tools.setSpacing(false);");
+        _builder_1.newLine();
+        _builder_1.newLine();
+        _builder_1.append("Button b = new Button(null, new Button.ClickListener() {");
+        _builder_1.newLine();
+        _builder_1.append("    ");
+        _builder_1.append("public void buttonClick(ClickEvent event) {");
+        _builder_1.newLine();
+        _builder_1.append("    \t");
+        _builder_1.append("taskClient.operations(dataSourceContainer.getTaskId((int)table.getValue()), user, null, BPMOperation.Start);");
+        _builder_1.newLine();
+        _builder_1.append("\t\t");
+        _builder_1.append("EventDispatcherEvent evnt = new EventDispatcherEvent(EventDispatcherCommand.CLOSE, \"UserMenu\", \"");
+        QualifiedName _fullyQualifiedName = this._iQualifiedNameProvider.getFullyQualifiedName(table);
+        _builder_1.append(_fullyQualifiedName, "\t\t");
+        _builder_1.append("\");");
+        _builder_1.newLineIfNotEmpty();
+        _builder_1.append("\t\t");
+        _builder_1.append("eventDispatcher.sendEvent(evnt);");
+        _builder_1.newLine();
+        _builder_1.append("    ");
+        _builder_1.append("}");
+        _builder_1.newLine();
+        _builder_1.append("});");
+        _builder_1.newLine();
+        _builder_1.append("b.setIcon(themeResourceService.getThemeResource(\"task_action_start\", ThemeResourceType.ICON));");
+        _builder_1.newLine();
+        _builder_1.append("b.setDescription(null);");
+        _builder_1.newLine();
+        _builder_1.append("b.setEnabled(false);");
+        _builder_1.newLine();
+        _builder_1.append("b.addStyleName(\"v-button-small\");");
+        _builder_1.newLine();
+        _builder_1.append("tools.addComponent(b);");
+        _builder_1.newLine();
+        _builder_1.append("taskButtons.add(b);");
+        _builder_1.newLine();
+        _builder_1.append("tableLayout.addComponent(tools);");
+        _builder_1.newLine();
       }
     }
-    _builder_2.append("table.setImmediate(true);");
-    _builder_2.newLine();
-    _builder_2.append("table.setMultiSelect(");
-    _builder_2.append(multiSelect);
-    _builder_2.append(");");
-    _builder_2.newLineIfNotEmpty();
-    _builder_2.append("table.setColumnCollapsingAllowed(true);");
-    _builder_2.newLine();
-    _builder_2.append("table.setColumnReorderingAllowed(true);");
-    _builder_2.newLine();
-    _builder_2.append("table.setId(\"table\");");
-    _builder_2.newLine();
+    _builder_1.append("table.setImmediate(true);");
+    _builder_1.newLine();
+    _builder_1.append("table.setMultiSelect(");
+    _builder_1.append(multiSelect);
+    _builder_1.append(");");
+    _builder_1.newLineIfNotEmpty();
+    _builder_1.append("table.setColumnCollapsingAllowed(true);");
+    _builder_1.newLine();
+    _builder_1.append("table.setColumnReorderingAllowed(true);");
+    _builder_1.newLine();
+    _builder_1.append("table.setId(\"table\");");
+    _builder_1.newLine();
     {
       boolean _isTable = this.isTable(table);
       if (_isTable) {
-        _builder_2.append("table.setRowHeaderMode(RowHeaderMode.");
+        _builder_1.append("table.setRowHeaderMode(RowHeaderMode.");
         {
           TableOption _tabletype_1 = table.getTabletype();
           RowHeaderMode _headerMode = ((TableTable) _tabletype_1).getHeaderMode();
@@ -2342,58 +2344,33 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
           if (_tripleNotEquals) {
             TableOption _tabletype_2 = table.getTabletype();
             String _name = ((TableTable) _tabletype_2).getHeaderMode().name();
-            _builder_2.append(_name);
+            _builder_1.append(_name);
           } else {
-            _builder_2.append("HIDDEN");
+            _builder_1.append("HIDDEN");
           }
         }
-        _builder_2.append(");");
-        _builder_2.newLineIfNotEmpty();
-      }
-    }
-    {
-      boolean _isBean_1 = this.isBean(table);
-      if (_isBean_1) {
-        _builder_2.append("table.setRowHeaderMode(RowHeaderMode.");
-        {
-          TableOption _tabletype_3 = table.getTabletype();
-          RowHeaderMode _headerMode_1 = ((TableBean) _tabletype_3).getHeaderMode();
-          boolean _tripleNotEquals_1 = (_headerMode_1 != null);
-          if (_tripleNotEquals_1) {
-            TableOption _tabletype_4 = table.getTabletype();
-            String _name_1 = ((TableBean) _tabletype_4).getHeaderMode().name();
-            _builder_2.append(_name_1);
-          } else {
-            _builder_2.append("HIDDEN");
-          }
-        }
-        _builder_2.append(");");
-        _builder_2.newLineIfNotEmpty();
+        _builder_1.append(");");
+        _builder_1.newLineIfNotEmpty();
       }
     }
-    _builder_2.append("table.setFilterDecorator(tableFilterDecorator);");
-    _builder_2.newLine();
-    _builder_2.append("table.setFilterBarVisible(");
+    _builder_1.append("table.setFilterDecorator(tableFilterDecorator);");
+    _builder_1.newLine();
+    _builder_1.append("table.setFilterBarVisible(");
     boolean _booleanValue = Boolean.valueOf(table.getTabletype().isFiltering()).booleanValue();
-    _builder_2.append(_booleanValue);
-    _builder_2.append(");");
-    _builder_2.newLineIfNotEmpty();
-    _builder_2.append("table.setSelectable(true);");
-    _builder_2.newLine();
-    _builder_2.append("table.setSizeFull();");
-    _builder_2.newLine();
-    _builder_2.append("tableLayout.addComponent(table);");
-    _builder_2.newLine();
-    {
-      boolean _isBean_2 = this.isBean(table);
-      boolean _not = (!_isBean_2);
-      if (_not) {
-        _builder_2.append("tables.add(table);");
-      }
-    }
-    _builder_2.newLineIfNotEmpty();
-    body = _builder_2.toString();
+    _builder_1.append(_booleanValue);
+    _builder_1.append(");");
+    _builder_1.newLineIfNotEmpty();
+    _builder_1.append("table.setSelectable(true);");
+    _builder_1.newLine();
+    _builder_1.append("table.setSizeFull();");
+    _builder_1.newLine();
+    _builder_1.append("tableLayout.addComponent(table);");
+    _builder_1.newLine();
+    _builder_1.append("tables.add(table);");
+    _builder_1.newLine();
+    body = _builder_1.toString();
     this.initBlobLookup(table, blobLookupMap);
+    this.initEnumLookup(table, enumLookupMap);
     this.initIdMap(table, idMap);
     boolean _isHasDetails = category_axis.isHasDetails();
     if (_isHasDetails) {
@@ -2405,85 +2382,81 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     }
     if ((((((((intervalStyleMap.keySet().size() + numberLookupStyleMap.keySet().size()) + stringLookupStyleMap.keySet().size()) + intLookupStyleMap.keySet().size()) + intIntervalStyleMap.keySet().size()) + 
       dateLookupStyleMap.keySet().size()) > 0) || category_axis.isHasRowHeight())) {
-      StringConcatenation _builder_3 = new StringConcatenation();
-      _builder_3.append(body);
-      _builder_3.append("// add styles to page for the axis\'s custom styles");
-      _builder_3.newLineIfNotEmpty();
-      _builder_3.append("Styles styles = Page.getCurrent().getStyles();");
-      _builder_3.newLine();
-      body = _builder_3.toString();
+      StringConcatenation _builder_2 = new StringConcatenation();
+      _builder_2.append(body);
+      _builder_2.append("// add styles to page for the axis\'s custom styles");
+      _builder_2.newLineIfNotEmpty();
+      _builder_2.append("Styles styles = Page.getCurrent().getStyles();");
+      _builder_2.newLine();
+      body = _builder_2.toString();
     }
     boolean _isHasRowHeight = category_axis.isHasRowHeight();
     if (_isHasRowHeight) {
       this.customformatCounter = (this.customformatCounter + 1);
+      StringConcatenation _builder_3 = new StringConcatenation();
+      _builder_3.append("rowcustomformat");
+      _builder_3.append(this.customformatCounter);
+      rowStyle = _builder_3.toString();
       StringConcatenation _builder_4 = new StringConcatenation();
-      _builder_4.append("rowcustomformat");
-      _builder_4.append(this.customformatCounter);
-      rowStyle = _builder_4.toString();
-      StringConcatenation _builder_5 = new StringConcatenation();
-      _builder_5.append(body);
-      _builder_5.append("styles.add(\".v-table-row-");
-      _builder_5.append(rowStyle);
-      _builder_5.append(" {height: ");
+      _builder_4.append(body);
+      _builder_4.append("styles.add(\".v-table-row-");
+      _builder_4.append(rowStyle);
+      _builder_4.append(" {height: ");
       String _rowHeight = category_axis.getRowHeight();
-      _builder_5.append(_rowHeight);
-      _builder_5.append("px;}\");");
-      _builder_5.newLineIfNotEmpty();
-      body = _builder_5.toString();
+      _builder_4.append(_rowHeight);
+      _builder_4.append("px;}\");");
+      _builder_4.newLineIfNotEmpty();
+      body = _builder_4.toString();
     }
+    StringConcatenation _builder_5 = new StringConcatenation();
+    _builder_5.append(body);
+    String _createStyles = this.createStyles(intervalStyleMap, numberLookupStyleMap, intIntervalStyleMap, intLookupStyleMap, stringLookupStyleMap, dateLookupStyleMap);
+    _builder_5.append(_createStyles);
+    _builder_5.append(" ");
+    body = _builder_5.toString();
     StringConcatenation _builder_6 = new StringConcatenation();
     _builder_6.append(body);
-    String _createStyles = this.createStyles(intervalStyleMap, numberLookupStyleMap, intIntervalStyleMap, intLookupStyleMap, stringLookupStyleMap, dateLookupStyleMap);
-    _builder_6.append(_createStyles);
-    _builder_6.append(" ");
+    String _generatePropertyLookups = this.generatePropertyLookups(idMap, formatMap, intervalStyleMap, intervalIconMap, intervalTooltipMap, numberLookupStyleMap, numberLookupIconMap, numberLookupTooltipMap, intIntervalStyleMap, intIntervalIconMap, intIntervalTooltipMap, intLookupStyleMap, intLookupIconMap, intLookupTooltipMap, stringLookupStyleMap, stringLookupIconMap, stringLookupTooltipMap, dateLookupStyleMap, dateLookupIconMap, dateLookupTooltipMap, blobLookupMap, enumLookupMap);
+    _builder_6.append(_generatePropertyLookups);
     body = _builder_6.toString();
     StringConcatenation _builder_7 = new StringConcatenation();
     _builder_7.append(body);
-    String _generatePropertyLookups = this.generatePropertyLookups(idMap, formatMap, intervalStyleMap, intervalIconMap, intervalTooltipMap, numberLookupStyleMap, numberLookupIconMap, numberLookupTooltipMap, intIntervalStyleMap, intIntervalIconMap, intIntervalTooltipMap, intLookupStyleMap, intLookupIconMap, intLookupTooltipMap, stringLookupStyleMap, stringLookupIconMap, stringLookupTooltipMap, dateLookupStyleMap, dateLookupIconMap, dateLookupTooltipMap, blobLookupMap);
-    _builder_7.append(_generatePropertyLookups);
+    _builder_7.append("// DO NOT MOVE THESE LINES!!!!! The data source container creation has to be before the user properties readings");
+    _builder_7.newLineIfNotEmpty();
+    _builder_7.append("dataSourceContainer = new CellSetIndexedContainer(eclipseContext, attributeLookupMap, cellSet, coordinateSystem, ");
+    boolean _isDatamartCrossJoined = this.isDatamartCrossJoined(table);
+    _builder_7.append(_isDatamartCrossJoined);
+    _builder_7.append(");");
+    _builder_7.newLineIfNotEmpty();
+    _builder_7.append("table.setContainerDataSource(dataSourceContainer);");
+    _builder_7.newLine();
+    _builder_7.append("dataSourceContainer.addExtras(table);");
+    _builder_7.newLine();
     body = _builder_7.toString();
-    boolean _isBean_3 = this.isBean(table);
-    boolean _not_1 = (!_isBean_3);
-    if (_not_1) {
-      StringConcatenation _builder_8 = new StringConcatenation();
-      _builder_8.append(body);
-      _builder_8.append("dataSourceContainer = new CellSetIndexedContainer(dslMetadataService, user.getLocale(), themeResourceService, blobService, attributeLookupMap, cellSet, coordinateSystem, ");
-      boolean _isDatamartCrossJoined = this.isDatamartCrossJoined(table);
-      _builder_8.append(_isDatamartCrossJoined);
-      _builder_8.append(");");
-      _builder_8.newLineIfNotEmpty();
-      _builder_8.append("table.setContainerDataSource(dataSourceContainer);");
-      _builder_8.newLine();
-      _builder_8.append("dataSourceContainer.addExtras(table);");
-      _builder_8.newLine();
-      body = _builder_8.toString();
-    } else {
+    StringConcatenation _builder_8 = new StringConcatenation();
+    _builder_8.append(body);
+    CharSequence _tableSettingsByUserProperties = this.tableSettingsByUserProperties();
+    _builder_8.append(_tableSettingsByUserProperties);
+    String _sendEvent = this.sendEvent(table);
+    _builder_8.append(_sendEvent);
+    CharSequence _columnCollapsedListener = this.columnCollapsedListener();
+    _builder_8.append(_columnCollapsedListener);
+    CharSequence _columnReorderListener = this.columnReorderListener();
+    _builder_8.append(_columnReorderListener);
+    CharSequence _columnResizeListener = this.columnResizeListener();
+    _builder_8.append(_columnResizeListener);
+    _builder_8.newLineIfNotEmpty();
+    body = _builder_8.toString();
+    boolean _isHasRowHeight_1 = category_axis.isHasRowHeight();
+    if (_isHasRowHeight_1) {
       StringConcatenation _builder_9 = new StringConcatenation();
       _builder_9.append(body);
-      _builder_9.append("dataSourceContainer = new BeanServiceLazyLoadingContainer(factory.createService(");
-      TableOption _tabletype_5 = table.getTabletype();
-      QualifiedName _fullyQualifiedName = this._iQualifiedNameProvider.getFullyQualifiedName(this.getDataMartTable(((TableBean) _tabletype_5)).getDatamartRef());
-      _builder_9.append(_fullyQualifiedName);
-      _builder_9.append("DatamartContainer.class), ");
-      TableOption _tabletype_6 = table.getTabletype();
-      QualifiedName _fullyQualifiedName_1 = this._iQualifiedNameProvider.getFullyQualifiedName(this.getDataMartTable(((TableBean) _tabletype_6)).getDatamartRef());
-      _builder_9.append(_fullyQualifiedName_1);
-      _builder_9.append("DatamartContainer.class, null);");
+      _builder_9.append("dataSourceContainer.setRowStyle(\"");
+      _builder_9.append(rowStyle);
+      _builder_9.append("\");");
       _builder_9.newLineIfNotEmpty();
-      _builder_9.append("table.setContainerDataSource(dataSourceContainer);");
-      _builder_9.newLine();
       body = _builder_9.toString();
     }
-    boolean _isHasRowHeight_1 = category_axis.isHasRowHeight();
-    if (_isHasRowHeight_1) {
-      StringConcatenation _builder_10 = new StringConcatenation();
-      _builder_10.append(body);
-      _builder_10.append("dataSourceContainer.setRowStyle(\"");
-      _builder_10.append(rowStyle);
-      _builder_10.append("\");");
-      _builder_10.newLineIfNotEmpty();
-      body = _builder_10.toString();
-    }
     boolean _isTable_1 = this.isTable(table);
     if (_isTable_1) {
       TableDatamart _dataMartTable = this.getDataMartTable(table);
@@ -2493,37 +2466,31 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
         for (final TableElement element_1 : _elements_1) {
           if ((element_1 instanceof TableAxis)) {
             TablePreorder _preOrder = ((TableAxis) element_1).getPreOrder();
-            boolean _tripleNotEquals_2 = (_preOrder != null);
-            if (_tripleNotEquals_2) {
-              StringConcatenation _builder_11 = new StringConcatenation();
-              _builder_11.append(body);
+            boolean _tripleNotEquals_1 = (_preOrder != null);
+            if (_tripleNotEquals_1) {
+              StringConcatenation _builder_10 = new StringConcatenation();
+              _builder_10.append(body);
               String _preOrder_1 = this.preOrder(((TableAxis) element_1).getPreOrder(), ((TableAxis) element_1));
-              _builder_11.append(_preOrder_1);
-              body = _builder_11.toString();
+              _builder_10.append(_preOrder_1);
+              body = _builder_10.toString();
             }
           }
         }
       }
     }
-    StringConcatenation _builder_12 = new StringConcatenation();
-    _builder_12.append(body);
-    String _sendEvent = this.sendEvent(table);
-    _builder_12.append(_sendEvent);
-    _builder_12.newLineIfNotEmpty();
-    body = _builder_12.toString();
     boolean _isSelection_1 = this.isSelection(table);
     if (_isSelection_1) {
-      StringConcatenation _builder_13 = new StringConcatenation();
-      _builder_13.append(body);
-      _builder_13.newLineIfNotEmpty();
-      _builder_13.append("selectItemsFromWorkloadDto();");
-      _builder_13.newLine();
-      body = _builder_13.toString();
+      StringConcatenation _builder_11 = new StringConcatenation();
+      _builder_11.append(body);
+      _builder_11.newLineIfNotEmpty();
+      _builder_11.append("selectItemsFromWorkloadDto();");
+      _builder_11.newLine();
+      body = _builder_11.toString();
     }
-    StringConcatenation _builder_14 = new StringConcatenation();
-    _builder_14.append(body);
-    _builder_14.append("return tableLayout;");
-    body = _builder_14.toString();
+    StringConcatenation _builder_12 = new StringConcatenation();
+    _builder_12.append(body);
+    _builder_12.append("return tableLayout;");
+    body = _builder_12.toString();
     return body;
   }
   
@@ -2794,7 +2761,7 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
   /**
    * <p>In order to customize the cellGenerator, methods must be called inferred from the model.</p>
    */
-  public String generatePropertyLookups(final HashMap<String, IdAttribute> idMap, final HashMap<String, FormatAttribute> formatMap, final HashMap<String, Map<Double, Map<String, String>>> intervalStyleMap, final HashMap<String, Map<Double, Map<String, String>>> intervalIconMap, final HashMap<String, Map<Double, Map<String, String>>> intervalTooltipMap, final HashMap<String, Map<Double, Map<String, String>>> numberLookupStyleMap, final HashMap<String, Map<Double, Map<String, String>>> numberLookupIconMap, final HashMap<String, Map<Double, Map<String, String>>> numberLookupTooltipMap, final HashMap<String, Map<Integer, Map<String, String>>> intIntervalStyleMap, final HashMap<String, Map<Integer, Map<String, String>>> intIntervalIconMap, final HashMap<String, Map<Integer, Map<String, String>>> intIntervalTooltipMap, final HashMap<String, Map<Integer, Map<String, String>>> intLookupStyleMap, final HashMap<String, Map<Integer, Map<String, String>>> intLookupIconMap, final HashMap<String, Map<Integer, Map<String, String>>> intLookupTooltipMap, final HashMap<String, Map<String, Map<String, String>>> stringLookupStyleMap, final HashMap<String, Map<String, Map<String, String>>> stringLookupIconMap, final HashMap<String, Map<String, Map<String, String>>> stringLookupTooltipMap, final HashMap<String, Map<Double, Map<String, String>>> dateLookupStyleMap, final HashMap<String, Map<Double, Map<String, String>>> dateLookupIconMap, final HashMap<String, Map<Double, Map<String, String>>> dateLookupTooltipMap, final HashMap<String, String> blobLookupMap) {
+  public String generatePropertyLookups(final HashMap<String, IdAttribute> idMap, final HashMap<String, FormatAttribute> formatMap, final HashMap<String, Map<Double, Map<String, String>>> intervalStyleMap, final HashMap<String, Map<Double, Map<String, String>>> intervalIconMap, final HashMap<String, Map<Double, Map<String, String>>> intervalTooltipMap, final HashMap<String, Map<Double, Map<String, String>>> numberLookupStyleMap, final HashMap<String, Map<Double, Map<String, String>>> numberLookupIconMap, final HashMap<String, Map<Double, Map<String, String>>> numberLookupTooltipMap, final HashMap<String, Map<Integer, Map<String, String>>> intIntervalStyleMap, final HashMap<String, Map<Integer, Map<String, String>>> intIntervalIconMap, final HashMap<String, Map<Integer, Map<String, String>>> intIntervalTooltipMap, final HashMap<String, Map<Integer, Map<String, String>>> intLookupStyleMap, final HashMap<String, Map<Integer, Map<String, String>>> intLookupIconMap, final HashMap<String, Map<Integer, Map<String, String>>> intLookupTooltipMap, final HashMap<String, Map<String, Map<String, String>>> stringLookupStyleMap, final HashMap<String, Map<String, Map<String, String>>> stringLookupIconMap, final HashMap<String, Map<String, Map<String, String>>> stringLookupTooltipMap, final HashMap<String, Map<Double, Map<String, String>>> dateLookupStyleMap, final HashMap<String, Map<Double, Map<String, String>>> dateLookupIconMap, final HashMap<String, Map<Double, Map<String, String>>> dateLookupTooltipMap, final HashMap<String, String> blobLookupMap, final HashMap<String, String> enumLookupMap) {
     HashSet<String> attributes = CollectionLiterals.<String>newHashSet();
     attributes.addAll(formatMap.keySet());
     attributes.addAll(intervalStyleMap.keySet());
@@ -2816,6 +2783,7 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     attributes.addAll(dateLookupIconMap.keySet());
     attributes.addAll(dateLookupTooltipMap.keySet());
     attributes.addAll(blobLookupMap.keySet());
+    attributes.addAll(enumLookupMap.keySet());
     attributes.addAll(idMap.keySet());
     String body = "";
     int _size = attributes.size();
@@ -3407,13 +3375,26 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
             _builder_30.newLineIfNotEmpty();
             body = _builder_30.toString();
           }
+          boolean _containsKey_21 = enumLookupMap.containsKey(attribute);
+          if (_containsKey_21) {
+            StringConcatenation _builder_31 = new StringConcatenation();
+            _builder_31.append(body);
+            _builder_31.newLineIfNotEmpty();
+            _builder_31.append("\t");
+            _builder_31.append(".setEnum(true, ");
+            String _get_13 = enumLookupMap.get(attribute);
+            _builder_31.append(_get_13, "\t");
+            _builder_31.append(".class)");
+            _builder_31.newLineIfNotEmpty();
+            body = _builder_31.toString();
+          }
         }
         if (hadAttribute) {
-          StringConcatenation _builder_31 = new StringConcatenation();
-          _builder_31.append(body);
-          _builder_31.append(");");
-          _builder_31.newLineIfNotEmpty();
-          body = _builder_31.toString();
+          StringConcatenation _builder_32 = new StringConcatenation();
+          _builder_32.append(body);
+          _builder_32.append(");");
+          _builder_32.newLineIfNotEmpty();
+          body = _builder_32.toString();
         }
       }
     }
@@ -3466,14 +3447,50 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     }
   }
   
+  /**
+   * <p>infer the model's setting for cell configuration including enums.</p>
+   */
+  public void initEnumLookup(final Table table, final Map<String, String> enumMap) {
+    DatamartSource datamartSource = this.getDataMartTable(table).getDatamartRef().getSource();
+    if ((datamartSource instanceof DatamartEntity)) {
+      List<LEntityAttribute> _allAttributes = ((DatamartEntity) datamartSource).getEntityRef().getAllAttributes();
+      for (final LEntityAttribute attribute : _allAttributes) {
+        boolean _typeIsEnum = this._modelExtensions.typeIsEnum(attribute);
+        if (_typeIsEnum) {
+          StringConcatenation _builder = new StringConcatenation();
+          String _name = null;
+          if (attribute!=null) {
+            _name=attribute.getName();
+          }
+          String _replace = null;
+          if (_name!=null) {
+            _replace=_name.replace("^", "");
+          }
+          _builder.append(_replace);
+          StringConcatenation _builder_1 = new StringConcatenation();
+          LScalarType _type = null;
+          if (attribute!=null) {
+            _type=attribute.getType();
+          }
+          QualifiedName _fullyQualifiedName = null;
+          if (_type!=null) {
+            _fullyQualifiedName=this._iQualifiedNameProvider.getFullyQualifiedName(_type);
+          }
+          _builder_1.append(_fullyQualifiedName);
+          enumMap.put(_builder.toString(), _builder_1.toString());
+        }
+      }
+    }
+  }
+  
   public LKeyAndValue getResolution(final LEntityAttribute attribute) {
     final Function1<LKeyAndValue, Boolean> _function = (LKeyAndValue it) -> {
-      return Boolean.valueOf(it.getKey().toLowerCase().equals(AbstractLayoutingStrategy.PROPERTY_BLOB));
+      return Boolean.valueOf(it.getKey().toLowerCase().equals(IPropertyConstants.PROPERTY_BLOB));
     };
     boolean _exists = IterableExtensions.<LKeyAndValue>exists(attribute.getProperties(), _function);
     if (_exists) {
       final Function1<LKeyAndValue, Boolean> _function_1 = (LKeyAndValue it) -> {
-        return Boolean.valueOf(it.getKey().toLowerCase().equals(AbstractLayoutingStrategy.PROPERTY_BLOB));
+        return Boolean.valueOf(it.getKey().toLowerCase().equals(IPropertyConstants.PROPERTY_BLOB));
       };
       return IterableExtensions.<LKeyAndValue>findFirst(attribute.getProperties(), _function_1);
     } else {
@@ -3481,13 +3498,13 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
       if ((_type instanceof LDataType)) {
         LScalarType _type_1 = attribute.getType();
         final Function1<LKeyAndValue, Boolean> _function_2 = (LKeyAndValue it) -> {
-          return Boolean.valueOf(it.getKey().toLowerCase().equals(AbstractLayoutingStrategy.PROPERTY_BLOB));
+          return Boolean.valueOf(it.getKey().toLowerCase().equals(IPropertyConstants.PROPERTY_BLOB));
         };
         boolean _exists_1 = IterableExtensions.<LKeyAndValue>exists(((LDataType) _type_1).getProperties(), _function_2);
         if (_exists_1) {
           LScalarType _type_2 = attribute.getType();
           final Function1<LKeyAndValue, Boolean> _function_3 = (LKeyAndValue it) -> {
-            return Boolean.valueOf(it.getKey().toLowerCase().equals(AbstractLayoutingStrategy.PROPERTY_BLOB));
+            return Boolean.valueOf(it.getKey().toLowerCase().equals(IPropertyConstants.PROPERTY_BLOB));
           };
           return IterableExtensions.<LKeyAndValue>findFirst(((LDataType) _type_2).getProperties(), _function_3);
         }
@@ -5702,6 +5719,50 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
                   _builder_1.append("\t\t");
                   _builder_1.append("eventDispatcher.sendEvent(evnt);");
                   _builder_1.newLine();
+                  _builder_1.append("\t\t");
+                  _builder_1.append("for (DatamartPrimary<?> primary : datamartInstance.getPrimaryList()){");
+                  _builder_1.newLine();
+                  _builder_1.append("\t\t");
+                  _builder_1.append("\t");
+                  _builder_1.append("if (!\"");
+                  QualifiedName _fullyQualifiedName_2 = this._iQualifiedNameProvider.getFullyQualifiedName(this.baseType(entity));
+                  _builder_1.append(_fullyQualifiedName_2, "\t\t\t");
+                  _builder_1.append("\".equals(primary.getEntityName())){");
+                  _builder_1.newLineIfNotEmpty();
+                  _builder_1.append("\t\t");
+                  _builder_1.append("\t\t");
+                  _builder_1.append("Object primaryValue = dataSourceContainer.getValueByProperty(selection, primary.getAlias().toLowerCase());");
+                  _builder_1.newLine();
+                  _builder_1.append("\t\t");
+                  _builder_1.append("\t\t");
+                  _builder_1.append("if (primaryValue != null) {");
+                  _builder_1.newLine();
+                  _builder_1.append("\t\t");
+                  _builder_1.append("\t\t\t");
+                  _builder_1.append("evnt = new EventDispatcherEvent(EventDispatcherCommand.SELECT, primary.getEntityName() + \".\" + primary.getAttributeName(), \"");
+                  QualifiedName _fullyQualifiedName_3 = this._iQualifiedNameProvider.getFullyQualifiedName(table);
+                  _builder_1.append(_fullyQualifiedName_3, "\t\t\t\t\t");
+                  _builder_1.append("\");");
+                  _builder_1.newLineIfNotEmpty();
+                  _builder_1.append("\t\t");
+                  _builder_1.append("\t\t\t");
+                  _builder_1.append("evnt.addItem(EventDispatcherDataTag.ID, primaryValue);");
+                  _builder_1.newLine();
+                  _builder_1.append("\t\t");
+                  _builder_1.append("\t\t\t");
+                  _builder_1.append("eventDispatcher.sendEvent(evnt);");
+                  _builder_1.newLine();
+                  _builder_1.append("\t\t");
+                  _builder_1.append("\t\t");
+                  _builder_1.append("}");
+                  _builder_1.newLine();
+                  _builder_1.append("\t\t");
+                  _builder_1.append("\t");
+                  _builder_1.append("}");
+                  _builder_1.newLine();
+                  _builder_1.append("\t\t");
+                  _builder_1.append("}");
+                  _builder_1.newLine();
                 }
               }
               body = _builder_1.toString();
@@ -5809,6 +5870,218 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     return body;
   }
   
+  public CharSequence columnResizeListener() {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("table.addColumnResizeListener(new ColumnResizeListener(){");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("public void columnResize(ColumnResizeEvent event) {");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("// Get the new width of the resized column");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("int width = event.getCurrentWidth();");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("// Get the property ID of the resized column");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("Object columnId = event.getPropertyId();");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("user.addToProperties(this.getClass().getEnclosingClass().getCanonicalName() + \".\" + columnId.toString() + \".\" + \"width\", String.valueOf(width));");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("});");
+    _builder.newLine();
+    _builder.append("// Must be immediate to send the resize events immediately");
+    _builder.newLine();
+    _builder.append("table.setImmediate(true);");
+    _builder.newLine();
+    return _builder;
+  }
+  
+  public CharSequence columnReorderListener() {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("table.addColumnReorderListener(new ColumnReorderListener(){");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("public void columnReorder(ColumnReorderEvent event) {");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("Object source = event.getSource();");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("String propertyKey = this.getClass().getEnclosingClass().getCanonicalName() + \".\" + \"columns\";");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("if (source instanceof CustomTable){");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("Object[] visibleColumns = ((CustomTable)source).getVisibleColumns();");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("if (visibleColumns!=null){");
+    _builder.newLine();
+    _builder.append("\t\t\t\t");
+    _builder.append("user.addToProperties(propertyKey, visibleColumns);");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("});");
+    _builder.newLine();
+    return _builder;
+  }
+  
+  public CharSequence columnCollapsedListener() {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("table.addColumnCollapseListener(new ColumnCollapseListener(){");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("public void columnCollapseStateChange(ColumnCollapseEvent event) {");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("// Get the ID of the column collapse event");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("Object columnId = event.getPropertyId();");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("Object source = event.getSource();");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("String propertyKey = this.getClass().getEnclosingClass().getCanonicalName() + \".\" + columnId.toString() + \".\" + \"collapsed\";");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("if (source instanceof CustomTable){");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("if (((CustomTable)source).isColumnCollapsed(columnId)) {");
+    _builder.newLine();
+    _builder.append("\t\t\t\t");
+    _builder.append("user.addToProperties(propertyKey, \"true\");");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("} else {");
+    _builder.newLine();
+    _builder.append("\t\t\t\t");
+    _builder.append("user.removeFromProperties(propertyKey);");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("});");
+    _builder.newLine();
+    return _builder;
+  }
+  
+  public CharSequence tableSettingsByUserProperties() {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("// Setting table columns width from the persisted user properties");
+    _builder.newLine();
+    _builder.append("for (Object visibleId : table.getVisibleColumns()) {");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("String widthStr = user.getColumnUtil().getColumnWidth(this.getClass().getCanonicalName() + \".\" + visibleId.toString() + \".\" + \"width\");");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("if (widthStr!= null) {");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("try {");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("table.setColumnWidth(visibleId, Integer.parseInt(widthStr));");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("} catch (IllegalArgumentException e) {");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("// this occurs if a saved column is no longer existing due to model changes");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("// Setting table collapsed columns from the persisted user properties");
+    _builder.newLine();
+    _builder.append("for (Object propertyId : table.getContainerDataSource().getContainerPropertyIds()) {");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("String collapsedColumn = user.getColumnUtil().getColumnCollapsed(this.getClass().getCanonicalName() + \".\" + propertyId + \".\" + \"collapsed\");");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("try {");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("if (collapsedColumn != null){");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("table.setColumnCollapsed(propertyId, true);");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("} catch (IllegalArgumentException e) {");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("// this occurs if a saved column is no longer existing due to model changes");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("Object[] visibleColumns = user.getColumnUtil().getVisibleColumns(this.getClass().getCanonicalName() + \".\" + \"columns\");");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("if (visibleColumns != null){");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("try {");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("table.setVisibleColumns(visibleColumns);");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("} catch (IllegalArgumentException e) {");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("// this occurs if a saved column is no longer existing due to model changes");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("}");
+    _builder.newLine();
+    return _builder;
+  }
+  
   public CharSequence getMsgValue(final LEntityAttribute attribute, final String string) {
     StringConcatenation _builder = new StringConcatenation();
     _builder.append(this.CONVERT_METHOD_PREFIX);
@@ -5900,60 +6173,33 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     _builder.append("\t");
     _builder.append("tableFilterDecorator.setLocale(locale);");
     _builder.newLine();
-    {
-      boolean _isBean = this.isBean(table);
-      if (_isBean) {
-        _builder.append("\t");
-        _builder.append("if(table != null) {");
-        _builder.newLine();
-        _builder.append("\t");
-        _builder.append("\t");
-        _builder.append("table.setLocale(locale);");
-        _builder.newLine();
-        _builder.append("\t");
-        _builder.append("}");
-        _builder.newLine();
-      } else {
-        _builder.append("\t");
-        _builder.append("for(CellSetFilterTable table:tables) {");
-        _builder.newLine();
-        _builder.append("\t");
-        _builder.append("\t");
-        _builder.append("table.setLocale(locale);");
-        _builder.newLine();
-        {
-          if (((this.isTable(table) && 
-            ((TableDatamart) this.getDataMartTable(table)).getDatamartRef().isDescription()) && 
-            (((TableDatamart) this.getDataMartTable(table)).getDatamartRef().getDescriptionValue() != null))) {
-            _builder.append("\t");
-            _builder.append("\t");
-            _builder.append("table.setDescription(dslMetadataService.translate(locale.toLanguageTag(), \"");
-            TableDatamart _dataMartTable = this.getDataMartTable(table);
-            String _descriptionValue = ((TableDatamart) _dataMartTable).getDatamartRef().getDescriptionValue();
-            _builder.append(_descriptionValue, "\t\t");
-            _builder.append("\"));");
-            _builder.newLineIfNotEmpty();
-          }
-        }
-        _builder.append("\t");
-        _builder.append("}");
-        _builder.newLine();
-      }
-    }
     _builder.append("\t");
-    _builder.append("for(String key:attributeLookupMap.keySet()) {");
+    _builder.append("for(CellSetFilterTable table:tables) {");
     _builder.newLine();
     _builder.append("\t\t");
-    _builder.append("attributeLookupMap.get(key).setLocale(locale);");
+    _builder.append("table.setLocale(locale);");
     _builder.newLine();
+    {
+      if (((this.isTable(table) && 
+        ((TableDatamart) this.getDataMartTable(table)).getDatamartRef().isDescription()) && 
+        (((TableDatamart) this.getDataMartTable(table)).getDatamartRef().getDescriptionValue() != null))) {
+        _builder.append("\t\t");
+        _builder.append("table.setDescription(dslMetadataService.translate(locale.toLanguageTag(), \"");
+        TableDatamart _dataMartTable = this.getDataMartTable(table);
+        String _descriptionValue = ((TableDatamart) _dataMartTable).getDatamartRef().getDescriptionValue();
+        _builder.append(_descriptionValue, "\t\t");
+        _builder.append("\"));");
+        _builder.newLineIfNotEmpty();
+      }
+    }
     _builder.append("\t");
     _builder.append("}");
     _builder.newLine();
     _builder.append("\t");
-    _builder.append("for(Component tabSheet : tabSheets.keySet()) {");
+    _builder.append("for(String key:attributeLookupMap.keySet()) {");
     _builder.newLine();
     _builder.append("\t\t");
-    _builder.append("((TabSheet)tabSheet).setCaption(tabSheets.get(tabSheet).stream().map(x->dslMetadataService.translate(locale.toLanguageTag(), x)).collect(Collectors.joining(\"/\")));");
+    _builder.append("attributeLookupMap.get(key).setLocale(locale);");
     _builder.newLine();
     _builder.append("\t");
     _builder.append("}");
@@ -5962,14 +6208,8 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
     _builder.append("if(dataSourceContainer != null) {");
     _builder.newLine();
     _builder.append("\t\t");
-    {
-      boolean _isBean_1 = this.isBean(table);
-      if (_isBean_1) {
-        _builder.append("//");
-      }
-    }
     _builder.append("dataSourceContainer.setLocale(locale);");
-    _builder.newLineIfNotEmpty();
+    _builder.newLine();
     _builder.append("\t");
     _builder.append("}");
     _builder.newLine();
@@ -6000,6 +6240,7 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
       String alias = ((String) null);
       String dtoFqn = ((String) null);
       LDataType keyType = ((LDataType) null);
+      String keyGetter = ((String) null);
       TableDatamart _dataMartTable = this.getDataMartTable(table);
       if ((_dataMartTable instanceof TableDatamart)) {
         TableDatamart _dataMartTable_1 = this.getDataMartTable(table);
@@ -6013,6 +6254,12 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
           EObject _resolve = EcoreUtil2.resolve(datamartEntity.getEntityRef(), table.eResource());
           entity = ((LEntity) _resolve);
           keyType = this._modelExtensions.getDatatype(entity.getPrimaryKeyAttribute());
+          StringConcatenation _builder = new StringConcatenation();
+          _builder.append("get");
+          String _firstUpper = StringExtensions.toFirstUpper(entity.getPrimaryKeyAttribute().getName());
+          _builder.append(_firstUpper);
+          _builder.append("()");
+          keyGetter = _builder.toString();
           alias = DatamartDefinitionUtil.getEntityIdAliasName(entity).toLowerCase();
           dtoFqn = EntityUtils.getDtoFQNForLEntity(entity);
         }
@@ -6035,7 +6282,9 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer {
       _builder.append("    \t");
       _builder.append("ids.add(String.valueOf(((");
       _builder.append(dtoFqn, "    \t");
-      _builder.append(")operativeDto).getId()));");
+      _builder.append(")operativeDto).");
+      _builder.append(keyGetter, "    \t");
+      _builder.append("));");
       _builder.newLineIfNotEmpty();
       _builder.append("    ");
       _builder.append("}");
diff --git a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/TableModelGenerator.java b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/TableModelGenerator.java
index 1a34608..ec51a9f 100644
--- a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/TableModelGenerator.java
+++ b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/TableModelGenerator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0 
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
@@ -32,6 +34,7 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -45,7 +48,6 @@ import javax.inject.Inject;
 import org.eclipse.bpmn2.Task;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.di.extensions.EventUtils;
-import org.eclipse.e4.core.services.events.IEventBroker;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.emf.ecore.EObject;
@@ -63,6 +65,7 @@ import org.eclipse.osbp.dsl.dto.lib.impl.DtoServiceAccess;
 import org.eclipse.osbp.eventbroker.EventBrokerMsg;
 import org.eclipse.osbp.preferences.ProductConfiguration;
 import org.eclipse.osbp.runtime.common.event.EventDispatcherEvent;
+import org.eclipse.osbp.runtime.common.event.IDualData;
 import org.eclipse.osbp.runtime.common.filter.IDTOServiceWithMutablePersistence;
 import org.eclipse.osbp.runtime.web.vaadin.common.data.IBeanSearchServiceFactory;
 import org.eclipse.osbp.ui.api.contextfunction.IViewEmbeddedProvider;
@@ -146,13 +149,20 @@ public class TableModelGenerator extends I18NModelGenerator {
         OperativeDtoContainer.class, 
         DerivedHierarchy.class, 
         DerivedLevel.class, 
-        IEventBroker.class, 
         PopupButton.class, 
         CellSetFilterTable.class, 
         BeanFilterTable.class, 
         CellSetPagedFilterTable.class, 
         CheckboxSelectionCellSetFilterTable.class, 
         CustomTable.class, 
+        CustomTable.ColumnResizeEvent.class, 
+        CustomTable.ColumnResizeListener.class, 
+        CustomTable.ColumnReorderEvent.class, 
+        CustomTable.ColumnReorderListener.class, 
+        CustomTable.ColumnCollapseEvent.class, 
+        CustomTable.ColumnCollapseListener.class, 
+        TabSheet.SelectedTabChangeListener.class, 
+        TabSheet.SelectedTabChangeEvent.class, 
         CustomTable.RowHeaderMode.class, 
         Container.class, 
         CellSetIndexedContainer.class, 
@@ -207,7 +217,9 @@ public class TableModelGenerator extends I18NModelGenerator {
         BPMTaskUserEvent.class, 
         SelectWorkloadActionEnum.class, 
         StringWriter.class, 
-        PrintWriter.class);
+        PrintWriter.class, 
+        LinkedHashMap.class, 
+        IDualData.class);
       _xblockexpression = super.createAppendable(context, importManager, config);
     }
     return _xblockexpression;
diff --git a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/validation/TableDSLValidator.java b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/validation/TableDSLValidator.java
index 47f515b..27000f0 100644
--- a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/validation/TableDSLValidator.java
+++ b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/validation/TableDSLValidator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 - 2016 - Loetz GmbH&Co.KG, 69115 Heidelberg, Germany
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0 
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  * 	   Loetz GmbH&Co.KG - Initial implementation
diff --git a/pom.xml b/pom.xml
index 712ded2..1499724 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,9 +2,11 @@
 <!--#======================================================================= -->
 <!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany). -->
 <!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
+<!--# are made available under the terms of the Eclipse Public License 2.0  -->
 <!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
+<!--# https://www.eclipse.org/legal/epl-2.0/    -->
+<!--#                                           -->
+<!--# SPDX-License-Identifier: EPL-2.0          -->
 <!--# -->
 <!--# Contributors: -->
 <!--# Christophe Loetz  (Loetz GmbH&Co.KG) - Initial implementation API and implementation -->
author	Ralf Mollik	2018-06-28 15:06:49 +0000
committer	Ralf Mollik	2018-06-28 15:06:49 +0000
commit	9c12dc7f72ac15122916bc509828367f038aeb7c (patch)
tree	b2a4c420c8a4fa51d74eb426ec5c9a80a4341740
parent	ecd8ff9a0781538b7d7f9877733710750cf948e7 (diff)
download	org.eclipse.osbp.xtext.table-9c12dc7f72ac15122916bc509828367f038aeb7c.tar.gz org.eclipse.osbp.xtext.table-9c12dc7f72ac15122916bc509828367f038aeb7c.tar.xz org.eclipse.osbp.xtext.table-9c12dc7f72ac15122916bc509828367f038aeb7c.zip